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: Flatten DeviceListFragment's view hierarchy

Browse Source
This commit is contained in:
Aditya-Sood 2019-07-17 14:50:03 +05:30
parent 57e3aa0182
commit e18dc725b8
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
@ -73,7 +72,8 @@ public class DeviceListFragment extends ListFragment
// Views part of the DeviceListFragment
@BindView(R.id.text_view_device_name) TextView deviceName;
@BindView(R.id.progress_bar_searching_peers) ProgressBar searchingPeersProgressBar;
@BindView(R.id.frame_layout_peer_devices) FrameLayout frameLayoutPeerDevices;
@BindView(android.R.id.list) ListView listViewPeerDevices;
@BindView(android.R.id.empty) TextView textViewPeerDevices;
private Unbinder unbinder;
@ -195,7 +195,7 @@ public class DeviceListFragment extends ListFragment
@Override
public void onPeersAvailable(WifiP2pDeviceList peers) {
searchingPeersProgressBar.setVisibility(View.GONE);
frameLayoutPeerDevices.setVisibility(View.VISIBLE);
listViewPeerDevices.setVisibility(View.VISIBLE);
peerDevices.clear();
peerDevices.addAll(peers.getDeviceList());
@ -227,7 +227,8 @@ public class DeviceListFragment extends ListFragment
public void onInitiateDiscovery() { // Setup UI for searching peers
searchingPeersProgressBar.setVisibility(View.VISIBLE);
frameLayoutPeerDevices.setVisibility(View.INVISIBLE);
listViewPeerDevices.setVisibility(View.INVISIBLE);
textViewPeerDevices.setVisibility(View.INVISIBLE);
}
/* From WifiP2pManager.ConnectionInfoListener callback-interface */

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

@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:hint="Device Name"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintTop_toBottomOf="@+id/text_view_your_device"
app:layout_constraintTop_toBottomOf="@id/text_view_your_device"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:textStyle="bold"
@ -45,7 +45,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="#0000f0"
app:layout_constraintTop_toBottomOf="@+id/text_view_device_name"
app:layout_constraintTop_toBottomOf="@id/text_view_device_name"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginLeft="5dp"
@ -59,36 +59,34 @@
android:gravity="center"
android:textSize="16sp"
app:fontFamily="monospace"
app:layout_constraintTop_toBottomOf="@+id/view_device_list_boundary"
app:layout_constraintTop_toBottomOf="@id/view_device_list_boundary"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:paddingTop="5dp"/>
<FrameLayout
android:id="@+id/frame_layout_peer_devices"
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/text_view_available_device"
app:layout_constraintTop_toBottomOf="@id/text_view_available_device"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:visibility="invisible">
app:layout_constraintVertical_bias="0.0"
android:visibility="invisible"/>
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent">
</ListView>
<TextView
android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/no_devices_found"
android:gravity="center"
android:layout_margin="50dp"
android:textColor="@android:color/black" />
</FrameLayout>
<TextView
android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/no_devices_found"
android:gravity="center"
android:layout_margin="50dp"
android:textColor="@android:color/black"
app:layout_constraintTop_toBottomOf="@id/text_view_available_device"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
<ProgressBar
android:id="@+id/progress_bar_searching_peers"
@ -96,7 +94,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:layout_margin="50dp"
app:layout_constraintTop_toBottomOf="@+id/text_view_available_device"
app:layout_constraintTop_toBottomOf="@id/text_view_available_device"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"/>