From b4183a9b86f09f0c20ad642d2b45228d497c7214 Mon Sep 17 00:00:00 2001 From: Aditya-Sood Date: Mon, 15 Jul 2019 16:47:41 +0530 Subject: [PATCH] Refactor: Remove some toasts from the UX --- .../local_file_transfer/DeviceListFragment.java | 3 --- .../LocalFileTransferActivity.java | 2 +- .../RequestEnableLocationServicesDialog.java | 2 +- .../RequestEnableWifiP2pServicesDialog.java | 2 +- .../SenderDeviceAsyncTask.java | 2 +- app/src/main/res/layout/fragment_device_list.xml | 1 - app/src/main/res/layout/item_transfer_list.xml | 2 -- app/src/main/res/layout/row_peer_device.xml | 1 - app/src/main/res/values/strings.xml | 15 +++------------ 9 files changed, 7 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java index e10921f09..3ed2b17ff 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java @@ -226,14 +226,11 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P displayTransferProgressFragment(); new ReceiverDeviceAsyncTask(this, transferProgressFragment).execute(); - showToast(localFileTransferActivity, R.string.preparing_to_receive, Toast.LENGTH_SHORT); } else if(groupInfo.groupFormed) { { Log.d(LocalFileTransferActivity.TAG, "Starting file transfer"); - showToast(localFileTransferActivity, R.string.starting_transfer, Toast.LENGTH_SHORT); - fileReceiverDeviceAddress = (groupInfo.isGroupOwner) ? selectedPeerDeviceInetAddress : groupInfo.groupOwnerAddress; // Hack for allowing slower receiver devices to setup server before sender device requests to connect diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java index 70f859257..c9c4d37b4 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java @@ -418,7 +418,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi case REQUEST_ENABLE_WIFI_P2P: { if(!isWifiP2pEnabled()) { - showToast(this, R.string.request_refused_wifi, Toast.LENGTH_LONG); + showToast(this, R.string.discovery_needs_wifi, Toast.LENGTH_LONG); } break; } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java index b48a0dea1..1c9a89b0e 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java @@ -33,7 +33,7 @@ public class RequestEnableLocationServicesDialog extends DialogFragment { .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - showToast(getActivity(), R.string.request_refused_location, Toast.LENGTH_SHORT); + showToast(getActivity(), R.string.discovery_needs_location, Toast.LENGTH_SHORT); } }); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java index 7fe54f2de..28bc0553b 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java @@ -33,7 +33,7 @@ public class RequestEnableWifiP2pServicesDialog extends DialogFragment { .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - showToast(getActivity(), R.string.request_refused_wifi, Toast.LENGTH_SHORT); + showToast(getActivity(), R.string.discovery_needs_wifi, Toast.LENGTH_SHORT); } }); diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java index 0d751ee07..1a6459634 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java @@ -103,7 +103,7 @@ class SenderDeviceAsyncTask extends AsyncTask { } if(deviceListFragment.allFilesSent()) { - showToast(deviceListFragment.getActivity(), R.string.all_files_transferred, Toast.LENGTH_SHORT); + showToast(deviceListFragment.getActivity(), R.string.file_transfer_complete, Toast.LENGTH_SHORT); deviceListFragment.getActivity().finish(); } } diff --git a/app/src/main/res/layout/fragment_device_list.xml b/app/src/main/res/layout/fragment_device_list.xml index 762bf3857..5c3ad872b 100644 --- a/app/src/main/res/layout/fragment_device_list.xml +++ b/app/src/main/res/layout/fragment_device_list.xml @@ -31,7 +31,6 @@ app:layout_constraintTop_toBottomOf="@+id/text_view_your_device" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - android:hint="@string/device_name" android:textStyle="bold" android:textSize="17sp" android:layout_marginLeft="15dp" diff --git a/app/src/main/res/layout/item_transfer_list.xml b/app/src/main/res/layout/item_transfer_list.xml index c9741f32f..93b291a41 100644 --- a/app/src/main/res/layout/item_transfer_list.xml +++ b/app/src/main/res/layout/item_transfer_list.xml @@ -10,7 +10,6 @@ android:id="@+id/text_view_file_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:hint="@string/file_name" android:gravity="center_vertical" android:textColor="#000000" android:textSize="14sp" @@ -41,7 +40,6 @@ Cannot locate peer devices without location permissions Cannot access zim files without storage permission Enable location to allow detection of peers - Cannot discover peers without location services + Cannot discover peers without location services Enable WiFi P2P from system settings - Cannot discover peers without WiFi ON + Cannot discover peers without WiFi ON Transfer files to %s? - Selected device not cooperating for transfer - Preparing to receive files... - Starting file transfer... - Cannot discover peers without WiFi + Selected device not co-operating for transfer File transfer complete An error was encountered during transfer Error sending file %s - All files transferred Get content from nearby device - Cancel Search Search For Peers - Device Name - Device Status Your Device: NEARBY DEVICES No devices detected. Tap on search button to try again. FILES FOR TRANSFER - File Name Preparing files for transfer... - File transfer status