Improve insufficient gem display

Habitica/res/layout/dialog_habitica_primary_button.xml

@@ -3,7 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="60dp"
+    android:layout_height="wrap_content"
     style="@style/HabiticaButton.Primary"
-    tools:text="Test">
+    android:paddingTop="@dimen/spacing_medium"
+    android:paddingBottom="@dimen/spacing_medium"
+    tools:text="Tesqweqwe qweqwe qweq eqweq weqwe qweqweqw eqwe qwe qweqweq qwe qweq weq w qweq weqw eqwe qwe qwe qwet">
 </Button>

Habitica/res/layout/dialog_habitica_primary_destructive_button.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="wrap_content"
     style="@style/HabiticaButton.Maroon">
 </Button>

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt

@@ -22,6 +22,7 @@ import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.MainNavigationController
 import com.habitrpg.common.habitica.helpers.launchCatching
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -116,7 +117,9 @@ class EquipmentDetailFragment :
 
         type?.let { type ->
             lifecycleScope.launchCatching {
-                inventoryRepository.getOwnedEquipment(type).collect { adapter.data = it }
+                inventoryRepository.getOwnedEquipment(type)
+                    .map { it.sortedBy { equipment -> equipment.text } }
+                    .collect { adapter.data = it }
             }
         }
     }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt

@@ -118,6 +118,7 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
             }
             binding?.promoComposeView?.isVisible = true
         }
+        loadInventory()
 
         Analytics.sendNavigationEvent("gem screen")
     }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt

@@ -18,6 +18,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.children
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogHabiticaBaseBinding
@@ -82,6 +83,12 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
             }
         }
 
+    var titleTextViewVisibility: Boolean
+        get() = binding.titleTextView.isVisible
+        set(value) {
+            binding.titleTextView.isVisible = value
+        }
+
     init {
         setView(binding.root)
         binding.closeButton.setOnClickListener { dismiss() }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt

@@ -25,6 +25,7 @@ abstract class InsufficientCurrencyDialog(context: Context) : HabiticaAlertDialo
         val inflater = LayoutInflater.from(context)
         val view = inflater.inflate(getLayoutID(), null)
         setAdditionalContentView(view)
+        titleTextViewVisibility = false
 
         imageView = view.findViewById(R.id.imageView)
         textView = view.findViewById(R.id.textView)

fastlane/README.md

@@ -63,14 +63,6 @@ Submit a new Beta Build to Google Play
 
 Deploy a new version to the Google Play
 
-### android upload_to_slack
-
-```sh
-[bundle exec] fastlane android upload_to_slack
-```
-
-Upload the latest output APK to slack
-
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.

version.properties

@@ -1,2 +1,2 @@
 NAME=4.3.7
-CODE=7801
+CODE=7821