Skip to content

Commit 7de9bb7

Browse files
tobihagemanntobihagemann
committed
Remove redundant onboarding license header, add settings preference titles, rename section to Premium
1 parent 9ceda13 commit 7de9bb7

40 files changed

Lines changed: 8 additions & 47 deletions

File tree

‎presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ class SettingsFragment : PreferenceFragmentCompatLayout() {
177177
when (BuildConfig.FLAVOR) {
178178
"playstore", "accrescent" -> {
179179
licensePref?.let { pref ->
180+
pref.title = getString(R.string.screen_settings_license_title_unlocked)
180181
pref.summary = getString(R.string.screen_settings_license_summary_write_access)
181182
pref.onPreferenceClickListener = null
182183
}
@@ -189,9 +190,11 @@ class SettingsFragment : PreferenceFragmentCompatLayout() {
189190
val trialState = licenseEnforcer.evaluateTrialState()
190191
licensePref?.let { pref ->
191192
if (hasPaidLicense) {
193+
pref.title = getString(R.string.screen_settings_license_title_unlocked)
192194
pref.summary = getString(R.string.screen_settings_license_summary_write_access)
193195
pref.onPreferenceClickListener = null
194196
} else {
197+
pref.title = getString(R.string.screen_settings_license_title_unlock)
195198
pref.summary = if (trialState.isActive) {
196199
getString(R.string.screen_settings_license_summary_trial_expires, trialState.formattedExpirationDate)
197200
} else {
@@ -227,12 +230,14 @@ class SettingsFragment : PreferenceFragmentCompatLayout() {
227230
licensePref?.let { pref ->
228231
val mail = sharedPreferencesHandler.mail()
229232
if (mail.isEmpty()) {
233+
pref.title = getString(R.string.screen_settings_license_title_unlock)
230234
pref.summary = getString(R.string.screen_settings_license_summary_tap_to_unlock)
231235
pref.setOnPreferenceClickListener {
232236
startActivity(Intent(activity(), LicenseCheckActivity::class.java))
233237
true
234238
}
235239
} else {
240+
pref.title = getString(R.string.screen_settings_license_title_unlocked)
236241
pref.summary = format(getString(R.string.screen_settings_license_summary_write_access_mail), mail)
237242
pref.onPreferenceClickListener = null
238243
}

‎presentation/src/main/res/layout/fragment_welcome_license.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
android:layout_height="wrap_content"
99
android:orientation="vertical">
1010

11-
<TextView
12-
android:id="@+id/tvLicenseTitle"
13-
android:layout_width="match_parent"
14-
android:layout_height="wrap_content"
15-
android:text="@string/screen_welcome_license_title"
16-
android:textAppearance="?attr/textAppearanceSubtitle1"
17-
android:textStyle="bold" />
18-
1911
<include
2012
android:id="@+id/licenseContent"
2113
android:layout_width="match_parent"

‎presentation/src/main/res/values-ar-rSA/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@
436436
<string name="screen_settings_lru_cache_size">إجمالي حجم ذاكرة التخزين المؤقت</string>
437437
<string name="screen_settings_clear_lru_cache_size">مسح بيانات الذاكرة المؤقتة</string>
438438
<string name="screen_settings_lru_cache_changed__restart_toast">سيتم تطبيق التغييرات عند إعادة تشغيل التطبيق</string>
439-
<string name="screen_settings_license">مسجل لـ</string>
440439
<string name="screen_settings_license_mail">%1$s</string>
441440
<string name="dialog_settings_update_check_interval_title">الفاصل الزمني للتحديث</string>
442441
<string name="screen_settings_check_updates">بحث عن تحديثات</string>

‎presentation/src/main/res/values-ba-rRU/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@
404404
<string name="screen_settings_lru_cache_size">Дөйөм кэш күләме</string>
405405
<string name="screen_settings_clear_lru_cache_size">Кэшты таҙартыу</string>
406406
<string name="screen_settings_lru_cache_changed__restart_toast">Үҙгәрештәр ҡушымтаны ҡайтанан эшләтеп ебәргәндә ҡулланыласаҡ</string>
407-
<string name="screen_settings_license">Теркәлеүсе</string>
408407
<string name="screen_settings_license_mail">%1$s</string>
409408
<string name="dialog_settings_update_check_interval_title">Яңыртыу тикшереү интервалы</string>
410409
<string name="screen_settings_check_updates">Яңыртыуҙарҙы тикшереү</string>

‎presentation/src/main/res/values-ca-rES/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,6 @@
418418
<string name="screen_settings_lru_cache_size">Mida total de la memòria cau</string>
419419
<string name="screen_settings_clear_lru_cache_size">Esborra la memòria cau</string>
420420
<string name="screen_settings_lru_cache_changed__restart_toast">Els canvis seran aplicats al reinicialitzar l\'aplicació</string>
421-
<string name="screen_settings_license">Registrat per</string>
422421
<string name="screen_settings_license_mail">%1$s</string>
423422
<string name="dialog_settings_update_check_interval_title">Interval entre comprovacions d\'actualitzacions</string>
424423
<string name="screen_settings_check_updates">Cerca actualitzacions</string>

‎presentation/src/main/res/values-cs-rCZ/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@
407407
<string name="screen_settings_lru_cache_size">Velikost mezipaměti</string>
408408
<string name="screen_settings_clear_lru_cache_size">Vyčistit mezipaměť</string>
409409
<string name="screen_settings_lru_cache_changed__restart_toast">Změny budou použity při příštím restartu aplikace</string>
410-
<string name="screen_settings_license">Registrováno na</string>
411410
<string name="screen_settings_license_mail">%1$s</string>
412411
<string name="dialog_settings_update_check_interval_title">Interval kontroly aktualizací</string>
413412
<string name="screen_settings_check_updates">Zkontrolovat aktualizace</string>

‎presentation/src/main/res/values-da-rDK/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@
407407
<string name="screen_settings_lru_cache_size">Total cachestørrelse</string>
408408
<string name="screen_settings_clear_lru_cache_size">Tøm cache</string>
409409
<string name="screen_settings_lru_cache_changed__restart_toast">Ændringerne bliver anvendt næste gang du genstarter appen</string>
410-
<string name="screen_settings_license">Registreret til</string>
411410
<string name="screen_settings_license_mail">%1$s</string>
412411
<string name="dialog_settings_update_check_interval_title">Interval for tjek af nye opdateringer</string>
413412
<string name="screen_settings_check_updates">Søg efter opdateringer</string>

‎presentation/src/main/res/values-de-rDE/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@
431431
<string name="screen_settings_lru_cache_size">Zwischenspeichergröße gesamt</string>
432432
<string name="screen_settings_clear_lru_cache_size">Zwischenspeicher leeren</string>
433433
<string name="screen_settings_lru_cache_changed__restart_toast">Änderungen werden nach einem Neustart der App aktiv</string>
434-
<string name="screen_settings_license">Registriert für</string>
435434
<string name="screen_settings_license_mail">%1$s</string>
436435
<string name="dialog_settings_update_check_interval_title">Intervall der Aktualisierungsprüfung</string>
437436
<string name="screen_settings_check_updates">Nach Aktualisierungen suchen</string>

‎presentation/src/main/res/values-el-rGR/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@
431431
<string name="screen_settings_lru_cache_size">Συνολικό μέγεθος προσωρινής μνήμης</string>
432432
<string name="screen_settings_clear_lru_cache_size">Εκκαθάριση προσωρινής μνήμης</string>
433433
<string name="screen_settings_lru_cache_changed__restart_toast">Οι αλλαγές θα εφαρμοστούν στην επόμενη επανεκκίνηση της εφαρμογής</string>
434-
<string name="screen_settings_license">Εγγεγραμμένος για</string>
435434
<string name="screen_settings_license_mail">%1$s</string>
436435
<string name="dialog_settings_update_check_interval_title">Διάστημα ελέγχου ενημερώσεων</string>
437436
<string name="screen_settings_check_updates">\'Έλεγχος για ενημερώσεις</string>

‎presentation/src/main/res/values-es-rES/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@
431431
<string name="screen_settings_lru_cache_size">Tamaño total de la caché</string>
432432
<string name="screen_settings_clear_lru_cache_size">Vaciar la caché</string>
433433
<string name="screen_settings_lru_cache_changed__restart_toast">Los cambios se aplicarán en el próximo reinicio de la aplicación</string>
434-
<string name="screen_settings_license">Registrado para</string>
435434
<string name="screen_settings_license_mail">%1$s</string>
436435
<string name="dialog_settings_update_check_interval_title">Actualizar intervalo de verificación</string>
437436
<string name="screen_settings_check_updates">Comprobar actualizaciones</string>

0 commit comments

Comments
 (0)