diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt index 559e17f28..fae8eda99 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt @@ -64,6 +64,7 @@ class AppSettingsActivity : DSLSettingsActivity() { StartLocation.NOTIFICATIONS -> AppSettingsFragmentDirections.actionDirectToNotificationsSettingsFragment() StartLocation.CHANGE_NUMBER -> AppSettingsFragmentDirections.actionDirectToChangeNumberFragment() StartLocation.SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToSubscriptions().setSkipToSubscribe(true) + StartLocation.MANAGE_SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToSubscriptions() } } @@ -138,6 +139,9 @@ class AppSettingsActivity : DSLSettingsActivity() { @JvmStatic fun subscriptions(context: Context): Intent = getIntentForStartLocation(context, StartLocation.SUBSCRIPTIONS) + @JvmStatic + fun manageSubscriptions(context: Context): Intent = getIntentForStartLocation(context, StartLocation.MANAGE_SUBSCRIPTIONS) + private fun getIntentForStartLocation(context: Context, startLocation: StartLocation): Intent { return Intent(context, AppSettingsActivity::class.java) .putExtra(ARG_NAV_GRAPH, R.navigation.app_settings) @@ -159,7 +163,8 @@ class AppSettingsActivity : DSLSettingsActivity() { PROXY(3), NOTIFICATIONS(4), CHANGE_NUMBER(5), - SUBSCRIPTIONS(6); + SUBSCRIPTIONS(6), + MANAGE_SUBSCRIPTIONS(7); companion object { fun fromCode(code: Int?): StartLocation { diff --git a/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml index 24c1be294..870013695 100644 --- a/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml +++ b/app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml @@ -140,6 +140,7 @@ android:layout_marginStart="@dimen/dsl_settings_gutter" android:layout_marginTop="24dp" android:layout_marginEnd="@dimen/dsl_settings_gutter" + android:layout_marginBottom="16dp" android:text="@string/SubscribeThanksForYourSupportBottomSheetDialogFragment__done" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"