diff options
Diffstat (limited to '')
| -rw-r--r-- | app/src/main/res/drawable/ic_account_circle_24dp.xml (renamed from app/src/main/res/drawable/ic_outline_account_circle_24px.xml) | 0 | ||||
| -rw-r--r-- | app/src/main/res/drawable/ic_inbox_24dp.xml (renamed from app/src/main/res/drawable/ic_outline_inbox_24px.xml) | 0 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_view_subreddit_detail.xml | 78 | ||||
| -rw-r--r-- | app/src/main/res/layout/app_bar_main.xml | 44 |
5 files changed, 113 insertions, 13 deletions
diff --git a/app/src/main/res/drawable/ic_outline_account_circle_24px.xml b/app/src/main/res/drawable/ic_account_circle_24dp.xml index 0c9a104b..0c9a104b 100644 --- a/app/src/main/res/drawable/ic_outline_account_circle_24px.xml +++ b/app/src/main/res/drawable/ic_account_circle_24dp.xml diff --git a/app/src/main/res/drawable/ic_outline_inbox_24px.xml b/app/src/main/res/drawable/ic_inbox_24dp.xml index 97d34185..97d34185 100644 --- a/app/src/main/res/drawable/ic_outline_inbox_24px.xml +++ b/app/src/main/res/drawable/ic_inbox_24dp.xml diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index cf48f84e..ba6cc170 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -64,7 +64,7 @@ android:layout_height="24dp" android:layout_gravity="center_vertical" android:layout_marginEnd="32dp" - android:src="@drawable/ic_outline_account_circle_24px" + android:src="@drawable/ic_account_circle_24dp" android:tint="@color/primaryTextColor"/> <TextView @@ -144,7 +144,7 @@ android:layout_height="24dp" android:layout_gravity="center_vertical" android:layout_marginEnd="32dp" - android:src="@drawable/ic_outline_inbox_24px" + android:src="@drawable/ic_inbox_24dp" android:tint="@color/primaryTextColor"/> <TextView 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 fffa6a96..6743aef0 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -124,14 +124,88 @@ <include layout="@layout/content_view_subreddit_detail" /> + <com.google.android.material.bottomappbar.BottomAppBar + android:id="@+id/bottom_navigation_view_subreddit_detail_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:visibility="gone" + app:backgroundTint="?attr/backgroundColor" + app:fabAlignmentMode="center"> + + <LinearLayout + android:id="@+id/linear_layout_bottom_app_bar_view_subreddit_detail_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:weightSum="5"> + + <ImageView + android:id="@+id/subscriptions_bottom_app_bar_view_subreddit_detail_activity" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:src="@drawable/ic_subscritptions_bottom_app_bar_24dp" + android:textColor="@color/primaryTextColor" + android:background="?attr/selectableItemBackgroundBorderless" /> + + <ImageView + android:id="@+id/multi_reddit_bottom_app_bar_view_subreddit_detail_activity" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:src="@drawable/ic_multi_reddit_24dp" + android:textColor="@color/primaryTextColor" + 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/message_bottom_app_bar_view_subreddit_detail_activity" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:src="@drawable/ic_inbox_24dp" + android:textColor="@color/primaryTextColor" + android:background="?attr/selectableItemBackgroundBorderless" /> + + <ImageView + android:id="@+id/profile_bottom_app_bar_view_subreddit_detail_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:src="@drawable/ic_account_circle_24dp" + android:textColor="@color/primaryTextColor" + android:background="?attr/selectableItemBackgroundBorderless" /> + + </LinearLayout> + </com.google.android.material.bottomappbar.BottomAppBar> + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" + android:visibility="gone" app:backgroundTint="@color/backgroundColorPrimary" + app:srcCompat="@drawable/ic_add_bottom_app_bar_24dp" app:tint="@android:color/white" - app:srcCompat="@drawable/ic_add_24dp" /> + app:layout_anchor="@id/bottom_navigation_view_subreddit_detail_activity" /> </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 a9008a36..e81f6f7b 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -69,16 +69,29 @@ android:id="@+id/linear_layout_bottom_app_bar_main_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:weightSum="3"> + android:weightSum="5"> - <TextView + <ImageView android:id="@+id/subscriptions_bottom_app_bar_main_activity" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:drawableTop="@drawable/ic_subscritptions_bottom_app_bar_24dp" - android:text="@string/subscriptions" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:src="@drawable/ic_subscritptions_bottom_app_bar_24dp" + android:textColor="@color/primaryTextColor" + android:background="?attr/selectableItemBackgroundBorderless" /> + + <ImageView + android:id="@+id/multi_reddit_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:src="@drawable/ic_multi_reddit_24dp" android:textColor="@color/primaryTextColor" android:background="?attr/selectableItemBackgroundBorderless" /> @@ -88,17 +101,30 @@ android:layout_weight="1" android:background="@android:color/transparent"/> - <TextView - android:id="@+id/multi_reddit_bottom_app_bar_main_activity" + <ImageView + android:id="@+id/message_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:src="@drawable/ic_inbox_24dp" + android:textColor="@color/primaryTextColor" + android:background="?attr/selectableItemBackgroundBorderless" /> + + <ImageView + android:id="@+id/profile_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:drawableTop="@drawable/ic_multi_reddit_24dp" - android:text="@string/multi_reddit_listing_activity" + android:src="@drawable/ic_account_circle_24dp" android:textColor="@color/primaryTextColor" - android:background="?attr/selectableItemBackgroundBorderless"/> + android:background="?attr/selectableItemBackgroundBorderless" /> </LinearLayout> </com.google.android.material.bottomappbar.BottomAppBar> |