aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/res/layout
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-17 00:52:22 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-17 00:52:22 -0600
commit7c90f36e21e6d1400990427b3c4eabd4a83d5e9a (patch)
tree27083e80aef72427e760bf4c805b6186dc0a12c3 /androidApp/src/main/res/layout
parentbce64ef4f702c351d349881704d92f724e90239f (diff)
downloadetbsa-trackermap-mobile-7c90f36e21e6d1400990427b3c4eabd4a83d5e9a.tar.gz
etbsa-trackermap-mobile-7c90f36e21e6d1400990427b3c4eabd4a83d5e9a.tar.bz2
etbsa-trackermap-mobile-7c90f36e21e6d1400990427b3c4eabd4a83d5e9a.zip
Switch to list fragment on search and fixed black flash when switching fragments
Diffstat (limited to 'androidApp/src/main/res/layout')
-rw-r--r--androidApp/src/main/res/layout/unit_map_fragment.xml2
-rw-r--r--androidApp/src/main/res/layout/units_activity.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml
index e2bee95..a86a7e9 100644
--- a/androidApp/src/main/res/layout/unit_map_fragment.xml
+++ b/androidApp/src/main/res/layout/unit_map_fragment.xml
@@ -15,7 +15,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:name="mx.trackermap.TrackerMap.android.map.MapFragment"
- tools:visibility="invisible"/>
+ tools:visibility="visible"/>
<androidx.cardview.widget.CardView
android:id="@+id/mapUnitCard"
diff --git a/androidApp/src/main/res/layout/units_activity.xml b/androidApp/src/main/res/layout/units_activity.xml
index a468151..5abb95b 100644
--- a/androidApp/src/main/res/layout/units_activity.xml
+++ b/androidApp/src/main/res/layout/units_activity.xml
@@ -7,14 +7,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <FrameLayout
+ <androidx.fragment.app.FragmentContainerView
android:id="@+id/displayContainer"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/displayModeToggle"