Revert "Set singleton Picasso instance instead"

This reverts commit 747021e0.

app/src/main/AndroidManifest.xml

@@ -60,11 +60,9 @@
         <activity android:name=".activity.AboutActivity" />
         <activity android:name=".activity.AddUserActivity" />
-
         <activity
             android:name=".activity.UserActivity"
             android:theme="@style/Activity.User" />
-
         <activity android:name=".activity.SearchActivity" />
         <activity
@@ -94,7 +92,6 @@
         <activity
             android:name=".activity.PickBranchOrTagActivity"
             android:theme="@style/Activity.Translucent" />
-
         <activity android:name=".activity.WebLoginActivity" />
         <activity

app/src/main/java/com/commit451/gitlab/App.kt

@@ -42,6 +42,7 @@ open class App : Application() {
     lateinit var currentAccount: Account
     lateinit var gitLab: GitLabService
     lateinit var gitLabRss: GitLabRss
+    lateinit var picasso: Picasso
     override fun onCreate() {
         super.onCreate()
@@ -143,6 +144,6 @@ open class App : Application() {
     }
     private fun initPicasso(client: OkHttpClient) {
-        Picasso.setSingletonInstance(PicassoFactory.createPicasso(client))
+        picasso = PicassoFactory.createPicasso(client)
     }
 }

app/src/main/java/com/commit451/gitlab/activity/AboutActivity.kt

@@ -29,7 +29,6 @@ import com.commit451.gitlab.util.IntentUtil
 import com.commit451.gitlab.view.PhysicsFlowLayout
 import com.jawnnypoo.physicslayout.Physics
 import com.jawnnypoo.physicslayout.PhysicsConfig
-import com.squareup.picasso.Picasso
 import com.wefika.flowlayout.FlowLayout
 import de.hdodenhof.circleimageview.CircleImageView
 import org.jbox2d.common.Vec2
@@ -145,7 +144,7 @@ class AboutActivity : BaseActivity() {
             physicsLayout.addView(imageView)
             val url = ImageUtil.getAvatarUrl(contributor.email, imageSize)
-            Picasso.with(this)
+            App.get().picasso
                     .load(url)
                     .into(imageView)
         }

app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt

@@ -28,7 +28,6 @@ import com.commit451.gitlab.model.api.Group
 import com.commit451.gitlab.model.api.GroupDetail
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.transformation.PaletteTransformation
-import com.squareup.picasso.Picasso
 import org.parceler.Parcels
 import timber.log.Timber
@@ -106,7 +105,7 @@ class GroupActivity : BaseActivity() {
     }
     fun bind(group: Group) {
-        Picasso.with(this)
+        App.get().picasso
                 .load(group.avatarUrl)
                 .transform(PaletteTransformation.instance())
                 .into(backdrop, object : PaletteTransformation.PaletteCallback(backdrop) {

app/src/main/java/com/commit451/gitlab/activity/UserActivity.kt

@@ -16,12 +16,12 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import com.commit451.alakazam.Alakazam
 import com.commit451.easel.Easel
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.fragment.FeedFragment
 import com.commit451.gitlab.model.api.UserBasic
 import com.commit451.gitlab.transformation.PaletteTransformation
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 import org.parceler.Parcels
 /**
@@ -61,7 +61,7 @@ class UserActivity : BaseActivity() {
         toolbar.title = user.username
         val url = ImageUtil.getAvatarUrl(user, resources.getDimensionPixelSize(R.dimen.user_header_image_size))
-        Picasso.with(this)
+        App.get().picasso
                 .load(url)
                 .transform(PaletteTransformation.instance())
                 .into(backdrop, object : PaletteTransformation.PaletteCallback(backdrop) {

app/src/main/java/com/commit451/gitlab/fragment/ProjectFragment.kt

@@ -28,7 +28,6 @@ import com.commit451.gitlab.util.BypassImageGetterFactory
 import com.commit451.gitlab.util.InternalLinkMovementMethod
 import com.commit451.reptar.Result
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException
-import com.squareup.picasso.Picasso
 import com.vdurmont.emoji.EmojiParser
 import io.reactivex.Single
 import io.reactivex.SingleSource
@@ -222,7 +221,7 @@ class ProjectFragment : ButterKnifeFragment() {
                                     text = EmojiParser.parseToUnicode(text)
                                     textOverview.text = bypass.markdownToSpannable(text,
                                             BypassImageGetterFactory.create(textOverview,
-                                                    Picasso.with(context),
+                                                    App.get().picasso,
                                                     App.get().getAccount().serverUrl.toString(),
                                                     project!!))
                                 }

app/src/main/java/com/commit451/gitlab/view/LabCoatNavigationView.kt

@@ -32,7 +32,6 @@ import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.transformation.CircleTransformation
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import org.greenrobot.eventbus.Subscribe
@@ -239,7 +238,7 @@ class LabCoatNavigationView : NavigationView {
             textEmail.text = user.email
         }
         val url = ImageUtil.getAvatarUrl(user, resources.getDimensionPixelSize(R.dimen.larger_image_size))
-        Picasso.with(context)
+        App.get().picasso
                 .load(url)
                 .transform(CircleTransformation())
                 .into(imageProfile)

app/src/main/java/com/commit451/gitlab/viewHolder/AccountViewHolder.kt

@@ -9,11 +9,11 @@ import android.widget.PopupMenu
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.Account
 import com.commit451.gitlab.transformation.CircleTransformation
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 /**
  * A signed in account
@@ -55,7 +55,7 @@ class AccountViewHolder(view: View) : RecyclerView.ViewHolder(view) {
             itemView.background = null
         }
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(ImageUtil.getAvatarUrl(account.user, itemView.resources.getDimensionPixelSize(R.dimen.user_list_image_size)))
                 .transform(CircleTransformation())
                 .into(image)

app/src/main/java/com/commit451/gitlab/viewHolder/AssigneeSpinnerViewHolder.kt

@@ -8,11 +8,11 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.Member
 import com.commit451.gitlab.transformation.CircleTransformation
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 /**
  * Shows assignee in a spinner
@@ -41,7 +41,7 @@ class AssigneeSpinnerViewHolder(view: View) : RecyclerView.ViewHolder(view) {
             image.setImageResource(R.drawable.ic_assign_24dp)
         } else {
             textUsername.text = user.username
-            Picasso.with(itemView.context)
+            App.get().picasso
                     .load(ImageUtil.getAvatarUrl(user, itemView.resources.getDimensionPixelSize(R.dimen.user_list_image_size)))
                     .transform(CircleTransformation())
                     .into(image)

app/src/main/java/com/commit451/gitlab/viewHolder/CommitViewHolder.kt

@@ -8,12 +8,12 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.RepositoryCommit
 import com.commit451.gitlab.transformation.CircleTransformation
 import com.commit451.gitlab.util.DateUtil
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 /**
  * Shows a commit
@@ -39,7 +39,7 @@ class CommitViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     }
     fun bind(commit: RepositoryCommit) {
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(ImageUtil.getAvatarUrl(commit.authorEmail, itemView.resources.getDimensionPixelSize(R.dimen.image_size)))
                 .transform(CircleTransformation())
                 .into(image)

app/src/main/java/com/commit451/gitlab/viewHolder/DiffHeaderViewHolder.kt

@@ -9,12 +9,12 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.RepositoryCommit
 import com.commit451.gitlab.transformation.CircleTransformation
 import com.commit451.gitlab.util.DateUtil
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 /**
  * Header that gives the details of a merge request
@@ -41,7 +41,7 @@ class DiffHeaderViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     }
     fun bind(commit: RepositoryCommit) {
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(ImageUtil.getAvatarUrl(commit.authorEmail, itemView.resources.getDimensionPixelSize(R.dimen.image_size)))
                 .transform(CircleTransformation())
                 .into(image)

app/src/main/java/com/commit451/gitlab/viewHolder/FeedEntryViewHolder.kt

@@ -9,10 +9,10 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.rss.Entry
 import com.commit451.gitlab.transformation.CircleTransformation
-import com.squareup.picasso.Picasso
 /**
  * Represents the view of an item in the RSS feed
@@ -37,7 +37,7 @@ class FeedEntryViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     }
     fun bind(entry: Entry) {
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(entry.thumbnail.url)
                 .transform(CircleTransformation())
                 .into(image)

app/src/main/java/com/commit451/gitlab/viewHolder/GroupViewHolder.kt

@@ -9,9 +9,9 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.Group
-import com.squareup.picasso.Picasso
 /**
  * View associated with a group
@@ -38,7 +38,7 @@ class GroupViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         textName.text = group.name
         if (group.avatarUrl != null && group.avatarUrl != Uri.EMPTY) {
-            Picasso.with(itemView.context)
+            App.get().picasso
                     .load(group.avatarUrl)
                     .into(image)
         }

app/src/main/java/com/commit451/gitlab/viewHolder/IssueHeaderViewHolder.kt

@@ -19,7 +19,6 @@ import com.commit451.gitlab.util.BypassImageGetterFactory
 import com.commit451.gitlab.util.DateUtil
 import com.commit451.gitlab.util.ImageUtil
 import com.commit451.gitlab.util.InternalLinkMovementMethod
-import com.squareup.picasso.Picasso
 import com.vdurmont.emoji.EmojiParser
 /**
@@ -55,7 +54,7 @@ class IssueHeaderViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         } else {
             textDescription.visibility = View.VISIBLE
             val getter = BypassImageGetterFactory.create(textDescription,
-                    Picasso.with(itemView.context),
+                    App.get().picasso,
                     App.get().getAccount().serverUrl.toString(),
                     project)
             var description = issue.description
@@ -64,7 +63,7 @@ class IssueHeaderViewHolder(view: View) : RecyclerView.ViewHolder(view) {
             textDescription.movementMethod = InternalLinkMovementMethod(App.get().getAccount().serverUrl)
         }
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(ImageUtil.getAvatarUrl(issue.author, itemView.resources.getDimensionPixelSize(R.dimen.image_size)))
                 .transform(CircleTransformation())
                 .into(imageAuthor)

app/src/main/java/com/commit451/gitlab/viewHolder/IssueViewHolder.kt

@@ -8,12 +8,12 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.Issue
 import com.commit451.gitlab.transformation.CircleTransformation
 import com.commit451.gitlab.util.DateUtil
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 /**
  * issues, yay!
@@ -47,7 +47,7 @@ class IssueViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         }
         if (issue.assignee != null) {
-            Picasso.with(itemView.context)
+            App.get().picasso
                     .load(ImageUtil.getAvatarUrl(issue.assignee, itemView.resources.getDimensionPixelSize(R.dimen.image_size)))
                     .transform(CircleTransformation())
                     .into(image)

app/src/main/java/com/commit451/gitlab/viewHolder/MergeRequestHeaderViewHolder.kt

@@ -19,7 +19,6 @@ import com.commit451.gitlab.util.BypassImageGetterFactory
 import com.commit451.gitlab.util.DateUtil
 import com.commit451.gitlab.util.ImageUtil
 import com.commit451.gitlab.util.InternalLinkMovementMethod
-import com.squareup.picasso.Picasso
 import com.vdurmont.emoji.EmojiParser
 /**
@@ -53,13 +52,13 @@ class MergeRequestHeaderViewHolder(view: View) : RecyclerView.ViewHolder(view) {
             description = EmojiParser.parseToUnicode(description)
             textDescription.text = bypass.markdownToSpannable(description,
                     BypassImageGetterFactory.create(textDescription,
-                            Picasso.with(itemView.context),
+                            App.get().picasso,
                             App.get().getAccount().serverUrl.toString(),
                             project))
             textDescription.movementMethod = InternalLinkMovementMethod(App.get().getAccount().serverUrl)
         }
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(ImageUtil.getAvatarUrl(mergeRequest.author, itemView.resources.getDimensionPixelSize(R.dimen.image_size)))
                 .transform(CircleTransformation())
                 .into(imageAuthor)

app/src/main/java/com/commit451/gitlab/viewHolder/MergeRequestViewHolder.kt

@@ -8,11 +8,11 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.MergeRequest
 import com.commit451.gitlab.transformation.CircleTransformation
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 /**
  * Represents a merge request within a list
@@ -37,7 +37,7 @@ class MergeRequestViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     }
     fun bind(item: MergeRequest) {
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(ImageUtil.getAvatarUrl(item.author, itemView.resources.getDimensionPixelSize(R.dimen.image_size)))
                 .transform(CircleTransformation())
                 .into(image)

app/src/main/java/com/commit451/gitlab/viewHolder/NoteViewHolder.kt

@@ -18,7 +18,6 @@ import com.commit451.gitlab.util.BypassImageGetterFactory
 import com.commit451.gitlab.util.DateUtil
 import com.commit451.gitlab.util.ImageUtil
 import com.commit451.gitlab.util.InternalLinkMovementMethod
-import com.squareup.picasso.Picasso
 import com.vdurmont.emoji.EmojiParser
 /**
@@ -60,13 +59,13 @@ class NoteViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         }
         val getter = BypassImageGetterFactory.create(textSummary,
-                Picasso.with(itemView.context),
+                App.get().picasso,
                 App.get().getAccount().serverUrl.toString(),
                 project)
         textSummary.text = bypass.markdownToSpannable(summary, getter)
         textSummary.movementMethod = InternalLinkMovementMethod(App.get().getAccount().serverUrl)
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(ImageUtil.getAvatarUrl(note.author, itemView.resources.getDimensionPixelSize(R.dimen.image_size)))
                 .transform(CircleTransformation())
                 .into(imageAvatar)

app/src/main/java/com/commit451/gitlab/viewHolder/ProjectMemberViewHolder.kt

@@ -9,10 +9,10 @@ import android.widget.PopupMenu
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.Member
 import com.commit451.gitlab.util.ImageUtil
-import com.squareup.picasso.Picasso
 /**
  * Shows a project member
@@ -48,7 +48,7 @@ class ProjectMemberViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         textUsername.text = member.username
         textAccess.text = Member.getAccessLevel(member.accessLevel)
-        Picasso.with(itemView.context)
+        App.get().picasso
                 .load(ImageUtil.getAvatarUrl(member, itemView.resources.getDimensionPixelSize(R.dimen.user_header_image_size)))
                 .into(image)
     }

app/src/main/java/com/commit451/gitlab/viewHolder/ProjectViewHolder.kt

@@ -11,11 +11,11 @@ import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.transformation.CircleTransformation
 import com.github.ivbaranov.mli.MaterialLetterIcon
-import com.squareup.picasso.Picasso
 /**
  * Projects, yay!
@@ -46,7 +46,7 @@ class ProjectViewHolder(view: View) : RecyclerView.ViewHolder(view) {
             iconLetter.visibility = View.GONE
             image.visibility = View.VISIBLE
-            Picasso.with(itemView.context)
+            App.get().picasso
                     .load(project.avatarUrl)
                     .transform(CircleTransformation())
                     .into(image)