mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code cleanup

Browse source
This commit is contained in:
neslihanturan 2018-01-10 18:29:56 +03:00
parent 8c95ab868a
commit 764e8baa05
4 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/featured/FeaturedImage.java
View file

@ -1,12 +1,10 @@
package fr.free.nrw.commons.featured; package fr.free.nrw.commons.featured;
import android.graphics.Bitmap;
import fr.free.nrw.commons.Media; 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 { public class FeaturedImage {

7
app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesActivity.java
View file

@ -1,15 +1,10 @@
package fr.free.nrw.commons.featured; package fr.free.nrw.commons.featured;
import android.database.DataSetObserver; import android.database.DataSetObserver;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.view.View; import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.GridView;
import java.util.ArrayList;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import fr.free.nrw.commons.Media; import fr.free.nrw.commons.Media;
@ -18,7 +13,7 @@ import fr.free.nrw.commons.auth.AuthenticatedActivity;
import fr.free.nrw.commons.media.MediaDetailPagerFragment; 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 public class FeaturedImagesActivity

6
app/src/main/java/fr/free/nrw/commons/featured/FeaturedImagesListFragment.java
View file

@ -1,7 +1,5 @@
package fr.free.nrw.commons.featured; package fr.free.nrw.commons.featured;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -16,11 +14,8 @@ import java.util.ArrayList;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import dagger.android.support.DaggerFragment; import dagger.android.support.DaggerFragment;
import fr.free.nrw.commons.Media; import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.MediaWikiImageView;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import timber.log.Timber;
import static android.view.View.GONE;
/** /**
* Created by root on 09.01.2018. * Created by root on 09.01.2018.
@ -51,7 +46,6 @@ public class FeaturedImagesListFragment extends DaggerFragment {
private ArrayList<FeaturedImage> getMockFeaturedImages(){ private ArrayList<FeaturedImage> getMockFeaturedImages(){
ArrayList<FeaturedImage> featuredImages = new ArrayList<>(); ArrayList<FeaturedImage> featuredImages = new ArrayList<>();
for (int i=0; i<10; i++){ 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")); featuredImages.add(new FeaturedImage(new Media("test.jpg"), "username: test", "test file name"));
} }
return featuredImages; return featuredImages;

11
app/src/main/java/fr/free/nrw/commons/featured/MockGridViewAdapter.java
View file

@ -6,7 +6,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;
@ -15,7 +14,7 @@ import fr.free.nrw.commons.MediaWikiImageView;
import fr.free.nrw.commons.R; 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 { public class MockGridViewAdapter extends ArrayAdapter {
@ -39,14 +38,12 @@ public class MockGridViewAdapter extends ArrayAdapter {
} }
FeaturedImage item = data.get(position); FeaturedImage item = data.get(position);
//ImageView imageView = (ImageView) convertView.findViewById(R.id.featuredImageView); MediaWikiImageView imageView = convertView.findViewById(R.id.featuredImageView);
MediaWikiImageView imageView = (MediaWikiImageView) convertView.findViewById(R.id.featuredImageView); TextView fileName = convertView.findViewById(R.id.featuredImageTitle);
TextView fileName = (TextView) convertView.findViewById(R.id.featuredImageTitle); TextView author = convertView.findViewById(R.id.featuredImageAuthor);
TextView author = (TextView) convertView.findViewById(R.id.featuredImageAuthor);
fileName.setText("Test file name"); fileName.setText("Test file name");
author.setText("Uploaded by: Test user name"); author.setText("Uploaded by: Test user name");
imageView.setMedia(item.getImage()); imageView.setMedia(item.getImage());
//imageView.setImageBitmap(item.getImage().getDrawingCache());
return convertView; return convertView;
} }