Use glide for images #10

ksheremet · Jun 6, 2019 · 4d0953c · 4d0953c
1 parent eb0eca6
commit 4d0953c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "ch.sheremet.katarina.cocktailspro"
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 102
-        versionName "1.02"
+        versionCode 103
+        versionName "1.03"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -52,8 +52,9 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.5'
-    //Picasso
-    implementation 'com.squareup.picasso:picasso:2.71828'
+    //Glide
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
     //ButterKnife
     implementation 'com.jakewharton:butterknife:10.0.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -50,6 +50,12 @@
 -keep public class * extends android.app.Service
 -keep public class * extends android.content.BroadcastReceiver
 -keep public class * extends android.content.ContentProvider
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
 
 -keep public class * extends android.view.View {
       public <init>(android.content.Context);

diff --git a/.../main/java/ch/sheremet/katarina/cocktailspro/beveragedetails/BeverageDetailsActivity.java b/.../main/java/ch/sheremet/katarina/cocktailspro/beveragedetails/BeverageDetailsActivity.java
@@ -3,6 +3,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+
+import com.bumptech.glide.Glide;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 import androidx.core.widget.NestedScrollView;
 import androidx.appcompat.app.AppCompatActivity;
@@ -12,8 +14,6 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.squareup.picasso.Picasso;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import ch.sheremet.katarina.cocktailspro.R;
@@ -69,7 +69,7 @@ private void setToolbar() {
         collapsingToolbarLayout.setTitle(mBeverage.getName());
         setTitle(mBeverage.getName());
         ImageView appBarIV = findViewById(R.id.app_bar_image);
-        Picasso.get()
+        Glide.with(this)
                 .load(mBeverage.getThumbnailUrl())
                 .error(R.drawable.def_cocktail_image)
                 .placeholder(R.drawable.def_cocktail_image)

diff --git a/.../main/java/ch/sheremet/katarina/cocktailspro/beveragedetails/BeverageDetailsFragment.java b/.../main/java/ch/sheremet/katarina/cocktailspro/beveragedetails/BeverageDetailsFragment.java
@@ -17,9 +17,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.crashlytics.android.Crashlytics;
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.squareup.picasso.Picasso;
 
 import javax.inject.Inject;
 
@@ -236,7 +236,7 @@ private void updateUI(BeverageDetails beverageDetails) {
             mIngredients.setText(builder.toString());
         }
 
-        Picasso.get().load(beverageDetails.getThumbnailUrl()).error(R.drawable.def_cocktail_image)
+        Glide.with(this).load(beverageDetails.getThumbnailUrl()).error(R.drawable.def_cocktail_image)
                 .placeholder(R.drawable.def_cocktail_image).into(mThumbnail);
         mThumbnail.setContentDescription(beverageDetails.getName());
     }

diff --git a/app/src/main/java/ch/sheremet/katarina/cocktailspro/beveragelist/BeverageListAdapter.java b/app/src/main/java/ch/sheremet/katarina/cocktailspro/beveragelist/BeverageListAdapter.java
@@ -8,7 +8,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.squareup.picasso.Picasso;
+import com.bumptech.glide.Glide;
 
 import java.util.List;
 
@@ -43,7 +43,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     @Override
     public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         holder.mBeverage = mBeverages.get(position);
-        Picasso.get()
+        Glide.with(holder.itemView)
                 .load(mBeverages.get(position).getThumbnailUrl())
                 .error(R.drawable.def_cocktail_image)
                 .placeholder(R.drawable.def_cocktail_image)

diff --git a/build.gradle b/build.gradle
@@ -6,6 +6,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.fabric.io/public'
         }