Эх сурвалжийг харах

Remove up/down animation for FAB, add list padding (#2456) e411f542 arkon <[email protected]> Jan 8, 2020 at 21:33

arkon 5 жил өмнө
parent
commit
9bb3195bca

+ 5 - 4
app/src/main/res/layout/categories_controller.xml

@@ -6,12 +6,13 @@
              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
+        android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/recycler"
         android:choiceMode="multipleChoice"
-        tools:listitem="@layout/categories_item"
-        />
+        android:paddingBottom="@dimen/fab_list_padding"
+        android:clipToPadding="false"
+        tools:listitem="@layout/categories_item" />
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
@@ -26,4 +27,4 @@
         android:layout_gravity="center"
         android:layout_height="wrap_content" />
 
-</FrameLayout>
+</FrameLayout>

+ 2 - 0
app/src/main/res/layout/chapters_controller.xml

@@ -28,6 +28,8 @@
             android:layout_height="match_parent"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
+            android:paddingBottom="@dimen/fab_list_padding"
+            android:clipToPadding="false"
             android:descendantFocusability="blocksDescendants"
             tools:listitem="@layout/chapters_item">
 

+ 3 - 1
app/src/main/res/values/dimens.xml

@@ -6,9 +6,11 @@
     <dimen name="margin_bottom">16dp</dimen>
     <dimen name="margin_left">16dp</dimen>
     <dimen name="margin_right">16dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
     <dimen name="space_between_cards">4dp</dimen>
+
     <dimen name="fab_size">56dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="fab_list_padding">88dp</dimen>
 
     <dimen name="dialog_content_padding">24dp</dimen>
     <dimen name="dialog_margin_top_content">20dp</dimen>

+ 0 - 1
app/src/main/res/values/styles.xml

@@ -145,7 +145,6 @@
         <item name="android:scaleType">fitCenter</item>
         <item name="layout_anchorGravity">bottom|right|end</item>
         <item name="android:tint">@color/md_white_1000</item>
-        <item name="layout_behavior">eu.kanade.tachiyomi.widget.FABAnimationUpDown</item>
     </style>
 
     <style name="Theme.Widget.CardView" parent="CardView">