From 1059ec4dff6a30717f8c1a00f15f74bea4580463 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Wed, 10 Jan 2018 17:33:39 +0300
Subject: [PATCH] Use MediaWikiView instead of Bitmap

---
 .../fr/free/nrw/commons/featured/FeaturedImage.java   | 11 +++++++----
 .../commons/featured/FeaturedImagesListFragment.java  |  4 +++-
 .../nrw/commons/featured/MockGridViewAdapter.java     |  7 +++++--
 app/src/main/res/layout/layout_featured_images.xml    |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImage.java b/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImage.java
index 73721897b..d291b04a3 100644
--- a/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImage.java
+++ b/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImage.java
@@ -2,26 +2,29 @@ package fr.free.nrw.commons.featured;
 
 import android.graphics.Bitmap;
 
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.MediaWikiImageView;
+
 /**
  * Created by root on 09.01.2018.
  */
 
 public class FeaturedImage {
-    private Bitmap image;
+    private Media image;
     private String author;
     private String fileName;
 
-    public FeaturedImage(Bitmap image, String author, String fileName) {
+    public FeaturedImage(Media image, String author, String fileName) {
         this.image = image;
         this.author = author;
         this.fileName = fileName;
     }
 
-    public Bitmap getImage() {
+    public Media getImage() {
         return image;
     }
 
-    public void setImage(Bitmap image) {
+    public void setImage(Media image) {
         this.image = image;
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesListFragment.java b/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesListFragment.java
index 905e7aa91..09c684587 100644
--- a/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesListFragment.java
@@ -14,6 +14,8 @@ import java.util.ArrayList;
 
 import butterknife.ButterKnife;
 import dagger.android.support.DaggerFragment;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.MediaWikiImageView;
 import fr.free.nrw.commons.R;
 import timber.log.Timber;
 
@@ -48,7 +50,7 @@ public class FeaturedImagesListFragment extends DaggerFragment {
         ArrayList<FeaturedImage> featuredImages = new ArrayList<>();
         for (int i=0; i<10; i++){
             Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.commons_logo_large);
-            featuredImages.add(new FeaturedImage(bitmap, "username: test", "test file name"));
+            featuredImages.add(new FeaturedImage(new Media("test.jpg"), "username: test", "test file name"));
         }
         return featuredImages;
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/featured/MockGridViewAdapter.java b/app/src/main/java/fr/free/nrw/commons/featured/MockGridViewAdapter.java
index 081495791..1b83517b3 100644
--- a/app/src/main/java/fr/free/nrw/commons/featured/MockGridViewAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/featured/MockGridViewAdapter.java
@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
+import fr.free.nrw.commons.MediaWikiImageView;
 import fr.free.nrw.commons.R;
 
 /**
@@ -38,12 +39,14 @@ public class MockGridViewAdapter extends ArrayAdapter {
         }
 
         FeaturedImage item = data.get(position);
-        ImageView imageView = (ImageView) convertView.findViewById(R.id.featuredImageView);
+        //ImageView imageView = (ImageView) convertView.findViewById(R.id.featuredImageView);
+        MediaWikiImageView imageView = (MediaWikiImageView) convertView.findViewById(R.id.featuredImageView);
         TextView fileName = (TextView) convertView.findViewById(R.id.featuredImageTitle);
         TextView author = (TextView) convertView.findViewById(R.id.featuredImageAuthor);
         fileName.setText("Test file name");
         author.setText("Uploaded by: Test user name");
-        imageView.setImageBitmap(item.getImage());
+        imageView.setMedia(item.getImage());
+        //imageView.setImageBitmap(item.getImage().getDrawingCache());
         return convertView;
     }
 
diff --git a/app/src/main/res/layout/layout_featured_images.xml b/app/src/main/res/layout/layout_featured_images.xml
index cabbe629f..399321719 100644
--- a/app/src/main/res/layout/layout_featured_images.xml
+++ b/app/src/main/res/layout/layout_featured_images.xml
@@ -18,7 +18,7 @@
         android:layout_gravity="end|bottom"
         />
 
-    <ImageView
+    <fr.free.nrw.commons.MediaWikiImageView
         android:id="@+id/featuredImageView"
         android:layout_width="match_parent"
         android:layout_height="240dp"