mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Adjust done button spacing and action.

fork-5.53.8
Alex Hart 2021-11-04 15:50:43 -03:00 zatwierdzone przez Greyson Parrelli
rodzic 22221222bd
commit 5d604c4e55
2 zmienionych plików z 7 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt
Wyświetl plik

@ -64,6 +64,7 @@ class AppSettingsActivity : DSLSettingsActivity() {
StartLocation.NOTIFICATIONS -> AppSettingsFragmentDirections.actionDirectToNotificationsSettingsFragment() StartLocation.NOTIFICATIONS -> AppSettingsFragmentDirections.actionDirectToNotificationsSettingsFragment()
StartLocation.CHANGE_NUMBER -> AppSettingsFragmentDirections.actionDirectToChangeNumberFragment() StartLocation.CHANGE_NUMBER -> AppSettingsFragmentDirections.actionDirectToChangeNumberFragment()
StartLocation.SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToSubscriptions().setSkipToSubscribe(true) StartLocation.SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToSubscriptions().setSkipToSubscribe(true)
StartLocation.MANAGE_SUBSCRIPTIONS -> AppSettingsFragmentDirections.actionDirectToSubscriptions()
} }
} }
@ -138,6 +139,9 @@ class AppSettingsActivity : DSLSettingsActivity() {
@JvmStatic @JvmStatic
fun subscriptions(context: Context): Intent = getIntentForStartLocation(context, StartLocation.SUBSCRIPTIONS) 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 { private fun getIntentForStartLocation(context: Context, startLocation: StartLocation): Intent {
return Intent(context, AppSettingsActivity::class.java) return Intent(context, AppSettingsActivity::class.java)
.putExtra(ARG_NAV_GRAPH, R.navigation.app_settings) .putExtra(ARG_NAV_GRAPH, R.navigation.app_settings)
@ -159,7 +163,8 @@ class AppSettingsActivity : DSLSettingsActivity() {
PROXY(3), PROXY(3),
NOTIFICATIONS(4), NOTIFICATIONS(4),
CHANGE_NUMBER(5), CHANGE_NUMBER(5),
SUBSCRIPTIONS(6); SUBSCRIPTIONS(6),
MANAGE_SUBSCRIPTIONS(7);
companion object { companion object {
fun fromCode(code: Int?): StartLocation { fun fromCode(code: Int?): StartLocation {

1
app/src/main/res/layout/thanks_for_your_support_bottom_sheet_dialog_fragment.xml
Wyświetl plik

@ -140,6 +140,7 @@
android:layout_marginStart="@dimen/dsl_settings_gutter" android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginEnd="@dimen/dsl_settings_gutter" android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:layout_marginBottom="16dp"
android:text="@string/SubscribeThanksForYourSupportBottomSheetDialogFragment__done" android:text="@string/SubscribeThanksForYourSupportBottomSheetDialogFragment__done"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"