diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-17 23:46:13 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-17 23:46:13 -0600 |
| commit | 675eb2739105e53a8f5f0f602b3c2b2206d28623 (patch) | |
| tree | 183b82c471e611d6de0390270e690e238265b149 /androidApp/src/main/res/layout/unit_map_fragment.xml | |
| parent | 9ff880b37f3e44aa3edbd402c8c01aed5467e26a (diff) | |
| parent | 9325b6e0de41e8446bb6ce66915fb0c9fe0de4f3 (diff) | |
| download | etbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.tar.gz etbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.tar.bz2 etbsa-trackermap-mobile-675eb2739105e53a8f5f0f602b3c2b2206d28623.zip | |
Merge branch 'main' of https://git.sr.ht/~avalos/trackermap-mobile
Conflicts:
androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
Diffstat (limited to 'androidApp/src/main/res/layout/unit_map_fragment.xml')
| -rw-r--r-- | androidApp/src/main/res/layout/unit_map_fragment.xml | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/androidApp/src/main/res/layout/unit_map_fragment.xml b/androidApp/src/main/res/layout/unit_map_fragment.xml index a86a7e9..f168662 100644 --- a/androidApp/src/main/res/layout/unit_map_fragment.xml +++ b/androidApp/src/main/res/layout/unit_map_fragment.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - <fragment + <androidx.fragment.app.FragmentContainerView android:id="@+id/unitsMap" android:layout_width="0dp" android:layout_height="0dp" @@ -14,7 +14,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:name="mx.trackermap.TrackerMap.android.map.MapFragment" tools:visibility="visible"/> <androidx.cardview.widget.CardView @@ -143,24 +142,4 @@ </androidx.cardview.widget.CardView> - <!-- Attribution --> - <FrameLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:background="@color/colorAttributionBackground" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent"> - - <TextView - android:id="@+id/attributionText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:text="Copyright (C) OpenStreetMap" - android:textSize="@dimen/attribution_text_size" - android:textColor="@color/colorAttributionText" - android:layout_margin="6dp" /> - - </FrameLayout> - </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |