From 00258fd93e6433338d5628a35656fe874e90ad1d Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 7 Sep 2024 12:35:31 +0200
Subject: [PATCH] Track edit and Marker edit do not need bottom bar.

---
 .../java/de/dennisguse/opentracks/TrackEditActivity.java   | 2 --
 .../opentracks/ui/markers/MarkerEditActivity.java          | 2 --
 src/main/res/layout/marker_edit.xml                        | 5 -----
 src/main/res/layout/track_edit.xml                         | 7 +------
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
index bb0f90303..17446b822 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
@@ -107,8 +107,6 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
 
         viewBinding.trackEditCancel.setOnClickListener(v -> finish());
         viewBinding.trackEditCancel.setVisibility(View.VISIBLE);
-
-        setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java
index 40a272982..522326a36 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java
@@ -164,8 +164,6 @@ public class MarkerEditActivity extends AbstractActivity {
         } else {
             loadMarkerData(markerId);
         }
-
-        setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
 
     private LiveData<Marker> createNewMarker() {
diff --git a/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml
index d56aa8c16..c28713f0c 100644
--- a/src/main/res/layout/marker_edit.xml
+++ b/src/main/res/layout/marker_edit.xml
@@ -34,7 +34,6 @@ limitations under the License.
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_marginBottom="@dimen/m3_bottom_nav_min_height"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <ScrollView style="@style/ScrollView.WithBottomButtons">
@@ -151,8 +150,4 @@ limitations under the License.
         </LinearLayout>
     </LinearLayout>
 
-    <include
-        android:id="@+id/bottom_app_bar_layout"
-        layout="@layout/bottomappbar" />
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_edit.xml b/src/main/res/layout/track_edit.xml
index 203698e51..cd7148279 100644
--- a/src/main/res/layout/track_edit.xml
+++ b/src/main/res/layout/track_edit.xml
@@ -20,8 +20,7 @@ limitations under the License.
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/m3_bottom_nav_min_height">
+        android:orientation="vertical">
 
         <include
             android:id="@+id/fields"
@@ -46,8 +45,4 @@ limitations under the License.
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/bottom_app_bar_layout"
-        layout="@layout/bottomappbar" />
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file