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 65f78bb8f..e10921f09 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 @@ -69,7 +69,6 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P // Views part of the DeviceListFragment @BindView(R.id.text_view_device_name) TextView deviceName; - @BindView(R.id.text_view_device_status) TextView deviceStatus; @BindView(R.id.progress_bar_searching_peers) ProgressBar searchingPeersProgressBar; @BindView(R.id.frame_layout_peer_devices) FrameLayout frameLayoutPeerDevices; @@ -155,21 +154,21 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P if(userDevice != null) { deviceName.setText(userDevice.deviceName); - deviceStatus.setText(getString(getDeviceStatus(userDevice.status))); + Log.d(TAG, getDeviceStatus(userDevice.status)); } } - public static int getDeviceStatus(int status) { + public static String getDeviceStatus(int status) { if(BuildConfig.DEBUG) Log.d(TAG, "Peer Status: " + status); switch (status) { - case WifiP2pDevice.AVAILABLE : return R.string.available; - case WifiP2pDevice.INVITED : return R.string.invited; - case WifiP2pDevice.CONNECTED : return R.string.connected; - case WifiP2pDevice.FAILED : return R.string.failed; - case WifiP2pDevice.UNAVAILABLE:return R.string.unavailable; + case WifiP2pDevice.AVAILABLE : return "Available"; + case WifiP2pDevice.INVITED : return "Invited"; + case WifiP2pDevice.CONNECTED : return "Connected"; + case WifiP2pDevice.FAILED : return "Failed"; + case WifiP2pDevice.UNAVAILABLE:return "Unavailable"; - default: return R.string.unknown; + default: return "Unknown"; } } diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiPeerListAdapter.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiPeerListAdapter.java index 14579c6be..f274efa9c 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiPeerListAdapter.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiPeerListAdapter.java @@ -3,6 +3,7 @@ package org.kiwix.kiwixmobile.zim_manager.local_file_transfer; import android.app.Activity; import android.content.Context; import android.net.wifi.p2p.WifiP2pDevice; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,6 +18,7 @@ import org.kiwix.kiwixmobile.R; import java.util.List; import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.getDeviceStatus; +import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.DeviceListFragment.TAG; /** * Helper class, part of the local file sharing module. @@ -53,16 +55,14 @@ public class WifiPeerListAdapter extends ArrayAdapter { if(device != null) { viewHolder.deviceName.setText(device.deviceName); - viewHolder.deviceStatus.setText(context.getString(getDeviceStatus(device.status))); + Log.d(TAG, getDeviceStatus(device.status)); } return rowView; } static class ViewHolder { - @BindView(R.id.row_device_name) - TextView deviceName; - @BindView(R.id.row_device_status) TextView deviceStatus; + @BindView(R.id.row_device_name) TextView deviceName; public ViewHolder(View view) { ButterKnife.bind(this, view); diff --git a/app/src/main/res/layout/fragment_device_list.xml b/app/src/main/res/layout/fragment_device_list.xml index ddb629cd6..762bf3857 100644 --- a/app/src/main/res/layout/fragment_device_list.xml +++ b/app/src/main/res/layout/fragment_device_list.xml @@ -37,21 +37,6 @@ android:layout_marginLeft="15dp" android:layout_marginStart="15dp" android:paddingLeft="5dp" - android:paddingRight="5dp"/> - - @@ -60,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="2dp" android:background="#0000f0" - app:layout_constraintTop_toBottomOf="@+id/text_view_device_status" + app:layout_constraintTop_toBottomOf="@+id/text_view_device_name" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" android:layout_marginLeft="5dp" diff --git a/app/src/main/res/layout/row_peer_device.xml b/app/src/main/res/layout/row_peer_device.xml index 24786d6b8..3ec6c2905 100644 --- a/app/src/main/res/layout/row_peer_device.xml +++ b/app/src/main/res/layout/row_peer_device.xml @@ -18,17 +18,4 @@ android:paddingLeft="5dp" android:paddingRight="5dp"/> - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 993d575c4..fac900497 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -274,12 +274,6 @@ Enable WiFi P2P from system settings Cannot discover peers without WiFi ON Transfer files to %s? - Available - Invited - Connected - Failed - Unavailable - Unknown Selected device not cooperating for transfer Preparing to receive files... Starting file transfer...