From 6b5de5509e65704bb31e763309f7c7c379c74938 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Thu, 25 Feb 2021 23:08:01 +0530 Subject: [PATCH] Improve Epoxy view models --- .../view/epoxy/views/{BlackView.kt => BlackListView.kt} | 2 +- .../com/aurora/store/view/epoxy/views/CategoryView.kt | 2 +- .../com/aurora/store/view/epoxy/views/DownloadView.kt | 2 +- .../com/aurora/store/view/epoxy/views/EditorHeadView.kt | 2 +- .../java/com/aurora/store/view/epoxy/views/HeaderView.kt | 2 +- .../aurora/store/view/epoxy/views/MinimalHeaderView.kt | 2 +- .../com/aurora/store/view/epoxy/views/UpdateHeaderView.kt | 2 +- .../aurora/store/view/epoxy/views/app/AppUpdateView.kt | 8 ++++---- .../com/aurora/store/view/ui/commons/BlacklistActivity.kt | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) rename app/src/main/java/com/aurora/store/view/epoxy/views/{BlackView.kt => BlackListView.kt} (98%) diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/BlackListView.kt similarity index 98% rename from app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt rename to app/src/main/java/com/aurora/store/view/epoxy/views/BlackListView.kt index 2d476d5bf..6f4b0bd53 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/BlackListView.kt @@ -38,7 +38,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, baseModelClass = BaseView::class ) -class BlackView : RelativeLayout { +class BlackListView : RelativeLayout { private lateinit var B: ViewBlackBinding diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt index ac788e669..1c26eeb0b 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt @@ -34,7 +34,7 @@ import com.aurora.extensions.load import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions @ModelView( - autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT, + autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, baseModelClass = BaseView::class ) class CategoryView : RelativeLayout { diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt index cee566a49..802d0c4a6 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt @@ -45,7 +45,7 @@ import java.lang.reflect.Modifier import java.util.* @ModelView( - autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT, + autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, baseModelClass = BaseView::class ) class DownloadView : RelativeLayout { diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/EditorHeadView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/EditorHeadView.kt index cd6d632ff..a43d8c769 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/EditorHeadView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/EditorHeadView.kt @@ -30,7 +30,7 @@ import com.aurora.store.R import com.aurora.store.databinding.ViewEditorHeadBinding @ModelView( - autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT, + autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, baseModelClass = BaseView::class ) class EditorHeadView : RelativeLayout { diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/HeaderView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/HeaderView.kt index 51a46e85a..75672e6ee 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/HeaderView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/HeaderView.kt @@ -32,7 +32,7 @@ import com.aurora.store.databinding.ViewHeaderBinding @ModelView( - autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT, + autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, baseModelClass = BaseView::class ) class HeaderView : RelativeLayout { diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/MinimalHeaderView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/MinimalHeaderView.kt index cc359b46c..8fe5457f8 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/MinimalHeaderView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/MinimalHeaderView.kt @@ -31,7 +31,7 @@ import com.aurora.store.databinding.ViewActionHeaderBinding @ModelView( - autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT, + autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, baseModelClass = BaseView::class ) class MinimalHeaderView : RelativeLayout { diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/UpdateHeaderView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/UpdateHeaderView.kt index 4beaaf6f2..6f89ca936 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/UpdateHeaderView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/UpdateHeaderView.kt @@ -31,7 +31,7 @@ import com.aurora.store.databinding.ViewHeaderUpdateBinding @ModelView( - autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT, + autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, baseModelClass = BaseView::class ) class UpdateHeaderView : RelativeLayout { diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt index 1334748a7..bc1c44659 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt @@ -28,18 +28,18 @@ import com.airbnb.epoxy.CallbackProp import com.airbnb.epoxy.ModelProp import com.airbnb.epoxy.ModelView import com.airbnb.epoxy.OnViewRecycled +import com.aurora.extensions.clear +import com.aurora.extensions.load import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.databinding.ViewAppUpdateBinding import com.aurora.store.util.CommonUtil -import com.aurora.extensions.clear -import com.aurora.extensions.load import com.aurora.store.view.epoxy.views.BaseView import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade @ModelView( - autoLayout = ModelView.Size.WRAP_WIDTH_WRAP_HEIGHT, + autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, baseModelClass = BaseView::class ) class AppUpdateView : RelativeLayout { @@ -77,7 +77,7 @@ class AppUpdateView : RelativeLayout { } B.txtLine2.text = app.developerName - B.txtLine3.text = CommonUtil.addSiPrefix(app.size) + B.txtLine3.text = ("${CommonUtil.addSiPrefix(app.size)} • ${app.updatedOn}") B.txtChangelog.text = if (app.changes.isNotEmpty()) HtmlCompat.fromHtml( app.changes, diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt index 4347b0b65..d9fcc1bfa 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt @@ -26,7 +26,7 @@ import com.aurora.store.data.model.Black import com.aurora.store.data.providers.BlacklistProvider import com.aurora.store.databinding.ActivityGenericRecyclerBinding import com.aurora.extensions.close -import com.aurora.store.view.epoxy.views.BlackViewModel_ +import com.aurora.store.view.epoxy.views.BlackListViewModel_ import com.aurora.store.view.epoxy.views.shimmer.AppListViewShimmerModel_ import com.aurora.store.viewmodel.all.BlacklistViewModel @@ -94,7 +94,7 @@ class BlacklistActivity : BaseActivity() { } else { blackList.forEach { add( - BlackViewModel_() + BlackListViewModel_() .id(it.packageName.hashCode()) .black(it) .markChecked(VM.selected.contains(it.packageName))