From 764e8baa053ea75faf8e5fa52f740d3b279eaafe Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Wed, 10 Jan 2018 18:29:56 +0300 Subject: [PATCH] Code cleanup --- .../fr/free/nrw/commons/featured/FeaturedImage.java | 4 +--- .../nrw/commons/featured/FeaturedImagesActivity.java | 7 +------ .../commons/featured/FeaturedImagesListFragment.java | 6 ------ .../nrw/commons/featured/MockGridViewAdapter.java | 11 ++++------- 4 files changed, 6 insertions(+), 22 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 d291b04a3..853fba29e 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 @@ -1,12 +1,10 @@ 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. + * Object to hold FeaturedImage */ public class FeaturedImage { diff --git a/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesActivity.java b/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesActivity.java index ba13d34bd..bf5d3089b 100644 --- a/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesActivity.java @@ -1,15 +1,10 @@ package fr.free.nrw.commons.featured; import android.database.DataSetObserver; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.os.Bundle; import android.support.v4.app.FragmentManager; import android.view.View; import android.widget.AdapterView; -import android.widget.GridView; - -import java.util.ArrayList; import butterknife.ButterKnife; import fr.free.nrw.commons.Media; @@ -18,7 +13,7 @@ import fr.free.nrw.commons.auth.AuthenticatedActivity; import fr.free.nrw.commons.media.MediaDetailPagerFragment; /** - * Created by root on 09.01.2018. + * This activity displays pic of the days of last xx days */ public class FeaturedImagesActivity 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 55b93030a..3e5c37bd6 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 @@ -1,7 +1,5 @@ package fr.free.nrw.commons.featured; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.os.Bundle; import android.support.annotation.Nullable; import android.view.LayoutInflater; @@ -16,11 +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; -import static android.view.View.GONE; /** * Created by root on 09.01.2018. @@ -51,7 +46,6 @@ public class FeaturedImagesListFragment extends DaggerFragment { private ArrayList getMockFeaturedImages(){ ArrayList featuredImages = new ArrayList<>(); for (int i=0; i<10; i++){ - Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.commons_logo_large); 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 1b83517b3..7aa2a8892 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 @@ -6,7 +6,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.ImageView; import android.widget.TextView; import java.util.ArrayList; @@ -15,7 +14,7 @@ import fr.free.nrw.commons.MediaWikiImageView; import fr.free.nrw.commons.R; /** - * Created by root on 09.01.2018. + * This is created to only display UI implementation. Needs to be changed in real implementation */ public class MockGridViewAdapter extends ArrayAdapter { @@ -39,14 +38,12 @@ public class MockGridViewAdapter extends ArrayAdapter { } FeaturedImage item = data.get(position); - //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); + MediaWikiImageView imageView = convertView.findViewById(R.id.featuredImageView); + TextView fileName = convertView.findViewById(R.id.featuredImageTitle); + TextView author = convertView.findViewById(R.id.featuredImageAuthor); fileName.setText("Test file name"); author.setText("Uploaded by: Test user name"); imageView.setMedia(item.getImage()); - //imageView.setImageBitmap(item.getImage().getDrawingCache()); return convertView; }