aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2020-02-22 10:37:49 +0000
committerAlex Ning <chineseperson5@gmail.com>2020-02-22 10:37:49 +0000
commit056073538026cbc1561611c25dee3782c5b22d9e (patch)
tree4b41fcc9b43836453ebcb9aafcabe0d986f612a0 /app/src/main/res
parent4c6902a399bc63d097f844f4717b82a3dd60464d (diff)
downloadinfinity-for-reddit-056073538026cbc1561611c25dee3782c5b22d9e.tar
infinity-for-reddit-056073538026cbc1561611c25dee3782c5b22d9e.tar.gz
infinity-for-reddit-056073538026cbc1561611c25dee3782c5b22d9e.tar.bz2
infinity-for-reddit-056073538026cbc1561611c25dee3782c5b22d9e.tar.lz
infinity-for-reddit-056073538026cbc1561611c25dee3782c5b22d9e.tar.xz
infinity-for-reddit-056073538026cbc1561611c25dee3782c5b22d9e.tar.zst
infinity-for-reddit-056073538026cbc1561611c25dee3782c5b22d9e.zip
Revert the change to make some activities immersive.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_create_multi_reddit.xml24
-rw-r--r--app/src/main/res/layout/activity_post_image.xml24
-rw-r--r--app/src/main/res/layout/activity_post_link.xml24
-rw-r--r--app/src/main/res/layout/activity_post_text.xml24
-rw-r--r--app/src/main/res/layout/activity_post_video.xml24
5 files changed, 25 insertions, 95 deletions
diff --git a/app/src/main/res/layout/activity_create_multi_reddit.xml b/app/src/main/res/layout/activity_create_multi_reddit.xml
index 24c69355..5a06e5ec 100644
--- a/app/src/main/res/layout/activity_create_multi_reddit.xml
+++ b/app/src/main/res/layout/activity_create_multi_reddit.xml
@@ -8,37 +8,23 @@
tools:context=".Activity.CreateMultiRedditActivity">
<com.google.android.material.appbar.AppBarLayout
- android:id="@+id/appbar_layout_create_multi_reddit_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay">
- <com.google.android.material.appbar.CollapsingToolbarLayout
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar_create_multi_reddit_activity"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_scrollFlags="scroll|enterAlways"
- app:titleEnabled="false"
- app:toolbarId="@+id/toolbar_subscribed_subreddits_multiselection_activity">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar_create_multi_reddit_activity"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- app:layout_collapseMode="pin"
- app:layout_scrollFlags="scroll|enterAlways"
- app:popupTheme="@style/AppTheme.PopupOverlay"
- app:navigationIcon="?attr/homeAsUpIndicator" />
-
- </com.google.android.material.appbar.CollapsingToolbarLayout>
+ android:layout_height="?attr/actionBarSize"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
- android:id="@+id/nested_scroll_view_create_multi_reddit_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index c4de4f85..9c320679 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -9,37 +9,23 @@
tools:application=".PostImageActivity">
<com.google.android.material.appbar.AppBarLayout
- android:id="@+id/appbar_layout_post_image_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay">
- <com.google.android.material.appbar.CollapsingToolbarLayout
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar_post_image_activity"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_scrollFlags="scroll|enterAlways"
- app:titleEnabled="false"
- app:toolbarId="@+id/toolbar_subscribed_subreddits_multiselection_activity">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar_post_image_activity"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- app:layout_collapseMode="pin"
- app:layout_scrollFlags="scroll|enterAlways"
- app:popupTheme="@style/AppTheme.PopupOverlay"
- app:navigationIcon="?attr/homeAsUpIndicator" />
-
- </com.google.android.material.appbar.CollapsingToolbarLayout>
+ android:layout_height="?attr/actionBarSize"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
- android:id="@+id/nested_scroll_view_post_image_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index acaae587..24ba75b6 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -9,37 +9,23 @@
tools:application=".PostTextActivity">
<com.google.android.material.appbar.AppBarLayout
- android:id="@+id/appbar_layout_post_link_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay">
- <com.google.android.material.appbar.CollapsingToolbarLayout
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar_post_link_activity"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_scrollFlags="scroll|enterAlways"
- app:titleEnabled="false"
- app:toolbarId="@+id/toolbar_subscribed_subreddits_multiselection_activity">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar_post_link_activity"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- app:layout_collapseMode="pin"
- app:layout_scrollFlags="scroll|enterAlways"
- app:popupTheme="@style/AppTheme.PopupOverlay"
- app:navigationIcon="?attr/homeAsUpIndicator" />
-
- </com.google.android.material.appbar.CollapsingToolbarLayout>
+ android:layout_height="?attr/actionBarSize"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
- android:id="@+id/nested_scroll_view_post_link_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index 98dc7113..7cabdf0b 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -9,37 +9,23 @@
tools:application=".PostTextActivity">
<com.google.android.material.appbar.AppBarLayout
- android:id="@+id/appbar_layout_post_text_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay">
- <com.google.android.material.appbar.CollapsingToolbarLayout
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar_post_text_activity"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_scrollFlags="scroll|enterAlways"
- app:titleEnabled="false"
- app:toolbarId="@+id/toolbar_subscribed_subreddits_multiselection_activity">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar_post_text_activity"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- app:layout_collapseMode="pin"
- app:layout_scrollFlags="scroll|enterAlways"
- app:popupTheme="@style/AppTheme.PopupOverlay"
- app:navigationIcon="?attr/homeAsUpIndicator" />
-
- </com.google.android.material.appbar.CollapsingToolbarLayout>
+ android:layout_height="?attr/actionBarSize"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
- android:id="@+id/nested_scroll_view_post_text_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index f5e4371f..2e3057d5 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -9,37 +9,23 @@
tools:application=".PostImageActivity">
<com.google.android.material.appbar.AppBarLayout
- android:id="@+id/appbar_layout_post_video_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay">
- <com.google.android.material.appbar.CollapsingToolbarLayout
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar_post_video_activity"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_scrollFlags="scroll|enterAlways"
- app:titleEnabled="false"
- app:toolbarId="@+id/toolbar_subscribed_subreddits_multiselection_activity">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar_post_video_activity"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- app:layout_collapseMode="pin"
- app:layout_scrollFlags="scroll|enterAlways"
- app:popupTheme="@style/AppTheme.PopupOverlay"
- app:navigationIcon="?attr/homeAsUpIndicator" />
-
- </com.google.android.material.appbar.CollapsingToolbarLayout>
+ android:layout_height="?attr/actionBarSize"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
- android:id="@+id/nested_scroll_view_post_video_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
generated by cgit (git). Responsive design from responsive-cgit-css. Dark theme color palette from Dracula theme