fix promo designs

Habitica/res/layout/fragment_gem_purchase.xml

@@ -17,6 +17,7 @@
             android:background="@drawable/g1g1_box"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginBottom="@dimen/spacing_large"
             android:clipChildren="true"
             android:clipToPadding="true"
             android:clickable="true"
@@ -29,14 +30,16 @@
                 android:scaleType="center"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentStart="true"
-                android:layout_alignParentBottom="false"/>
+                android:layout_alignParentBottom="false"
+                android:importantForAccessibility="no"/>
             <ImageView
                 android:id="@+id/promo_banner_right_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:scaleType="center"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"/>
+                android:layout_alignParentEnd="true"
+                android:importantForAccessibility="no"/>
             <LinearLayout
                 android:layout_centerInParent="true"
                 android:layout_width="wrap_content"

Habitica/res/layout/purchase_gem_view.xml

@@ -40,6 +40,7 @@
             android:layout_marginEnd="2dp"
             tools:text="21" />
         <com.habitrpg.android.habitica.ui.views.DayNightTextView
+            android:id="@+id/gem_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:dayTextColor="@color/white"

Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt

@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.promotions
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -88,18 +89,33 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
     override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
     }
 
+    @SuppressLint("SetTextI18n")
     override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
+        binding.purchaseButton.setTextColor(ContextCompat.getColor(context, R.color.white))
         binding.gemAmount.setTextColor(Color.parseColor("#FEE2B6"))
+        binding.gemLabel.setTextColor(Color.parseColor("#FEE2B6"))
         binding.footerTextView.visibility = View.VISIBLE
         binding.footerTextView.text = context.getString(R.string.usually_x_gems, regularAmount)
-        binding.gemAmount.text = when (regularAmount) {
+        when (regularAmount) {
-            4 -> "5 GEMS"
+            4 -> {
-            21 -> "30 GEMS"
+                binding.gemAmount.text = "5"
-            42 -> "60 GEMS"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_4)
-            84 -> "125 GEMS"
+            }
+            21 -> {
+                binding.gemAmount.text = "30"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_21)
+            }
+            42 -> {
+                binding.gemAmount.text = "60"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_42)
+            }
+            84 -> {
+                binding.gemAmount.text = "125"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_84)
+            }
             else -> regularAmount.toString()
         }
     }

Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt

@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.promotions
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -88,18 +89,33 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
     override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
     }
 
+    @SuppressLint("SetTextI18n")
     override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
+        binding.purchaseButton.setTextColor(ContextCompat.getColor(context, R.color.white))
         binding.gemAmount.setTextColor(Color.parseColor("#FEE2B6"))
+        binding.gemLabel.setTextColor(Color.parseColor("#FEE2B6"))
         binding.footerTextView.visibility = View.VISIBLE
         binding.footerTextView.text = context.getString(R.string.usually_x_gems, regularAmount)
-        binding.gemAmount.text = when (regularAmount) {
+        when (regularAmount) {
-            4 -> "5 GEMS"
+            4 -> {
-            21 -> "30 GEMS"
+                binding.gemAmount.text = "5"
-            42 -> "60 GEMS"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_4)
-            84 -> "125 GEMS"
+            }
+            21 -> {
+                binding.gemAmount.text = "30"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_21)
+            }
+            42 -> {
+                binding.gemAmount.text = "60"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_42)
+            }
+            84 -> {
+                binding.gemAmount.text = "125"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_84)
+            }
             else -> regularAmount.toString()
         }
     }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt

@@ -27,6 +27,7 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.CurrencyViews
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.RecyclerViewState
+import io.reactivex.rxjava3.kotlin.combineLatest
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -270,19 +271,19 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
     private fun loadMarketGear() {
         compositeSubscription.add(
             inventoryRepository.retrieveMarketGear()
-                .zipWith(
+                .combineLatest(
-                    inventoryRepository.getOwnedEquipment().map { equipment -> equipment.map { it.key } },
+                    inventoryRepository.getOwnedEquipment().map { equipment -> equipment.map { it.key } }
-                    { shop, equipment ->
-                        for (category in shop.categories) {
-                            val items = category.items.asSequence().filter {
-                                !equipment.contains(it.key)
-                            }.sortedBy { it.locked }.toList()
-                            category.items.clear()
-                            category.items.addAll(items)
-                        }
-                        shop
-                    }
                 )
+                .map { (shop, equipment) ->
+                    for (category in shop.categories) {
+                        val items = category.items.asSequence().filter {
+                            !equipment.contains(it.key)
+                        }.sortedBy { it.locked }.toList()
+                        category.items.clear()
+                        category.items.addAll(items)
+                    }
+                    shop
+                }
                 .subscribe(
                     {
                         this.gearCategories = it.categories

fastlane/README.md

@@ -23,6 +23,14 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 Runs all the tests
 
+### android staffapk
+
+```sh
+[bundle exec] fastlane android staffapk
+```
+
+Build Staff APK for sara
+
 ### android staff
 
 ```sh

version.properties

@@ -1,2 +1,2 @@
-NAME=4.0.2
+NAME=4.0.3
-CODE=4510
+CODE=4521