diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-17 01:02:36 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-17 01:02:36 -0600 |
| commit | 70d21d0dab61fc2b30f64721279b27a2c8a01d7a (patch) | |
| tree | db5c7b3f53e020193dafbead813899b00573e782 /androidApp/src/main/res/layout | |
| parent | 70af8a0fffe32033230d8f7a4d23f098d4b742bb (diff) | |
| parent | 6858de4bf2ba110abc29078194135d971ce71aa5 (diff) | |
| download | etbsa-trackermap-mobile-70d21d0dab61fc2b30f64721279b27a2c8a01d7a.tar.gz etbsa-trackermap-mobile-70d21d0dab61fc2b30f64721279b27a2c8a01d7a.tar.bz2 etbsa-trackermap-mobile-70d21d0dab61fc2b30f64721279b27a2c8a01d7a.zip | |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Conflicts:
androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
androidApp/src/main/res/values/map_layers.xml
Diffstat (limited to 'androidApp/src/main/res/layout')
| -rw-r--r-- | androidApp/src/main/res/layout/unit_map_fragment.xml | 2 | ||||
| -rw-r--r-- | androidApp/src/main/res/layout/units_activity.xml | 4 |
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" |