drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 05:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Reorder settings like on iOS

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-11-21 18:37:37 +01:00
committed by jeanbaptisteC
parent 1d087ca854
commit 955d3702ac
3 changed files with 83 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/src/main/res/values/donottranslate.xml
View File

@@ -41,6 +41,7 @@
<string name="pref_map_locale" translatable="false">MapLanguage</string> <string name="pref_map_locale" translatable="false">MapLanguage</string>
<string name="pref_backup" translatable="false">Backup</string> <string name="pref_backup" translatable="false">Backup</string>
<string name="pref_left_button" translatable="false">LeftButton</string> <string name="pref_left_button" translatable="false">LeftButton</string>
<string name="pref_power" translatable="false">pref_power</string>
<string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string> <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
<string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string> <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>

1
android/app/src/main/res/values/strings.xml
View File

@@ -658,6 +658,7 @@
<!-- Settings privacy group in settings screen --> <!-- Settings privacy group in settings screen -->
<string name="privacy">Privacy</string> <string name="privacy">Privacy</string>
<string name="privacy_policy">Privacy policy</string> <string name="privacy_policy">Privacy policy</string>
<string name="power_management">Power management</string>
<string name="terms_of_use">Terms of use</string> <string name="terms_of_use">Terms of use</string>
<string name="button_layer_traffic">Traffic</string> <string name="button_layer_traffic">Traffic</string>
<string name="subway">Subway</string> <string name="subway">Subway</string>

157
android/app/src/main/res/xml/prefs_main.xml
View File

@@ -54,118 +54,78 @@
android:defaultValue="false" android:defaultValue="false"
app:icon="@drawable/ic_text_fields" app:icon="@drawable/ic_text_fields"
android:order="6"/> android:order="6"/>
<Preference
android:key="@string/pref_map_locale"
android:title="@string/change_map_locale"
app:icon="@drawable/ic_translate"
app:singleLineTitle="false"
android:persistent="false"
android:order="7"/>
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="@string/pref_transliteration" android:key="@string/pref_transliteration"
android:title="@string/transliteration_title" android:title="@string/transliteration_title"
app:singleLineTitle="false" app:singleLineTitle="false"
app:icon="@drawable/ic_translate_indic" app:icon="@drawable/ic_translate_indic"
android:defaultValue="false" android:defaultValue="false"
android:order="7"/> android:order="8"/>
<Preference <Preference
android:key="@string/pref_storage" android:key="@string/pref_storage"
android:title="@string/maps_storage" android:title="@string/maps_storage"
app:icon="@drawable/ic_sd_card" app:icon="@drawable/ic_sd_card"
app:singleLineTitle="false" app:singleLineTitle="false"
android:summary="@string/maps_storage_summary" android:summary="@string/maps_storage_summary"
android:order="8"/> android:order="9"/>
<SwitchPreferenceCompat
android:key="@string/pref_enable_logging"
android:title="@string/enable_logging"
app:icon="@drawable/ic_browse_activity"
app:singleLineTitle="false"
android:summary="@string/enable_logging_warning_message"
android:defaultValue="false"
android:order="12"/>
<SwitchPreferenceCompat
android:key="@string/pref_emulate_bad_external_storage"
android:title="@string/setting_emulate_bad_storage"
app:singleLineTitle="false"
android:defaultValue="false"
app:isPreferenceVisible="false"
android:order="13"/>
<ListPreference
android:key="@string/pref_use_mobile_data"
android:title="@string/mobile_data"
app:singleLineTitle="false"
app:icon="@drawable/ic_network_manage"
android:summary="@string/mobile_data_description"
android:entries="@array/mobile_data_options"
android:entryValues="@array/mobile_data_options_values"
android:order="14"/>
<ListPreference
android:key="@string/pref_power_management"
android:title="@string/power_managment_title"
app:singleLineTitle="false"
android:summary="@string/power_managment_description"
android:entries="@array/power_management_scheme"
android:entryValues="@array/power_management_scheme_values"
app:icon="@drawable/ic_eco"
android:order="15"/>
<SwitchPreferenceCompat
android:key="@string/pref_keep_screen_on"
android:title="@string/enable_keep_screen_on"
app:singleLineTitle="false"
android:summary="@string/enable_keep_screen_on_description"
android:defaultValue="false"
android:order="16"/>
<SwitchPreferenceCompat
android:key="@string/pref_show_on_lock_screen"
android:title="@string/enable_show_on_lock_screen"
app:icon="@drawable/ic_mobile_lock_portrait"
app:singleLineTitle="false"
android:summary="@string/enable_show_on_lock_screen_description"
android:defaultValue="true"
android:order="17"/>
<Preference <Preference
android:key="@string/pref_map_locale" android:key="@string/pref_backup"
android:title="@string/change_map_locale" android:title="@string/pref_backup_title"
app:icon="@drawable/ic_translate" android:summary="@string/pref_backup_summary"
app:singleLineTitle="false" app:icon="@drawable/ic_settings_backup_restore"
android:persistent="false" app:singleLineTitle="false"
android:order="18"/> android:persistent="false"
<Preference android:order="10"/>
android:key="@string/pref_backup" <SwitchPreferenceCompat
android:title="@string/pref_backup_title" android:key="@string/pref_enable_logging"
android:summary="@string/pref_backup_summary" android:title="@string/enable_logging"
app:icon="@drawable/ic_settings_backup_restore" app:icon="@drawable/ic_browse_activity"
app:singleLineTitle="false" app:singleLineTitle="false"
android:persistent="false" android:summary="@string/enable_logging_warning_message"
android:order="19"/> android:defaultValue="false"
android:order="11"/>
<SwitchPreferenceCompat
android:key="@string/pref_emulate_bad_external_storage"
android:title="@string/setting_emulate_bad_storage"
app:singleLineTitle="false"
android:defaultValue="false"
app:isPreferenceVisible="false"
android:order="12"/>
</androidx.preference.PreferenceCategory> </androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory <androidx.preference.PreferenceCategory
android:key="@string/pref_navigation" android:key="@string/pref_navigation"
android:title="@string/prefs_group_route" android:title="@string/prefs_group_route"
android:order="3"> android:order="3">
<ListPreference
android:key="@string/pref_map_style"
android:title="@string/pref_map_style_title"
app:icon="@drawable/ic_dark_mode"
app:singleLineTitle="false"
android:entries="@array/map_style"
android:order="1"/>
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="@string/pref_3d" android:key="@string/pref_3d"
android:title="@string/pref_map_3d_title" android:title="@string/pref_map_3d_title"
app:icon="@drawable/ic_three_d_rotation" app:icon="@drawable/ic_three_d_rotation"
app:singleLineTitle="false" app:singleLineTitle="false"
android:order="2"/> android:order="1"/>
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="@string/pref_auto_zoom" android:key="@string/pref_auto_zoom"
android:title="@string/pref_map_auto_zoom" android:title="@string/pref_map_auto_zoom"
app:singleLineTitle="false" app:singleLineTitle="false"
android:order="3"/> android:order="2"/>
<Preference <Preference
android:key="@string/pref_tts_screen" android:key="@string/pref_tts_screen"
android:title="@string/pref_tts_enable_title" android:title="@string/pref_tts_enable_title"
app:singleLineTitle="false" app:singleLineTitle="false"
android:persistent="false" android:persistent="false"
app:icon="@drawable/ic_record_voice_over" app:icon="@drawable/ic_record_voice_over"
android:order="4"> android:order="3">
</Preference> </Preference>
<PreferenceScreen <PreferenceScreen
android:key="@string/prefs_routing" android:key="@string/prefs_routing"
android:order="5" android:order="4"
android:title="@string/driving_options_title" android:title="@string/driving_options_title"
app:icon="@drawable/ic_instant_mix"> app:icon="@drawable/ic_instant_mix">
<intent <intent
@@ -175,10 +135,55 @@
</intent> </intent>
</PreferenceScreen> </PreferenceScreen>
</androidx.preference.PreferenceCategory> </androidx.preference.PreferenceCategory>
<PreferenceCategory
android:key="@string/pref_power"
android:title="@string/power_management"
android:order="4">
<ListPreference
android:key="@string/pref_map_style"
android:title="@string/pref_map_style_title"
app:icon="@drawable/ic_dark_mode"
app:singleLineTitle="false"
android:entries="@array/map_style"
android:order="1"/>
<ListPreference
android:key="@string/pref_use_mobile_data"
android:title="@string/mobile_data"
app:singleLineTitle="false"
app:icon="@drawable/ic_network_manage"
android:summary="@string/mobile_data_description"
android:entries="@array/mobile_data_options"
android:entryValues="@array/mobile_data_options_values"
android:order="2"/>
<ListPreference
android:key="@string/pref_power_management"
android:title="@string/power_managment_title"
app:singleLineTitle="false"
android:summary="@string/power_managment_description"
android:entries="@array/power_management_scheme"
android:entryValues="@array/power_management_scheme_values"
app:icon="@drawable/ic_eco"
android:order="3"/>
<SwitchPreferenceCompat
android:key="@string/pref_keep_screen_on"
android:title="@string/enable_keep_screen_on"
app:singleLineTitle="false"
android:summary="@string/enable_keep_screen_on_description"
android:defaultValue="false"
android:order="4"/>
<SwitchPreferenceCompat
android:key="@string/pref_show_on_lock_screen"
android:title="@string/enable_show_on_lock_screen"
app:icon="@drawable/ic_mobile_lock_portrait"
app:singleLineTitle="false"
android:summary="@string/enable_show_on_lock_screen_description"
android:defaultValue="true"
android:order="5"/>
</PreferenceCategory>
<androidx.preference.PreferenceCategory <androidx.preference.PreferenceCategory
android:key="@string/pref_privacy" android:key="@string/pref_privacy"
android:title="@string/privacy" android:title="@string/privacy"
android:order="6"> android:order="5">
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:key="@string/pref_play_services" android:key="@string/pref_play_services"
android:title="@string/google_play_services" android:title="@string/google_play_services"