diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-15 20:09:24 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-15 20:09:24 -0600 |
| commit | 72c7bedaab6958b4fb3c53ae7c2d5e233181933c (patch) | |
| tree | 4919b09f9c929fd14b54b5874152c1fa87bc1914 /androidApp/src/main/res/layout/devices_fragment.xml | |
| parent | d2ab18cc01d2717bf46a378406ed1402381b3a40 (diff) | |
| parent | 6aa78c8ddbcdeaace0f4596e7c717dafef036f03 (diff) | |
| download | etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.tar.gz etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.tar.bz2 etbsa-trackermap-mobile-72c7bedaab6958b4fb3c53ae7c2d5e233181933c.zip | |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Conflicts:
androidApp/src/main/res/layout/user_information_activity.xml
Diffstat (limited to 'androidApp/src/main/res/layout/devices_fragment.xml')
| -rw-r--r-- | androidApp/src/main/res/layout/devices_fragment.xml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/androidApp/src/main/res/layout/devices_fragment.xml b/androidApp/src/main/res/layout/devices_fragment.xml index fd91db3..1dd1690 100644 --- a/androidApp/src/main/res/layout/devices_fragment.xml +++ b/androidApp/src/main/res/layout/devices_fragment.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/devicesList" android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <include + android:id="@+id/infoLoading" + android:layout_width="match_parent" android:layout_height="match_parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + layout="@layout/loading_indicator" + android:visibility="gone"/> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file |