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

Use MediaWikiView instead of Bitmap

Browse source
This commit is contained in:
neslihanturan 2018-01-10 17:33:39 +03:00
parent 930cc3afb1
commit 1059ec4dff
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
}

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

@ -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;
}

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

@ -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;
}

2
app/src/main/res/layout/layout_featured_images.xml
View file

@ -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"