Fixing strings with new keys

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/BaseProSettingsScreens.kt

@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -95,6 +96,9 @@ fun BaseProSettingsScreen(
             )
 
             content()
+
+            Spacer(modifier = Modifier.height(LocalDimensions.current.spacing))
+            Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
         }
     }
 }

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/chooseplan/ChoosePlanNoBilling.kt

@@ -75,7 +75,6 @@ fun ChoosePlanNoBilling(
                 "huawei" -> "Huawei App Gallery"
                 else -> "APK"
             })
-            .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
             .put(PRO_KEY, NonTranslatableStringConstants.PRO)
             .put(PLATFORM_STORE_KEY, defaultGoogleStore)
             .put(PLATFORM_STORE2_KEY, defaultAppleStore)
@@ -115,6 +114,7 @@ fun ChoosePlanNoBilling(
                     .put(APP_NAME_KEY, NonTranslatableStringConstants.APP_NAME)
                     .put(PLATFORM_STORE_KEY, defaultGoogleStore)
                     .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
+                    .put(PRO_KEY, NonTranslatableStringConstants.PRO)
                     .format(),
                 iconRes = R.drawable.ic_smartphone
             )

app/src/play/kotlin/org/thoughtcrime/securesms/pro/subscription/PlayStoreSubscriptionManager.kt

@@ -33,7 +33,7 @@ class PlayStoreSubscriptionManager @Inject constructor(
     override val description = ""
     override val iconRes = null
 
-    override val supportsBilling: Boolean = true
+    override val supportsBilling: Boolean = false
 
     override val quickRefundExpiry: Instant = Instant.now() //todo PRO implement properly
     override val quickRefundUrl = "https://support.google.com/googleplay/workflow/9813244"