[Fix] Adjust one hand mode collapsing height & home page

rh-id · Nov 10, 2021 · ce79b76 · ce79b76
1 parent 4152dd6
commit ce79b76
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 30 deletions.
diff --git a/app/src/main/res/layout/one_hand_mode_page_home.xml b/app/src/main/res/layout/one_hand_mode_page_home.xml
@@ -61,47 +61,61 @@
                 app:srcCompat="@drawable/ic_add_white" />
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/nav_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="start"
             android:background="?attr/colorOnPrimary"
             android:orientation="vertical">
 
-            <FrameLayout
+            <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/one_hand_collapsible_height"
-                android:background="?attr/colorSecondary" />
+                android:layout_height="match_parent"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/menu_settings"
-                style="@style/Theme.Anewsprovider.BorderlessMenuButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/settings"
-                app:icon="@drawable/ic_settings_black" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/menu_settings"
+                        style="@style/Theme.Anewsprovider.BorderlessMenuButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/settings"
+                        app:icon="@drawable/ic_settings_black" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="@dimen/text_margin"
+                        android:text="@string/feeds"
+                        android:textSize="@dimen/text_nav_menu" />
+
+                    <FrameLayout
+                        android:id="@+id/container_list_channel"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="@dimen/text_margin" />
+                </LinearLayout>
+            </androidx.core.widget.NestedScrollView>
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <com.google.android.material.textview.MaterialTextView
+                <com.google.android.material.appbar.CollapsingToolbarLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="@dimen/text_margin"
-                    android:text="@string/feeds"
-                    android:textSize="@dimen/text_nav_menu" />
+                    android:layout_height="@dimen/one_hand_collapsible_height"
+                    android:background="?attr/colorSecondary"
+                    app:layout_scrollFlags="scroll|snap" />
 
-                <FrameLayout
-                    android:id="@+id/container_list_channel"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="@dimen/text_margin" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
+            </com.google.android.material.appbar.AppBarLayout>
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
     </androidx.drawerlayout.widget.DrawerLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/page_home.xml b/app/src/main/res/layout/page_home.xml
@@ -43,7 +43,7 @@
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/one_hand_collapsible_height"
+                android:layout_height="100dp"
                 android:background="?attr/colorSecondary" />
 
             <com.google.android.material.button.MaterialButton

diff --git a/app/src/main/res/values-hdpi/dimens.xml b/app/src/main/res/values-hdpi/dimens.xml
@@ -1,4 +1,4 @@
 <resources>
     <!--Allowed height to collapse on one hand mode-->
-    <dimen name="one_hand_collapsible_height">0dp</dimen>
+    <dimen name="one_hand_collapsible_height">100dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-xhdpi/dimens.xml b/app/src/main/res/values-xhdpi/dimens.xml
@@ -1,4 +1,4 @@
 <resources>
     <!--Allowed height to collapse on one hand mode-->
-    <dimen name="one_hand_collapsible_height">120dp</dimen>
+    <dimen name="one_hand_collapsible_height">150dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-xxhdpi/dimens.xml b/app/src/main/res/values-xxhdpi/dimens.xml
@@ -1,4 +1,4 @@
 <resources>
     <!--Allowed height to collapse on one hand mode-->
-    <dimen name="one_hand_collapsible_height">130dp</dimen>
+    <dimen name="one_hand_collapsible_height">240dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-xxxhdpi/dimens.xml b/app/src/main/res/values-xxxhdpi/dimens.xml
@@ -1,4 +1,4 @@
 <resources>
     <!--Allowed height to collapse on one hand mode-->
-    <dimen name="one_hand_collapsible_height">140dp</dimen>
+    <dimen name="one_hand_collapsible_height">320dp</dimen>
 </resources>