mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-07-31 10:18:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3216 from CatimaLoyalty/feature/smartwatch_settings

Browse Source 
Restructure smartwatch support settings
This commit is contained in:
Sylvia van Os
2026-07-20 18:16:38 +02:00
committed by GitHub
parent 3e970bae92 ef4af82145
commit bd7de98a5e
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt
View File

@@ -170,6 +170,10 @@ class SettingsActivity : CatimaAppCompatActivity() {
true
}
// Hide crash reporter settings on builds it's not enabled on
val crashReporterPreference = findPreference<Preference>("acra.enable")
crashReporterPreference!!.isVisible = BuildConfig.useAcraCrashReporter
val wearSyncPreference = findPreference<SwitchPreferenceCompat>(getString(R.string.settings_key_wear_sync))
wearSyncPreference!!.setOnPreferenceChangeListener { preference, newValue ->
val enabled = newValue as Boolean
@@ -187,10 +191,6 @@ class SettingsActivity : CatimaAppCompatActivity() {
true
}
}
// Hide crash reporter settings on builds it's not enabled on
val crashReporterPreference = findPreference<Preference>("acra.enable")
crashReporterPreference!!.isVisible = BuildConfig.useAcraCrashReporter
}
private fun showWearSyncPermissionDeniedSnackbar() {

8
app/src/main/res/values/strings.xml
View File

@@ -104,8 +104,8 @@
<string name="settings_disable_nfc_while_viewing_card">Pause NFC</string>
<string name="settings_disable_nfc_while_viewing_card_summary">Pauses NFC to prevent NFC payments from triggering while viewing a card</string>
<string name="settings_key_disable_nfc_while_viewing_card" translatable="false">pref_disable_nfc_while_viewing_card</string>
<string name="settings_allow_content_provider_read_title">Allow other apps to access my data</string>
<string name="settings_allow_content_provider_read_summary">Apps will still have to request permission to be granted access</string>
<string name="settings_allow_content_provider_read_title">Sync with Gadgetbridge</string>
<string name="settings_allow_content_provider_read_summary">Allows the Gadgetbridge app to sync your cards to supported watches</string>
<string name="settings_key_disable_lockscreen_while_viewing_card" translatable="false">pref_disable_lockscreen_while_viewing_card</string>
<string name="settings_key_allow_content_provider_read" translatable="false">pref_allow_content_provider_read</string>
<string name="settings_key_oled_dark" translatable="false">pref_oled_dark</string>
@@ -304,10 +304,9 @@
<string name="setting_key_column_count_landscape" translatable="false">pref_column_count_landscape</string>
<string name="settings_category_title_general">General</string>
<string name="settings_category_title_privacy">Privacy</string>
<string name="settings_category_title_wear">Wear OS</string>
<string name="settings_key_wear_sync" translatable="false">pref_wear_sync</string>
<string name="settings_wear_sync">Sync with Wear OS</string>
<string name="settings_wear_sync_summary">Allow a Wear OS companion app to read your cards over Bluetooth</string>
<string name="settings_wear_sync_summary">Allows the Wear OS companion app to read your cards over Bluetooth</string>
<string name="wear_sync_permission_required">Allow Catima access to nearby devices to sync with your smartwatch</string>
<string name="open_settings">Open settings</string>
<string name="action_display_options">Display options</string>
@@ -361,4 +360,5 @@
<string name="nfc_block_system_error">Failed to pause NFC</string>
<string name="wear_bt_channel_name">Wear OS companion</string>
<string name="wear_bt_notification_title">Catima watch sync active</string>
<string name="settings_category_title_smartwatch">Smartwatch support</string>
</resources>

7
app/src/main/res/xml/preferences.xml
View File

@@ -121,7 +121,7 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/settings_category_title_privacy"
android:title="@string/settings_category_title_smartwatch"
app:iconSpaceReserved="false">
<SwitchPreferenceCompat
@@ -132,11 +132,6 @@
android:title="@string/settings_allow_content_provider_read_title"
app:iconSpaceReserved="false"
app:singleLineTitle="false" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/settings_category_title_wear"
app:iconSpaceReserved="false">
<SwitchPreferenceCompat
android:widgetLayout="@layout/preference_material_switch"