From d30f23dd0b83c1145a08c8dceb6be6979d56a639 Mon Sep 17 00:00:00 2001
From: Taras <tarassmakula@gmail.com>
Date: Fri, 5 Aug 2022 17:07:59 +0300
Subject: [PATCH] Change adapter and view holder for new model
---
.../list/SubscriptionViewHolder.kt | 16 ++++++----------
.../list/SubscriptionsAdapter.kt | 8 ++++----
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/org/futo/circles/feature/sign_up/subscription_stage/list/SubscriptionViewHolder.kt b/app/src/main/java/org/futo/circles/feature/sign_up/subscription_stage/list/SubscriptionViewHolder.kt
index 0166f60d1..d8c4f7d89 100644
--- a/app/src/main/java/org/futo/circles/feature/sign_up/subscription_stage/list/SubscriptionViewHolder.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/subscription_stage/list/SubscriptionViewHolder.kt
@@ -3,11 +3,9 @@ package org.futo.circles.feature.sign_up.subscription_stage.list
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import org.futo.circles.core.list.ViewBindingHolder
-import org.futo.circles.core.list.context
import org.futo.circles.databinding.SubscriptionListItemBinding
import org.futo.circles.extensions.onClick
-import org.futo.circles.subscriptions.SubscriptionData
-import org.futo.circles.subscriptions.formatIsoPeriod
+import org.futo.circles.model.SubscriptionListItem
class SubscriptionViewHolder(
@@ -23,14 +21,12 @@ class SubscriptionViewHolder(
onClick(itemView) { position -> onSubscriptionClicked(position) }
}
- fun bind(data: SubscriptionData) {
+ fun bind(data: SubscriptionListItem) {
with(binding) {
- tvName.text = data.details.name
- tvDetails.text = data.details.description
- val productOffer =
- data.details.subscriptionOfferDetails?.last()?.pricingPhases?.pricingPhaseList?.last()
- tvPrice.text = productOffer?.formattedPrice ?: ""
- tvDuration.text = productOffer?.billingPeriod?.formatIsoPeriod(context) ?: ""
+ tvName.text = data.name
+ tvDetails.text = data.description
+ tvPrice.text = data.price
+ tvDuration.text = data.duration
}
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/futo/circles/feature/sign_up/subscription_stage/list/SubscriptionsAdapter.kt b/app/src/main/java/org/futo/circles/feature/sign_up/subscription_stage/list/SubscriptionsAdapter.kt
index 7bdb8b5c8..3c0ec03f2 100644
--- a/app/src/main/java/org/futo/circles/feature/sign_up/subscription_stage/list/SubscriptionsAdapter.kt
+++ b/app/src/main/java/org/futo/circles/feature/sign_up/subscription_stage/list/SubscriptionsAdapter.kt
@@ -2,18 +2,18 @@ package org.futo.circles.feature.sign_up.subscription_stage.list
import android.view.ViewGroup
import org.futo.circles.core.list.BaseRvAdapter
-import org.futo.circles.subscriptions.SubscriptionData
+import org.futo.circles.model.SubscriptionListItem
class SubscriptionsAdapter(
- private val onItemClicked: (SubscriptionData) -> Unit
-) : BaseRvAdapter<SubscriptionData, SubscriptionViewHolder>(
+ private val onItemClicked: (id: String) -> Unit
+) : BaseRvAdapter<SubscriptionListItem, SubscriptionViewHolder>(
DefaultIdEntityCallback()
) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SubscriptionViewHolder =
SubscriptionViewHolder(
parent = parent,
- onSubscriptionClicked = { position -> onItemClicked(getItem(position)) }
+ onSubscriptionClicked = { position -> onItemClicked(getItem(position).id) }
)
override fun onBindViewHolder(holder: SubscriptionViewHolder, position: Int) {
--
GitLab