diff --git a/app/src/main/java/com/magnitudestudios/GameFace/pojo/Shop/ShopItem.kt b/app/src/main/java/com/magnitudestudios/GameFace/pojo/Shop/ShopItem.kt
index a8cc37c..00eb8fc 100644
--- a/app/src/main/java/com/magnitudestudios/GameFace/pojo/Shop/ShopItem.kt
+++ b/app/src/main/java/com/magnitudestudios/GameFace/pojo/Shop/ShopItem.kt
@@ -21,6 +21,7 @@ data class ShopItem constructor(
val samples: List = listOf(),
val order : Int = 0,
val version_number : Int = 0,
+ val cards : Int = 0,
@Exclude
var type : String = "",
@Exclude
diff --git a/app/src/main/java/com/magnitudestudios/GameFace/ui/shop/details/CardPackDetailsFragment.kt b/app/src/main/java/com/magnitudestudios/GameFace/ui/shop/details/CardPackDetailsFragment.kt
index dc991ee..0ee677b 100644
--- a/app/src/main/java/com/magnitudestudios/GameFace/ui/shop/details/CardPackDetailsFragment.kt
+++ b/app/src/main/java/com/magnitudestudios/GameFace/ui/shop/details/CardPackDetailsFragment.kt
@@ -26,6 +26,7 @@ import com.magnitudestudios.GameFace.bases.BaseFragment
import com.magnitudestudios.GameFace.databinding.FragmentPackDetailsBinding
import com.magnitudestudios.GameFace.network.DownloadSinglePack
import com.magnitudestudios.GameFace.pojo.Shop.ShopItem
+import com.magnitudestudios.GameFace.repository.ShopRepository
import com.magnitudestudios.GameFace.ui.main.MainViewModel
class CardPackDetailsFragment : BaseFragment() {
@@ -54,6 +55,18 @@ class CardPackDetailsFragment : BaseFragment() {
}
bind.purchaseBtn.isEnabled = mainViewModel.user.value?.data?.money!! >= packItem.price
+ val installed = ShopRepository.getLocalPacks(requireContext()).map { it.id }.contains(packItem.id)
+ if (installed) {
+ bind.purchaseBtn.isEnabled = false
+ bind.purchaseBtn.text = getString(string.installed_key_card_details)
+ } else {
+ if (packItem.price == 0 ) {
+ bind.price.text = getString(string.free_price)
+ bind.purchaseBtn.text = getString(string.download_btn)
+ } else {
+ bind.price.text = packItem.price.toString()
+ }
+ }
bind.packImage.apply {
transitionName = imageTransition
Glide.with(this).load(imageTransition).into(this)
@@ -64,16 +77,13 @@ class CardPackDetailsFragment : BaseFragment() {
""
}
bind.description.text = packItem.description
- if (packItem.price == 0) {
- bind.price.text = getString(string.free_price)
- bind.purchaseBtn.text = getString(string.download_btn)
- } else {
- bind.price.text = packItem.price.toString()
- }
bind.purchaseBtn.setOnClickListener {
purchaseAndDownload()
}
+
+ bind.cards.text = packItem.cards.toString()
+ bind.installs.text = packItem.installs.toString()
}
private fun purchaseAndDownload() {
diff --git a/app/src/main/res/drawable/baseline_arrow_circle_down_black_24dp.xml b/app/src/main/res/drawable/baseline_arrow_circle_down_black_24dp.xml
index 44ca44f..ea5b64e 100644
--- a/app/src/main/res/drawable/baseline_arrow_circle_down_black_24dp.xml
+++ b/app/src/main/res/drawable/baseline_arrow_circle_down_black_24dp.xml
@@ -1,4 +1,11 @@
-
-
+
+
+
+
diff --git a/app/src/main/res/drawable/baseline_arrow_circle_down_white_24dp.xml b/app/src/main/res/drawable/baseline_arrow_circle_down_white_24dp.xml
index edaf772..c5682f5 100644
--- a/app/src/main/res/drawable/baseline_arrow_circle_down_white_24dp.xml
+++ b/app/src/main/res/drawable/baseline_arrow_circle_down_white_24dp.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/app/src/main/res/drawable/ic_playing_cards.xml b/app/src/main/res/drawable/ic_playing_cards.xml
new file mode 100644
index 0000000..d57af79
--- /dev/null
+++ b/app/src/main/res/drawable/ic_playing_cards.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_pack_details.xml b/app/src/main/res/layout/fragment_pack_details.xml
index 9d42164..2cd1aa8 100644
--- a/app/src/main/res/layout/fragment_pack_details.xml
+++ b/app/src/main/res/layout/fragment_pack_details.xml
@@ -20,13 +20,14 @@
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="175dp"
+ app:layout_constraintTop_toTopOf="parent"
app:shape_arc_height="25dp"
- app:shape_arc_position="bottom"
- app:layout_constraintTop_toTopOf="parent">
+ app:shape_arc_position="bottom">
+
+ android:background="@color/colorPrimary" />
-
+ android:layout_marginTop="12dp"
+ android:layout_weight="1"
+ android:drawableEnd="@drawable/stacked_gp"
+ android:drawablePadding="@dimen/padding_medium"
+ android:gravity="end"
+ android:textColor="@color/md_grey_700"
+ android:textSize="@dimen/text_size_title"
+ app:layout_constraintEnd_toStartOf="@+id/installs"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toEndOf="@+id/cards"
+ app:layout_constraintTop_toBottomOf="@id/materialCardView"
+ tools:text="200" />
+
+
+
+
-
-
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@+id/price">
Packs
Games Won
0
+ Installed