Non originating UI

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/settings/notification/NotificationSettingsViewModel.kt

@@ -195,7 +195,7 @@ class NotificationSettingsViewModel @AssistedInject constructor(
     }
 
     private fun formatTime(timestamp: Long): String{
-        return dateUtils.formatTime(timestamp, "HH:mm dd/MM/yy")
+        return DateUtils.formatTime(timestamp, "HH:mm dd/MM/yy")
     }
 
     private fun shouldEnableSetButton(): Boolean {

app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt

@@ -12,8 +12,10 @@ import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.view.isVisible
@@ -218,7 +220,11 @@ class HomeActivity : ScreenLockActionBarActivity(),
             Avatar(
                 size = LocalDimensions.current.iconMediumAvatar,
                 data = avatarUtils.getUIDataFromRecipient(recipient),
-                modifier = Modifier.clickable(onClick = ::openSettings)
+                modifier = Modifier.clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = ::openSettings
+                )
             )
         }
 

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

@@ -0,0 +1,2 @@
+package org.thoughtcrime.securesms.preferences.prosettings
+

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

@@ -40,7 +40,7 @@ fun ChoosePlanNonOriginating(
     val context = LocalContext.current
 
     val headerTitle = when(subscription) {
-        is SubscriptionState.Active.Expiring -> Phrase.from(context.getText(R.string.proPlanActivatedNotAuto))
+        is SubscriptionState.Active.Expiring -> Phrase.from(context.getText(R.string.proPlanExpireDate))
             .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
             .put(DATE_KEY, subscription.type.expiryFromNow())
             .format()

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

@@ -28,6 +28,12 @@ sealed interface ProSettingsDestination {
 
     @Serializable
     data object PlanConfirmation: ProSettingsDestination
+
+    @Serializable
+    data object CancelSubscription: ProSettingsDestination
+
+    @Serializable
+    data object RefundSubscription: ProSettingsDestination
 }
 
 @SuppressLint("RestrictedApi")

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

@@ -65,9 +65,7 @@ class ProSettingsViewModel @Inject constructor(
 
         _proSettingsUIState.update {
             ProSettingsState(
-                subscriptionState = if(proStatusManager.isCurrentUserPro())
-                    subscriptionState
-                else SubscriptionState.NeverSubscribed,
+                subscriptionState = subscriptionState,
                 subscriptionExpiryLabel = when(subscriptionState){
                     is SubscriptionState.Active.AutoRenewing ->
                         Phrase.from(context, R.string.proAutoRenewTime)
@@ -91,41 +89,13 @@ class ProSettingsViewModel @Inject constructor(
         }
 
         _choosePlanState.update {
-            // sort out the title and button label for the plan screen based on subscription status
-            val (title, buttonLabel) = when(subscriptionState) {
-                is SubscriptionState.Expired ->
-                    Phrase.from(context.getText(R.string.proPlanRenewStart))
-                        .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
-                        .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
-                        .format() to
-                            context.getString(R.string.renew)
-
-                is SubscriptionState.Active.Expiring -> Phrase.from(context.getText(R.string.proPlanActivatedNotAuto))
-                    .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
-                    .put(DATE_KEY, subscriptionState.type.expiryFromNow())
-                    .format() to
-                        context.getString(R.string.updatePlan)
-
-                is SubscriptionState.Active.AutoRenewing -> Phrase.from(context.getText(R.string.proPlanActivatedAuto))
-                    .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
-                    .put(CURRENT_PLAN_KEY, DateUtils.getLocalisedTimeDuration(
-                        context = context,
-                        amount = subscriptionState.type.duration.months,
-                        unit = MeasureUnit.MONTH
-                    ))
-                    .put(DATE_KEY, subscriptionState.type.expiryFromNow())
-                    .put(PRO_KEY, NonTranslatableStringConstants.PRO)
-                    .format() to
-                        context.getString(R.string.updatePlan)
-
-                else -> "" to ""
-            }
             val isActive = subscriptionState is SubscriptionState.Active
             val currentPlan12Months = isActive && subscriptionState.type == ProSubscriptionDuration.TWELVE_MONTHS
             val currentPlan3Months = isActive && subscriptionState.type == ProSubscriptionDuration.THREE_MONTHS
             val currentPlan1Month = isActive && subscriptionState.type == ProSubscriptionDuration.ONE_MONTH
 
             ChoosePlanState(
+                subscriptionState = subscriptionState,
                 enableButton = subscriptionState !is SubscriptionState.Active.AutoRenewing, // only the auto-renew can have a disabled state
                 plans = listOf(
                     ProPlan(