diff --git a/app/src/main/java/za/co/varsitycollege/st10204902/purrsonaltrainer/screens/shop/BackgroundShopActivity.kt b/app/src/main/java/za/co/varsitycollege/st10204902/purrsonaltrainer/screens/shop/BackgroundShopActivity.kt index a810adb..989aabe 100644 --- a/app/src/main/java/za/co/varsitycollege/st10204902/purrsonaltrainer/screens/shop/BackgroundShopActivity.kt +++ b/app/src/main/java/za/co/varsitycollege/st10204902/purrsonaltrainer/screens/shop/BackgroundShopActivity.kt @@ -17,5 +17,29 @@ class BackgroundShopActivity : AppCompatActivity() enableEdgeToEdge() binding = ActivityBackgroundShopBinding.inflate(layoutInflater) setContentView(binding.root) + + // Setup of Items + val background1 = binding.shopItemBackground1 + background1.shopItemName.text = "*BG Name Here" + background1.shopItemImage.setImageResource(R.drawable.shop_background_1) + background1.milkcoinsComponent.milkcoinsAmount.reInitialiseComponent(R.color.background_price_start, R.color.background_price_end) + + val background2 = binding.shopItemBackground2 + background2.shopItemName.text = "*BG Name Here" + background2.shopItemImage.setImageResource(R.drawable.shop_background_2) + background2.milkcoinsComponent.milkcoinsAmount.reInitialiseComponent(R.color.background_price_start, R.color.background_price_end) + + val background3 = binding.shopItemBackground3 + background3.shopItemName.text = "*BG Name Here" + background3.shopItemImage.setImageResource(R.drawable.shop_background_3) + background3.milkcoinsComponent.milkcoinsAmount.reInitialiseComponent(R.color.background_price_start, R.color.background_price_end) + + val background4 = binding.shopItemBackground4 + background4.shopItemName.text = "*BG Name Here" + background4.shopItemImage.setImageResource(R.drawable.shop_background_4) + background4.milkcoinsComponent.milkcoinsAmount.reInitialiseComponent(R.color.background_price_start, R.color.background_price_end) + + // Setup Coins + binding.backgroundShopCoins.milkcoinsAmount.reInitialiseComponent(R.color.background_balance_start, R.color.background_balance_end) } } \ No newline at end of file diff --git a/app/src/main/java/za/co/varsitycollege/st10204902/purrsonaltrainer/screens/shop/ItemShopActivity.kt b/app/src/main/java/za/co/varsitycollege/st10204902/purrsonaltrainer/screens/shop/ItemShopActivity.kt index 6060edd..2de9c09 100644 --- a/app/src/main/java/za/co/varsitycollege/st10204902/purrsonaltrainer/screens/shop/ItemShopActivity.kt +++ b/app/src/main/java/za/co/varsitycollege/st10204902/purrsonaltrainer/screens/shop/ItemShopActivity.kt @@ -18,5 +18,29 @@ class ItemShopActivity : AppCompatActivity() enableEdgeToEdge() binding = ActivityItemShopBinding.inflate(layoutInflater) setContentView(binding.root) + + // Setup of Items + val background1 = binding.shopItem1 + background1.shopItemName.text = "Nick's Creatine" + background1.shopItemImage.setImageResource(R.drawable.item_nick) + background1.milkcoinsComponent.milkcoinsAmount.reInitialiseComponent(R.color.item_nick_start, R.color.item_nick_end) + + val background2 = binding.shopItem2 + background2.shopItemName.text = "Michael's Earphones" + background2.shopItemImage.setImageResource(R.drawable.item_michael) + background2.milkcoinsComponent.milkcoinsAmount.reInitialiseComponent(R.color.item_michael_start, R.color.item_michael_end) + + val background3 = binding.shopItem3 + background3.shopItemName.text = "Harvey's Cookies" + background3.shopItemImage.setImageResource(R.drawable.item_harvey) + background3.milkcoinsComponent.milkcoinsAmount.reInitialiseComponent(R.color.item_harvey_start, R.color.item_harvey_end) + + val background4 = binding.shopItem4 + background4.shopItemName.text = "Jasper's Hoodie" + background4.shopItemImage.setImageResource(R.drawable.item_jasper) + background4.milkcoinsComponent.milkcoinsAmount.reInitialiseComponent(R.color.item_jasper_start, R.color.item_jasper_end) + + // Setup Coins + binding.backgroundShopCoins.milkcoinsAmount.reInitialiseComponent(R.color.background_balance_start, R.color.background_balance_end) } } \ No newline at end of file diff --git a/app/src/main/res/drawable/background_shop_backdrop.png b/app/src/main/res/drawable/background_shop_backdrop.png new file mode 100644 index 0000000..21584d4 Binary files /dev/null and b/app/src/main/res/drawable/background_shop_backdrop.png differ diff --git a/app/src/main/res/drawable/item_anneme.png b/app/src/main/res/drawable/item_anneme.png new file mode 100644 index 0000000..b85fe37 Binary files /dev/null and b/app/src/main/res/drawable/item_anneme.png differ diff --git a/app/src/main/res/drawable/item_harvey.png b/app/src/main/res/drawable/item_harvey.png new file mode 100644 index 0000000..8dd8246 Binary files /dev/null and b/app/src/main/res/drawable/item_harvey.png differ diff --git a/app/src/main/res/drawable/item_jasper.png b/app/src/main/res/drawable/item_jasper.png new file mode 100644 index 0000000..85f3a7e Binary files /dev/null and b/app/src/main/res/drawable/item_jasper.png differ diff --git a/app/src/main/res/drawable/item_michael.png b/app/src/main/res/drawable/item_michael.png new file mode 100644 index 0000000..08cad6e Binary files /dev/null and b/app/src/main/res/drawable/item_michael.png differ diff --git a/app/src/main/res/drawable/item_nick.png b/app/src/main/res/drawable/item_nick.png new file mode 100644 index 0000000..f5c933a Binary files /dev/null and b/app/src/main/res/drawable/item_nick.png differ diff --git a/app/src/main/res/drawable/item_shop_backdrop.png b/app/src/main/res/drawable/item_shop_backdrop.png new file mode 100644 index 0000000..249a07f Binary files /dev/null and b/app/src/main/res/drawable/item_shop_backdrop.png differ diff --git a/app/src/main/res/drawable/milkcoin.png b/app/src/main/res/drawable/milkcoin.png new file mode 100644 index 0000000..d7b8947 Binary files /dev/null and b/app/src/main/res/drawable/milkcoin.png differ diff --git a/app/src/main/res/drawable/shop_background_1.png b/app/src/main/res/drawable/shop_background_1.png new file mode 100644 index 0000000..469b4ab Binary files /dev/null and b/app/src/main/res/drawable/shop_background_1.png differ diff --git a/app/src/main/res/drawable/shop_background_2.png b/app/src/main/res/drawable/shop_background_2.png new file mode 100644 index 0000000..bcf27b8 Binary files /dev/null and b/app/src/main/res/drawable/shop_background_2.png differ diff --git a/app/src/main/res/drawable/shop_background_3.png b/app/src/main/res/drawable/shop_background_3.png new file mode 100644 index 0000000..30702c5 Binary files /dev/null and b/app/src/main/res/drawable/shop_background_3.png differ diff --git a/app/src/main/res/drawable/shop_background_4.png b/app/src/main/res/drawable/shop_background_4.png new file mode 100644 index 0000000..dc6bbe5 Binary files /dev/null and b/app/src/main/res/drawable/shop_background_4.png differ diff --git a/app/src/main/res/drawable/shop_item_label_background.xml b/app/src/main/res/drawable/shop_item_label_background.xml new file mode 100644 index 0000000..9f59b6c --- /dev/null +++ b/app/src/main/res/drawable/shop_item_label_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shop_item_shelf.png b/app/src/main/res/drawable/shop_item_shelf.png new file mode 100644 index 0000000..ad743c7 Binary files /dev/null and b/app/src/main/res/drawable/shop_item_shelf.png differ diff --git a/app/src/main/res/layout/activity_background_shop.xml b/app/src/main/res/layout/activity_background_shop.xml index e152ce2..3a3d35a 100644 --- a/app/src/main/res/layout/activity_background_shop.xml +++ b/app/src/main/res/layout/activity_background_shop.xml @@ -7,10 +7,127 @@ android:layout_height="match_parent" tools:context=".screens.shop.BackgroundShopActivity"> - + android:src="@drawable/background_shop_backdrop" + android:scaleType="centerCrop"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_item_shop.xml b/app/src/main/res/layout/activity_item_shop.xml index 509a7c8..24f0fa4 100644 --- a/app/src/main/res/layout/activity_item_shop.xml +++ b/app/src/main/res/layout/activity_item_shop.xml @@ -7,10 +7,127 @@ android:layout_height="match_parent" tools:context=".screens.shop.ItemShopActivity"> - + android:src="@drawable/item_shop_backdrop" + android:scaleType="centerCrop"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/component_milkcoins_amount.xml b/app/src/main/res/layout/component_milkcoins_amount.xml new file mode 100644 index 0000000..7da80b0 --- /dev/null +++ b/app/src/main/res/layout/component_milkcoins_amount.xml @@ -0,0 +1,30 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/component_shop_item.xml b/app/src/main/res/layout/component_shop_item.xml new file mode 100644 index 0000000..d466db6 --- /dev/null +++ b/app/src/main/res/layout/component_shop_item.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c4456e4..d3c9441 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -100,4 +100,34 @@ #C64201 #C64201 + #FFB478 + + + #B3EFFF + #65CBD0 + + + #FFC1C6 + #CD4B56 + + + #B3EFFF + #65CBD0 + + + #FED070 + #F78D37 + + + #EB937E + #FF562F + + + #B6ABE3 + #9747FF + + + #ACCE84 + #608420 + \ No newline at end of file