Parcourir la source

Check LivePhotoIndicatorSeparator

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk il y a 1 an
Parent
commit
7ca84b657f

+ 1 - 0
app/src/main/java/com/owncloud/android/ui/adapter/ListGridImageViewHolder.kt

@@ -37,4 +37,5 @@ interface ListGridImageViewHolder {
     val itemLayout: View
     val itemLayout: View
     val unreadComments: ImageView
     val unreadComments: ImageView
     val livePhotoIndicator: TextView
     val livePhotoIndicator: TextView
+    val livePhotoIndicatorSeparator: TextView
 }
 }

+ 4 - 0
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -390,6 +390,10 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
 
     private void checkLivePhotoAvailability(ListGridImageViewHolder holder, OCFile file) {
     private void checkLivePhotoAvailability(ListGridImageViewHolder holder, OCFile file) {
         holder.getLivePhotoIndicator().setVisibility((file.isLivePhoto()) ? (View.VISIBLE) : (View.GONE));
         holder.getLivePhotoIndicator().setVisibility((file.isLivePhoto()) ? (View.VISIBLE) : (View.GONE));
+
+        // FIXME Interface segregation principle violation
+        // Not needed for Grid mode unfortunately ListGridImageViewHolder interface used for List and Grid mode
+        holder.getLivePhotoIndicatorSeparator().setVisibility((file.isLivePhoto()) ? (View.VISIBLE) : (View.GONE));
     }
     }
 
 
     private void bindListItemViewHolder(ListItemViewHolder holder, OCFile file) {
     private void bindListItemViewHolder(ListItemViewHolder holder, OCFile file) {

+ 2 - 0
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListGridImageViewHolder.kt

@@ -56,6 +56,8 @@ internal class OCFileListGridImageViewHolder(var binding: GridImageBinding) :
         get() = binding.unreadComments
         get() = binding.unreadComments
     override val livePhotoIndicator: TextView
     override val livePhotoIndicator: TextView
         get() = binding.livePhotoIndicator
         get() = binding.livePhotoIndicator
+    override val livePhotoIndicatorSeparator: TextView
+        get() = binding.livePhotoIndicatorSeparator
 
 
     init {
     init {
         binding.favoriteAction.drawable.mutate()
         binding.favoriteAction.drawable.mutate()

+ 2 - 0
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListGridItemViewHolder.kt

@@ -58,6 +58,8 @@ internal class OCFileListGridItemViewHolder(var binding: GridItemBinding) :
         get() = binding.unreadComments
         get() = binding.unreadComments
     override val livePhotoIndicator: TextView
     override val livePhotoIndicator: TextView
         get() = binding.livePhotoIndicator
         get() = binding.livePhotoIndicator
+    override val livePhotoIndicatorSeparator: TextView
+        get() = binding.livePhotoIndicatorSeparator
 
 
     init {
     init {
         binding.favoriteAction.drawable.mutate()
         binding.favoriteAction.drawable.mutate()

+ 2 - 0
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListItemViewHolder.kt

@@ -39,6 +39,8 @@ internal class OCFileListItemViewHolder(private var binding: ListItemBinding) :
     ListItemViewHolder {
     ListItemViewHolder {
     override val livePhotoIndicator: TextView
     override val livePhotoIndicator: TextView
         get() = binding.livePhotoIndicator
         get() = binding.livePhotoIndicator
+    override val livePhotoIndicatorSeparator: TextView
+        get() = binding.livePhotoIndicatorSeparator
     override val fileSize: TextView
     override val fileSize: TextView
         get() = binding.fileSize
         get() = binding.fileSize
     override val fileSizeSeparator: View
     override val fileSizeSeparator: View

+ 6 - 0
app/src/main/res/layout/grid_image.xml

@@ -106,6 +106,12 @@
         android:textSize="@dimen/two_line_secondary_text_size"
         android:textSize="@dimen/two_line_secondary_text_size"
         app:drawableTopCompat="@drawable/ic_live_photo" />
         app:drawableTopCompat="@drawable/ic_live_photo" />
 
 
+    <TextView
+        android:id="@+id/live_photo_indicator_separator"
+        android:visibility="gone"
+        android:layout_width="0dp"
+        android:layout_height="0dp"/>
+
     <ImageView
     <ImageView
         android:id="@+id/custom_checkbox"
         android:id="@+id/custom_checkbox"
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"

+ 11 - 0
app/src/main/res/layout/grid_item.xml

@@ -40,6 +40,17 @@
             app:layout_constraintEnd_toStartOf="@+id/favorite_action"
             app:layout_constraintEnd_toStartOf="@+id/favorite_action"
             tools:ignore="HardcodedText" />
             tools:ignore="HardcodedText" />
 
 
+        <TextView
+            android:contentDescription="Ignore live photo indicator for folder"
+            android:id="@+id/live_photo_indicator_separator"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginBottom="12dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toTopOf="@+id/frameLayout"
+            app:layout_constraintEnd_toStartOf="@+id/favorite_action"
+            tools:ignore="HardcodedText" />
+
         <ImageView
         <ImageView
             android:id="@+id/favorite_action"
             android:id="@+id/favorite_action"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"

+ 4 - 1
app/src/main/res/layout/list_item.xml

@@ -177,6 +177,9 @@
                     app:drawableLeftCompat="@drawable/ic_live_photo" />
                     app:drawableLeftCompat="@drawable/ic_live_photo" />
 
 
                 <TextView
                 <TextView
+                    android:id="@+id/live_photo_indicator_separator"
+                    android:visibility="gone"
+                    tools:visibility="visible"
                     android:layout_width="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="end"
                     android:gravity="end"
@@ -229,7 +232,7 @@
 
 
         <ImageView
         <ImageView
             android:id="@+id/unreadComments"
             android:id="@+id/unreadComments"
-            android:layout_width="wrap_content"
+            android:layout_width="48dp"
             android:layout_height="match_parent"
             android:layout_height="match_parent"
             android:clickable="true"
             android:clickable="true"
             android:contentDescription="@string/unread_comments"
             android:contentDescription="@string/unread_comments"