Răsfoiți Sursa

Align grid item in center

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 an în urmă
părinte
comite
27b0694671

+ 9 - 4
app/src/main/res/layout/grid_image.xml

@@ -34,6 +34,7 @@
         <com.elyeproj.loaderviewlibrary.LoaderImageView
             android:id="@+id/thumbnail_shimmer"
             android:visibility="gone"
+            android:layout_marginBottom="@dimen/grid_thumbnail_margin_bottom"
             android:layout_width="@dimen/standard_list_item_size"
             android:layout_height="@dimen/standard_list_item_size"
             android:contentDescription="@null"
@@ -45,6 +46,7 @@
 
         <com.owncloud.android.ui.SquareImageView
             android:id="@+id/thumbnail"
+            android:layout_marginBottom="@dimen/grid_thumbnail_margin_bottom"
             android:layout_width="@dimen/standard_list_item_size"
             android:layout_height="@dimen/standard_list_item_size"
             android:contentDescription="@null"
@@ -151,7 +153,8 @@
         <TextView
             android:id="@+id/Filename"
             android:layout_width="@dimen/grid_filename_width"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/grid_bottom_view_height"
+            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
             android:layout_gravity="center"
             android:ellipsize="middle"
             android:gravity="center"
@@ -159,15 +162,17 @@
             android:text="@string/placeholder_filename"
             android:textColor="@color/text_color"
             android:textSize="@dimen/grid_item_text_size"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/more"
-            app:layout_constraintTop_toBottomOf="@+id/thumbnail"
             tools:visibility="visible" />
 
         <ImageButton
             android:id="@+id/more"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/grid_bottom_view_height"
+            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
             tools:ignore="TouchTargetSizeCheck"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/grid_bottom_view_height"
+            android:layout_marginEnd="@dimen/grid_bottom_view_margin_end"
             android:layout_gravity="center"
             android:background="@color/transparent"
             android:contentDescription="@string/overflow_menu"

+ 9 - 4
app/src/main/res/layout/grid_item.xml

@@ -34,6 +34,7 @@
         <com.elyeproj.loaderviewlibrary.LoaderImageView
             android:id="@+id/thumbnail_shimmer"
             android:visibility="gone"
+            android:layout_marginBottom="@dimen/grid_thumbnail_margin_bottom"
             android:layout_width="@dimen/standard_list_item_size"
             android:layout_height="@dimen/standard_list_item_size"
             android:contentDescription="@null"
@@ -48,6 +49,7 @@
             android:id="@+id/thumbnail"
             android:layout_width="@dimen/standard_list_item_size"
             android:layout_height="@dimen/standard_list_item_size"
+            android:layout_marginBottom="@dimen/grid_thumbnail_margin_bottom"
             android:contentDescription="@null"
             android:src="@drawable/folder"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -138,7 +140,8 @@
         <TextView
             android:id="@+id/Filename"
             android:layout_width="@dimen/grid_filename_width"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/grid_bottom_view_height"
+            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
             android:layout_gravity="center"
             android:ellipsize="middle"
             android:gravity="center"
@@ -146,14 +149,16 @@
             android:text="@string/placeholder_filename"
             android:textColor="@color/text_color"
             android:textSize="@dimen/grid_item_text_size"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/more"
-            app:layout_constraintTop_toBottomOf="@+id/thumbnail"
             tools:visibility="visible" />
 
         <ImageButton
             android:id="@+id/more"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/grid_bottom_view_height"
+            android:layout_height="@dimen/grid_bottom_view_height"
+            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
+            android:layout_marginEnd="@dimen/grid_bottom_view_margin_end"
             android:translationZ="2dp"
             tools:ignore="TouchTargetSizeCheck"
             android:layout_gravity="center"

+ 4 - 0
app/src/main/res/values/dims.xml

@@ -110,6 +110,10 @@
     <dimen name="notification_icon_height">24dp</dimen>
     <dimen name="grid_container_margin">4dp</dimen>
     <dimen name="selected_grid_container_radius">4dp</dimen>
+    <dimen name="grid_thumbnail_margin_bottom">18dp</dimen>
+    <dimen name="grid_bottom_view_margin_bottom">10dp</dimen>
+    <dimen name="grid_bottom_view_margin_end">6dp</dimen>
+    <dimen name="grid_bottom_view_height">20dp</dimen>
     <dimen name="grid_container_width">130dp</dimen>
     <dimen name="grid_container_height">120dp</dimen>
     <dimen name="grid_filename_width">80dp</dimen>