diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2019-08-12 01:26:27 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2019-08-12 01:26:27 +0000 |
| commit | 90c7c664053efe0f09c971ba5ee7a63b3a57b3c6 (patch) | |
| tree | 8e72bb4a0155b3b497c5eca301daee65256e9047 /app/src/main/res/layout | |
| parent | 002fa44d8a8e640dfe6643f65b266b552be029cb (diff) | |
| download | infinity-for-reddit-90c7c664053efe0f09c971ba5ee7a63b3a57b3c6.tar infinity-for-reddit-90c7c664053efe0f09c971ba5ee7a63b3a57b3c6.tar.gz infinity-for-reddit-90c7c664053efe0f09c971ba5ee7a63b3a57b3c6.tar.bz2 infinity-for-reddit-90c7c664053efe0f09c971ba5ee7a63b3a57b3c6.tar.lz infinity-for-reddit-90c7c664053efe0f09c971ba5ee7a63b3a57b3c6.tar.xz infinity-for-reddit-90c7c664053efe0f09c971ba5ee7a63b3a57b3c6.tar.zst infinity-for-reddit-90c7c664053efe0f09c971ba5ee7a63b3a57b3c6.zip | |
Fixed nav bar icon color in dark theme. Transparent nav bar in SubredditSelectionActivity for Android version >= 8.1.
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_rules.xml | 34 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_subreddit_selection.xml | 20 |
2 files changed, 46 insertions, 8 deletions
diff --git a/app/src/main/res/layout/activity_rules.xml b/app/src/main/res/layout/activity_rules.xml index a5764fa9..55f0ba07 100644 --- a/app/src/main/res/layout/activity_rules.xml +++ b/app/src/main/res/layout/activity_rules.xml @@ -6,22 +6,50 @@ android:layout_height="match_parent" tools:application=".RulesActivity"> + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_rules_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + + <com.google.android.material.appbar.CollapsingToolbarLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_rules_activity"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_rules_activity" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> + + </com.google.android.material.appbar.AppBarLayout> + <ProgressBar android:id="@+id/progress_bar_rules_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" /> + android:layout_gravity="center" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view_rules_activity" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:clipToPadding="false" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> <TextView android:id="@+id/error_text_view_rules_activity" android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:visibility="gone" /> + android:visibility="gone" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_subreddit_selection.xml b/app/src/main/res/layout/activity_subreddit_selection.xml index 6306a39f..92be6bbe 100644 --- a/app/src/main/res/layout/activity_subreddit_selection.xml +++ b/app/src/main/res/layout/activity_subreddit_selection.xml @@ -7,16 +7,26 @@ tools:application=".SubredditSelectionActivity"> <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_subreddit_selection_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar_subreddit_selection_activity" + <com.google.android.material.appbar.CollapsingToolbarLayout android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - app:popupTheme="@style/AppTheme.PopupOverlay" - app:navigationIcon="?attr/homeAsUpIndicator" /> + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_subreddit_selection_activity"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_subreddit_selection_activity" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.AppBarLayout> |