diff options
Diffstat (limited to 'androidApp/src/main/res')
5 files changed, 113 insertions, 23 deletions
diff --git a/androidApp/src/main/res/drawable/icon_zoom_in.xml b/androidApp/src/main/res/drawable/icon_zoom_in.xml new file mode 100644 index 0000000..eb23254 --- /dev/null +++ b/androidApp/src/main/res/drawable/icon_zoom_in.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> +</vector> diff --git a/androidApp/src/main/res/drawable/icon_zoom_out.xml b/androidApp/src/main/res/drawable/icon_zoom_out.xml new file mode 100644 index 0000000..791a2f8 --- /dev/null +++ b/androidApp/src/main/res/drawable/icon_zoom_out.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M19,13H5v-2h14v2z"/> +</vector> diff --git a/androidApp/src/main/res/layout/fragment_map_wrapper.xml b/androidApp/src/main/res/layout/fragment_map_wrapper.xml new file mode 100644 index 0000000..949cc10 --- /dev/null +++ b/androidApp/src/main/res/layout/fragment_map_wrapper.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <androidx.fragment.app.FragmentContainerView + android:id="@+id/mapContainer" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:visibility="visible"/> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/overlay" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/zoomInButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/fab_margin" + android:layout_marginEnd="@dimen/fab_margin" + android:backgroundTint="@android:color/white" + android:contentDescription="@string/switch_layer" + android:src="@drawable/icon_zoom_in" + app:borderWidth="0dp" + app:elevation="@dimen/fab_elevation" + app:fabSize="mini" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/zoomOutButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/fab_margin" + android:backgroundTint="@android:color/white" + android:contentDescription="@string/switch_layer" + android:src="@drawable/icon_zoom_out" + app:borderWidth="0dp" + app:elevation="@dimen/fab_elevation" + app:fabSize="mini" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/zoomInButton" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/mapLayerToggle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/fab_margin" + android:backgroundTint="@android:color/white" + android:contentDescription="@string/switch_layer" + android:src="@drawable/icon_layers" + app:borderWidth="0dp" + app:elevation="@dimen/fab_elevation" + app:fabSize="mini" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/zoomOutButton" + android:visibility="gone" /> + + <!-- 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> + + <include + android:id="@+id/mapLoading" + layout="@layout/loading_indicator" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"/> + +</FrameLayout>
\ No newline at end of file diff --git a/androidApp/src/main/res/layout/unit_details_reports.xml b/androidApp/src/main/res/layout/unit_details_reports.xml index 7210e1f..f53ce51 100644 --- a/androidApp/src/main/res/layout/unit_details_reports.xml +++ b/androidApp/src/main/res/layout/unit_details_reports.xml @@ -7,7 +7,6 @@ <androidx.fragment.app.FragmentContainerView android:id="@+id/reportsMapContainer" - android:name="mx.trackermap.TrackerMap.android.map.MapFragment" android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="@dimen/margin" 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 |