Prechádzať zdrojové kódy

extract doubled code

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 5 rokov pred
rodič
commit
82dd14f6bc

+ 1 - 6
src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -520,12 +520,7 @@ public final class ThumbnailsCacheManager {
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
                         if (roundedCorners) {
-                            Resources resources = MainApp.getAppContext().getResources();
-
-                            BitmapUtils.setRoundedBitmap(resources,
-                                                         bitmap,
-                                                         resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
-                                                         imageView);
+                            BitmapUtils.setRoundedBitmap(bitmap, imageView);
                         } else {
                             imageView.setImageBitmap(bitmap);
                         }

+ 1 - 8
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -52,7 +52,6 @@ import com.bumptech.glide.request.target.BitmapImageViewTarget;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.preferences.AppPreferences;
-import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -606,14 +605,8 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                         if (gridView) {
                             thumbnailView.setImageBitmap(thumbnail);
                         } else {
-                            Resources resources = MainApp.getAppContext().getResources();
-
-                            BitmapUtils.setRoundedBitmap(resources,
-                                                         thumbnail,
-                                                         resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
-                                                         thumbnailView);
+                            BitmapUtils.setRoundedBitmap(thumbnail, thumbnailView);
                         }
-
                     }
                 } else {
                     // generate new thumbnail

+ 11 - 0
src/main/java/com/owncloud/android/utils/BitmapUtils.java

@@ -28,6 +28,8 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
 
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import org.apache.commons.codec.binary.Hex;
@@ -426,4 +428,13 @@ public final class BitmapUtils {
         drawable.draw(canvas);
         return bitmap;
     }
+
+    public static void setRoundedBitmap(Bitmap thumbnail, ImageView imageView) {
+        Resources resources = MainApp.getAppContext().getResources();
+
+        BitmapUtils.setRoundedBitmap(resources,
+                                     thumbnail,
+                                     resources.getDimension(R.dimen.file_icon_rounded_corner_radius),
+                                     imageView);
+    }
 }