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

Update usage of addDrawableAsOverlay function

Signed-off-by: Alper Ozturk <alperozturk@lions-macbook.local>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
Alper Ozturk 1 жил өмнө
parent
commit
68f3c6e273

+ 5 - 1
app/src/androidTest/java/com/owncloud/android/utils/DrawableUtilTests.kt

@@ -25,7 +25,11 @@ class DrawableUtilTests {
         val bitmap: Bitmap = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888)
         val bitmap: Bitmap = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888)
         val drawable = BitmapDrawable(context?.resources, bitmap)
         val drawable = BitmapDrawable(context?.resources, bitmap)
 
 
-        val layerDrawable = sut?.addDrawableAsOverlay(drawable, drawable)
+        if (context == null) {
+            fail("context expected to be not null")
+        }
+
+        val layerDrawable = sut?.addDrawableAsOverlay(context!!, drawable, drawable)
 
 
         if (layerDrawable == null) {
         if (layerDrawable == null) {
             fail("Layer drawable expected to be not null")
             fail("Layer drawable expected to be not null")

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

@@ -54,7 +54,7 @@ class GroupfolderListAdapter(
         val folderDrawable = MimeTypeUtil.getDefaultFolderIcon(context, viewThemeUtils) ?: return null
         val folderDrawable = MimeTypeUtil.getDefaultFolderIcon(context, viewThemeUtils) ?: return null
         val overlayDrawable = ContextCompat.getDrawable(context, R.drawable.ic_folder_overlay_account_group) ?: return null
         val overlayDrawable = ContextCompat.getDrawable(context, R.drawable.ic_folder_overlay_account_group) ?: return null
         val drawableUtil = DrawableUtil()
         val drawableUtil = DrawableUtil()
-        return drawableUtil.addDrawableAsOverlay(folderDrawable, overlayDrawable, 6)
+        return drawableUtil.addDrawableAsOverlay(context, folderDrawable, overlayDrawable)
     }
     }
 
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {

+ 2 - 1
app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java

@@ -24,6 +24,7 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.net.Uri;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 import android.webkit.MimeTypeMap;
 
 
@@ -164,7 +165,7 @@ public final class MimeTypeUtil {
             overlayDrawable = drawableUtil.changeColor(overlayDrawable, R.color.dark);
             overlayDrawable = drawableUtil.changeColor(overlayDrawable, R.color.dark);
         }
         }
 
 
-        return drawableUtil.addDrawableAsOverlay(folderDrawable, overlayDrawable, 3);
+        return drawableUtil.addDrawableAsOverlay(context, folderDrawable, overlayDrawable);
     }
     }
 
 
     /**
     /**