kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 12:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Remove some toasts from the UX

Browse Source
This commit is contained in:
Aditya-Sood 2019-07-15 16:47:41 +05:30
parent 79e6078ef9
commit b4183a9b86
9 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
View File

@ -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

2
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
View File

@ -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;
}

2
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableLocationServicesDialog.java
View File

@ -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);
}
});

2
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/RequestEnableWifiP2pServicesDialog.java
View File

@ -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);
}
});

2
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java
View File

@ -103,7 +103,7 @@ class SenderDeviceAsyncTask extends AsyncTask<Uri, Void, Boolean> {
}
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();
}
}

1
app/src/main/res/layout/fragment_device_list.xml
View File

@ -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"

2
app/src/main/res/layout/item_transfer_list.xml
View File

@ -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 @@
<ImageView
android:id="@+id/image_view_file_transferred"
android:contentDescription="@string/file_transfer_status"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:paddingTop="1dp"

1
app/src/main/res/layout/row_peer_device.xml
View File

@ -10,7 +10,6 @@
android:layout_height="wrap_content"
android:layout_weight="3"
android:gravity="center_vertical"
android:contentDescription="@string/device_name"
android:textStyle="bold"
android:textSize="17sp"
android:paddingTop="1dp"

15
app/src/main/res/values/strings.xml
View File

@ -270,28 +270,19 @@
<string name="permission_refused_location">Cannot locate peer devices without location permissions</string>
<string name="permission_refused_storage">Cannot access zim files without storage permission</string>
<string name="request_enable_location">Enable location to allow detection of peers</string>
<string name="request_refused_location">Cannot discover peers without location services</string>
<string name="discovery_needs_location">Cannot discover peers without location services</string>
<string name="request_enable_wifi">Enable WiFi P2P from system settings</string>
<string name="request_refused_wifi">Cannot discover peers without WiFi ON</string>
<string name="discovery_needs_wifi">Cannot discover peers without WiFi ON</string>
<string name="transfer_to">Transfer files to %s?</string>
<string name="device_not_cooperating">Selected device not cooperating for transfer</string>
<string name="preparing_to_receive">Preparing to receive files...</string>
<string name="starting_transfer">Starting file transfer...</string>
<string name="discovery_needs_wifi">Cannot discover peers without WiFi</string>
<string name="device_not_cooperating">Selected device not co-operating for transfer</string>
<string name="file_transfer_complete">File transfer complete</string>
<string name="error_during_transfer">An error was encountered during transfer</string>
<string name="error_sending">Error sending file %s</string>
<string name="all_files_transferred">All files transferred</string>
<string name="get_content_from_nearby_device">Get content from nearby device</string>
<string name="cancel_search">Cancel Search</string>
<string name="search_for_peers">Search For Peers</string>
<string name="device_name">Device Name</string>
<string name="device_status">Device Status</string>
<string name="your_device">Your Device:</string>
<string name="nearby_devices">NEARBY DEVICES</string>
<string name="no_devices_found">No devices detected. Tap on search button to try again.</string>
<string name="files_for_transfer">FILES FOR TRANSFER</string>
<string name="file_name">File Name</string>
<string name="preparing_files">Preparing files for transfer...</string>
<string name="file_transfer_status">File transfer status</string>
</resources>