vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-12 23:31:10 +01:00
Code Issues Releases Wiki Activity

Rework string ids to tell content

Browse source
This commit is contained in:
Gregor Santner 2018-09-04 19:16:51 +02:00
parent 48a00b099e
commit 4cd88400ee
39 changed files with 1258 additions and 1263 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/res/xml/preferences__master.xml
View file

@ -3,19 +3,19 @@
<!-- Appearance -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__appearance"
android:title="@string/pref_cat__visuals">
android:title="@string/appearance">
<Preference
android:icon="@drawable/ic_color_lens_black_24px"
android:key="@string/pref_key__cat_themes"
android:summary="@string/pref_desc__themes"
android:title="@string/pref_title__themes"/>
android:summary="@string/control_which_colors_are_used_in_app"
android:title="@string/theme_and_colors"/>
<Preference
android:icon="@drawable/ic_visibility_on_black_24px"
android:key="@string/pref_key__cat_nav_slider"
android:summary="@string/pref_desc__sub_nav_slider"
android:title="@string/pref_title__sub_nav_slider"/>
android:summary="@string/control_visibility_of_entries_nav_drawer"
android:title="@string/navigation_drawer"/>
<net.gsantner.opoc.preference.nonsupport.LanguagePreference
android:icon="@drawable/ic_language_black_48px"
@ -36,7 +36,7 @@
<!-- Operability -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:title="@string/pref_cat__operability">
android:title="@string/operability">
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="false"
@ -49,8 +49,8 @@
android:icon="@drawable/ic_visibility_black_24dp"
android:defaultValue="false"
android:key="@string/pref_key__is_overview_statusbar_hidden"
android:summary="@string/pref_summary__is_statusbar_hidden"
android:title="@string/pref_title__is_statusbar_hidden"/>
android:summary="@string/hide_statusbar_in_mainview"
android:title="@string/hide_statusbar"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="false"
@ -77,15 +77,15 @@
android:defaultValue="false"
android:icon="@drawable/ic_touch_app_black_24px"
android:key="@string/pref_key__topbar_stream_shortcut"
android:summary="@string/pref_desc__topbar_stream_shortcut"
android:title="@string/pref_title__topbar_stream_shortcut"/>
android:summary="@string/click_empty_space_top_toolbar_load_stream__appspecific"
android:title="@string/top_toolbar_loads_stream__appsp"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="false"
android:icon="@drawable/ic_visibility_black_24dp"
android:key="@string/pref_key__show_title"
android:summary="@string/pref_summary__show_title"
android:title="@string/pref_title__show_title"/>
android:summary="@string/show_title_in_main_view"
android:title="@string/show_title"/>
<ListPreference
android:defaultValue="@string/rotation_val_system"
@ -101,7 +101,7 @@
<!-- Diaspora Pod Settings -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__pod_settings"
android:title="@string/pref_cat__pod_settings">
android:title="@string/pod_settings__appspecfic">
<Preference
android:icon="@drawable/ic_person_black_24px"
android:key="@string/pref_key__personal_settings"
@ -130,7 +130,7 @@
<!-- Networking -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__network"
android:title="@string/pref_cat__network">
android:title="@string/network">
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="true"
android:icon="@drawable/ic_file_download_black_24px"

18
app/src/main/res/xml/preferences__sub_navslider_vis.xml
View file

@ -3,7 +3,7 @@
<!-- User -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:title="@string/pref_cat__visibility_nav_items__user">
android:title="@string/user">
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__profile"
@ -11,7 +11,7 @@
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__followed_tags"
android:title="@string/nav_followed_tags"/>
android:title="@string/followed_tags"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__aspects"
@ -39,7 +39,7 @@
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__public_activities"
android:title="@string/nav_public_activities"/>
android:title="@string/public_activities"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__gsantner_account"
@ -50,32 +50,32 @@
<!-- General -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:title="@string/pref_cat__visibility_nav_items__general">
android:title="@string/general">
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__exit"
android:title="@string/action_exit_app"/>
android:title="@string/exit_app"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__toggle_mobile_desktop"
android:title="@string/action_toggle_desktop_page"/>
android:title="@string/toggle_mobile_desktop_view"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__help_license"
android:title="@string/nav_help_license"/>
android:title="@string/help_license"/>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
<!-- Admin -->
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:title="@string/pref_cat__visibility_nav_items__admin">
android:title="@string/admin">
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__reports"
android:title="@string/nav_reports"/>
android:title="@string/reports"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"

12
app/src/main/res/xml/preferences__sub_themes.xml
View file

@ -2,23 +2,23 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__themes"
android:title="@string/pref_title__themes">
android:title="@string/theme_and_colors">
<com.github.dfa.diaspora_android.ui.theme.ThemedColorPickerPreference
android:key="@string/pref_key__primary_color__preference_click"
android:summary="@string/pref_desc__primary_color"
android:title="@string/pref_title__primary_color"
android:summary="@string/colors_of_toolbars"
android:title="@string/primary_colors"
android:icon="@drawable/circle" />
<com.github.dfa.diaspora_android.ui.theme.ThemedColorPickerPreference
android:key="@string/pref_key__accent_color__preference_click"
android:summary="@string/pref_desc__accent_color"
android:title="@string/pref_title__accent_color"
android:summary="@string/color_of_progressbar"
android:title="@string/accent_color"
android:icon="@drawable/circle" />
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="false"
android:key="@string/pref_key__primary_color__amoled_mode"
android:summary="@string/pref_desc__primary_color__amoled_mode"
android:summary="@string/amoled_mode_description__app_specific"
android:title="@string/amoled_mode"
android:icon="@drawable/ic_color_lens_black_24px" />
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>