Browse Source

Fix the shimmer that had been accidentally hidden on master

Signed-off-by: Abdourahamane BOINAIDI <abdourahamane.boinaidi@infomaniak.com>
Abdourahamane BOINAIDI 5 years ago
parent
commit
fec01b6db5

+ 16 - 23
src/main/res/layout/grid_image.xml

@@ -30,32 +30,25 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <FrameLayout
-            android:id="@+id/shimmer_view_container"
+        <com.elyeproj.loaderviewlibrary.LoaderImageView
+            android:id="@+id/thumbnail_shimmer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:clipChildren="true">
+            android:layout_margin="@dimen/grid_image_icon_margin"
+            android:contentDescription="@null"
+            android:visibility="gone"
+            app:corners="6"
+            app:height_weight="0.6"
+            app:width_weight="0.4" />
 
-            <com.elyeproj.loaderviewlibrary.LoaderImageView
-                android:id="@+id/thumbnail_shimmer"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_margin="@dimen/grid_image_icon_margin"
-                android:contentDescription="@null"
-                android:visibility="gone"
-                app:corners="6"
-                app:height_weight="0.6"
-                app:width_weight="0.4" />
-
-            <com.owncloud.android.ui.SquareImageView
-                android:id="@+id/thumbnail"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@null"
-                android:padding="@dimen/grid_image_icon_padding"
-                android:scaleType="centerCrop"
-                android:src="@drawable/folder" />
-        </FrameLayout>
+        <com.owncloud.android.ui.SquareImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@null"
+            android:padding="@dimen/grid_image_icon_padding"
+            android:scaleType="centerCrop"
+            android:src="@drawable/folder" />
 
         <ImageView
             android:id="@+id/favorite_action"

+ 14 - 20
src/main/res/layout/grid_item.xml

@@ -30,27 +30,21 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal">
 
-        <FrameLayout
-            android:id="@+id/shimmer_view_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
+        <com.elyeproj.loaderviewlibrary.LoaderImageView
+            android:id="@+id/thumbnail_shimmer"
+            android:layout_width="@dimen/standard_list_item_size"
+            android:layout_height="@dimen/standard_list_item_size"
+            android:layout_gravity="center"
+            android:visibility="gone"
+            app:corners="8" />
 
-            <com.elyeproj.loaderviewlibrary.LoaderImageView
-                android:id="@+id/thumbnail_shimmer"
-                android:layout_width="@dimen/standard_list_item_size"
-                android:layout_height="@dimen/standard_list_item_size"
-                android:visibility="gone"
-                app:corners="8" />
-
-            <ImageView
-                android:id="@+id/thumbnail"
-                android:layout_width="@dimen/standard_list_item_size"
-                android:layout_height="@dimen/standard_list_item_size"
-                android:layout_gravity="center"
-                android:contentDescription="@null"
-                android:src="@drawable/folder" />
-        </FrameLayout>
+        <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="@dimen/standard_list_item_size"
+            android:layout_height="@dimen/standard_list_item_size"
+            android:layout_gravity="center"
+            android:contentDescription="@null"
+            android:src="@drawable/folder" />
 
         <ImageView
             android:id="@+id/favorite_action"

+ 7 - 15
src/main/res/layout/list_item.xml

@@ -45,25 +45,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <RelativeLayout
-            android:id="@+id/shimmer_view_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
+        <com.elyeproj.loaderviewlibrary.LoaderImageView
+            android:id="@+id/thumbnail_shimmer"
+            android:layout_width="@dimen/file_icon_size"
+            android:layout_height="@dimen/file_icon_size"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.elyeproj.loaderviewlibrary.LoaderImageView
-                android:id="@+id/thumbnail_shimmer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/standard_half_margin"
-                android:visibility="gone"
-                app:corners="8" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:corners="8" />
 
-        </RelativeLayout>
 
         <ImageView
             android:id="@+id/localFileIndicator"