diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_view_subreddit_detail.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_view_user_detail.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/app_bar_main.xml | 68 | ||||
| -rw-r--r-- | app/src/main/res/layout/bottom_app_bar_other_activities.xml (renamed from app/src/main/res/layout/bottom_app_bar_other_pages.xml) | 12 |
4 files changed, 14 insertions, 74 deletions
diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index 529397c8..ef26b762 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -173,7 +173,7 @@ </com.google.android.material.appbar.AppBarLayout> <include - layout="@layout/bottom_app_bar_other_pages" + layout="@layout/bottom_app_bar_other_activities" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" /> @@ -185,6 +185,6 @@ android:layout_margin="@dimen/fab_margin" android:visibility="gone" app:tint="@android:color/white" - app:layout_anchor="@id/bottom_navigation_view_subreddit_detail_activity" /> + app:layout_anchor="@id/bottom_app_bar_bottom_app_bar" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index 4d86a13c..3ace2e08 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -140,7 +140,7 @@ </com.google.android.material.appbar.AppBarLayout> <include - layout="@layout/bottom_app_bar_other_pages" + layout="@layout/bottom_app_bar_other_activities" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" /> @@ -152,6 +152,6 @@ android:layout_margin="@dimen/fab_margin" android:visibility="gone" app:tint="@android:color/white" - app:layout_anchor="@id/bottom_navigation_view_subreddit_detail_activity" /> + app:layout_anchor="@id/bottom_app_bar_bottom_app_bar" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index e28e8138..c17ef9f7 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -51,71 +51,11 @@ android:layout_height="wrap_content" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - <com.google.android.material.bottomappbar.BottomAppBar - android:id="@+id/bottom_app_bar_main_activity" + <include + layout="@layout/bottom_app_bar_other_activities" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:visibility="gone" - app:fabAlignmentMode="center"> - - <LinearLayout - android:id="@+id/linear_layout_bottom_app_bar_main_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="6dp" - android:weightSum="5"> - - <ImageView - android:id="@+id/option_1_bottom_app_bar_main_activity" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:background="?attr/selectableItemBackgroundBorderless" /> - - <ImageView - android:id="@+id/option_2_bottom_app_bar_main_activity" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:background="?attr/selectableItemBackgroundBorderless" /> - - <TextView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:background="@android:color/transparent"/> - - <ImageView - android:id="@+id/option_3_bottom_app_bar_main_activity" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:background="?attr/selectableItemBackgroundBorderless" /> - - <ImageView - android:id="@+id/option_4_bottom_app_bar_main_activity" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_marginEnd="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:gravity="center" - android:background="?attr/selectableItemBackgroundBorderless" /> - - </LinearLayout> - - </com.google.android.material.bottomappbar.BottomAppBar> + android:layout_gravity="bottom" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab_main_activity" @@ -124,6 +64,6 @@ android:layout_margin="@dimen/fab_margin" android:visibility="gone" app:tint="@android:color/white" - app:layout_anchor="@id/bottom_app_bar_main_activity" /> + app:layout_anchor="@id/bottom_app_bar_bottom_app_bar" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/bottom_app_bar_other_pages.xml b/app/src/main/res/layout/bottom_app_bar_other_activities.xml index dd4c9bae..fa1d886f 100644 --- a/app/src/main/res/layout/bottom_app_bar_other_pages.xml +++ b/app/src/main/res/layout/bottom_app_bar_other_activities.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <com.google.android.material.bottomappbar.BottomAppBar xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/bottom_navigation_view_subreddit_detail_activity" + android:id="@+id/bottom_app_bar_bottom_app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" app:fabAlignmentMode="center"> <LinearLayout - android:id="@+id/linear_layout_bottom_app_bar_view_subreddit_detail_activity" + android:id="@+id/linear_layout_bottom_app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="6dp" android:weightSum="5"> <ImageView - android:id="@+id/option_1_bottom_app_bar_view_subreddit_detail_activity" + android:id="@+id/option_1_bottom_app_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -25,7 +25,7 @@ android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView - android:id="@+id/option_2_bottom_app_bar_view_subreddit_detail_activity" + android:id="@+id/option_2_bottom_app_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -41,7 +41,7 @@ android:background="@android:color/transparent"/> <ImageView - android:id="@+id/option_3_bottom_app_bar_view_subreddit_detail_activity" + android:id="@+id/option_3_bottom_app_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" @@ -51,7 +51,7 @@ android:background="?attr/selectableItemBackgroundBorderless" /> <ImageView - android:id="@+id/option_4_bottom_app_bar_view_subreddit_detail_activity" + android:id="@+id/option_4_bottom_app_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" |