mirror of
				https://github.com/commons-app/apps-android-commons.git
				synced 2025-10-31 14:53:59 +01:00 
			
		
		
		
	Use MediaWikiView instead of Bitmap
This commit is contained in:
		
							parent
							
								
									930cc3afb1
								
							
						
					
					
						commit
						1059ec4dff
					
				
					 4 changed files with 16 additions and 8 deletions
				
			
		|  | @ -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; | ||||
|     } | ||||
| 
 | ||||
|  |  | |||
|  | @ -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; | ||||
|     } | ||||
|  |  | |||
|  | @ -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; | ||||
|     } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 neslihanturan
						neslihanturan