forked from upstream-mirrors/OpenTracks
Track edit and Marker edit do not need bottom bar.
This commit is contained in:
@@ -107,8 +107,6 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit
|
|||||||
|
|
||||||
viewBinding.trackEditCancel.setOnClickListener(v -> finish());
|
viewBinding.trackEditCancel.setOnClickListener(v -> finish());
|
||||||
viewBinding.trackEditCancel.setVisibility(View.VISIBLE);
|
viewBinding.trackEditCancel.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -164,8 +164,6 @@ public class MarkerEditActivity extends AbstractActivity {
|
|||||||
} else {
|
} else {
|
||||||
loadMarkerData(markerId);
|
loadMarkerData(markerId);
|
||||||
}
|
}
|
||||||
|
|
||||||
setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private LiveData<Marker> createNewMarker() {
|
private LiveData<Marker> createNewMarker() {
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ limitations under the License.
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_marginBottom="@dimen/m3_bottom_nav_min_height"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
||||||
|
|
||||||
<ScrollView style="@style/ScrollView.WithBottomButtons">
|
<ScrollView style="@style/ScrollView.WithBottomButtons">
|
||||||
@@ -151,8 +150,4 @@ limitations under the License.
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
|
||||||
android:id="@+id/bottom_app_bar_layout"
|
|
||||||
layout="@layout/bottomappbar" />
|
|
||||||
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
@@ -20,8 +20,7 @@ limitations under the License.
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical">
|
||||||
android:paddingBottom="@dimen/m3_bottom_nav_min_height">
|
|
||||||
|
|
||||||
<include
|
<include
|
||||||
android:id="@+id/fields"
|
android:id="@+id/fields"
|
||||||
@@ -46,8 +45,4 @@ limitations under the License.
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
|
||||||
android:id="@+id/bottom_app_bar_layout"
|
|
||||||
layout="@layout/bottomappbar" />
|
|
||||||
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||||
Reference in New Issue
Block a user