diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt index 99447e16ef..03ac92bb3a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt @@ -1,7 +1,6 @@ package org.thoughtcrime.securesms.badges.self.expired import androidx.fragment.app.FragmentManager -import androidx.navigation.fragment.findNavController import org.signal.core.util.DimensionUnit import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.badges.models.Badge @@ -10,6 +9,7 @@ import org.thoughtcrime.securesms.components.settings.DSLConfiguration import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment import org.thoughtcrime.securesms.components.settings.DSLSettingsText +import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity import org.thoughtcrime.securesms.components.settings.configure import org.thoughtcrime.securesms.util.BottomSheetUtil @@ -26,7 +26,7 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment( } private fun getConfiguration(): DSLConfiguration { - val badge = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments()).badge + val badge: Badge = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments()).badge return configure { customPref(ExpiredBadge.Model(badge)) @@ -80,7 +80,7 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment( ), onClick = { dismiss() - findNavController().navigate(R.id.action_direct_to_subscriptions) + requireActivity().startActivity(AppSettingsActivity.subscriptions(requireContext())) } ) diff --git a/app/src/main/res/layout/expired_badge_preference.xml b/app/src/main/res/layout/expired_badge_preference.xml index 19e864bda4..7604296e6a 100644 --- a/app/src/main/res/layout/expired_badge_preference.xml +++ b/app/src/main/res/layout/expired_badge_preference.xml @@ -16,6 +16,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:badge_size="badge_112" tools:src="@drawable/test_gradient" />