diff --git a/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt b/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt index c778c692..dcf3800b 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt +++ b/src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt @@ -1221,7 +1221,7 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int) holder as ReleaseInfoViewHolder item as Item.ReleaseInfoItem - val imageSource = product?.source?.trimAfter('/', 4).plus(".png") + val imageSource = product?.source?.trimAfter('/', 4).plus(".png").toUri() val sdk = product?.displayRelease?.targetSdkVersion holder.version.doOnPreDraw { diff --git a/src/main/kotlin/com/looker/droidify/screen/ProductsAdapter.kt b/src/main/kotlin/com/looker/droidify/screen/ProductsAdapter.kt index 35779d6b..4eb1b426 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ProductsAdapter.kt +++ b/src/main/kotlin/com/looker/droidify/screen/ProductsAdapter.kt @@ -11,6 +11,7 @@ import android.widget.FrameLayout import android.widget.ProgressBar import android.widget.TextView import androidx.recyclerview.widget.RecyclerView +import coil.load import coil.transform.RoundedCornersTransformation import com.google.android.material.imageview.ShapeableImageView import com.looker.droidify.R diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt index 9c8cc497..b3d31eab 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt @@ -16,6 +16,7 @@ import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.MarginPageTransformer import androidx.viewpager2.widget.ViewPager2 +import coil.load import com.google.android.material.imageview.ShapeableImageView import com.looker.droidify.R import com.looker.droidify.database.Database @@ -25,7 +26,10 @@ import com.looker.droidify.graphics.PaddingDrawable import com.looker.droidify.network.CoilDownloader import com.looker.droidify.utility.RxUtils import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.resources.* +import com.looker.droidify.utility.extension.resources.clear +import com.looker.droidify.utility.extension.resources.getColorFromAttr +import com.looker.droidify.utility.extension.resources.getDrawableCompat +import com.looker.droidify.utility.extension.resources.sizeScaled import com.looker.droidify.widget.StableRecyclerAdapter import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Observable diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt b/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt index 08cdc2c3..d1026f98 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt +++ b/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt @@ -8,7 +8,6 @@ import android.content.res.Resources import android.graphics.Typeface import android.graphics.drawable.Drawable import android.graphics.drawable.VectorDrawable -import android.net.Uri import android.util.TypedValue import android.util.Xml import android.view.LayoutInflater @@ -16,8 +15,6 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.core.content.ContextCompat -import coil.load -import coil.request.ImageRequest import coil.util.CoilUtils import com.google.android.material.imageview.ShapeableImageView import com.looker.droidify.utility.extension.android.Android @@ -100,10 +97,6 @@ fun ViewGroup.inflate(layoutResId: Int): View { return LayoutInflater.from(context).inflate(layoutResId, this, false) } -fun ShapeableImageView.load(uri: Uri, builder: ImageRequest.Builder.() -> Unit = {}) { - this.load(uri = uri, builder = builder) -} - fun ShapeableImageView.clear() { CoilUtils.clear(this) } \ No newline at end of file