From ad2cb4c6150dee1b002c0fdf4e27fc955c7b9329 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Tue, 2 Aug 2016 21:32:42 +0200 Subject: [PATCH] Merge preferences from AppSettings and SettingsActivy/preferences.xml --- app/src/main/AndroidManifest.xml | 2 +- .../activity/MainActivity.java | 10 +- .../activity/SettingsActivity.java | 44 +++++--- .../diaspora_android/data/AppSettings.java | 106 +++++++++--------- .../res/values-de/strings-preferences.xml | 46 ++++---- app/src/main/res/values-de/strings.xml | 4 - .../res/values-fr/strings-preferences.xml | 40 +++---- .../main/res/values/strings-preferences.xml | 80 +++++++++---- app/src/main/res/values/strings.xml | 2 - app/src/main/res/xml/preferences.xml | 82 +++++++------- 10 files changed, 226 insertions(+), 190 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d83592a3..d7723f2d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -39,7 +39,7 @@ android:name=".activity.SettingsActivity" android:launchMode="singleInstance" android:theme="@style/AppTheme" - android:label="@string/pref_title_personal_settings"> + android:label="@string/pref_title__personal_settings"> - Erscheinungsbild - Netzwerk - Pod Einstellungen + Erscheinungsbild + Netzwerk + Pod Einstellungen - Schriftgröße - + Schriftgröße + Normal Groß Riesig - Lade Bilder - Deaktiviere das Laden von Bildern, um den Datenverbrauch zu verringern + Lade Bilder + Deaktiviere das Laden von Bildern, um den Datenverbrauch zu verringern - Aktiviere Proxy - Nutze einen Proxyserver um Firewalls zu umgehen - Host - Port + Aktiviere Proxy + Nutze einen Proxyserver um Firewalls zu umgehen + Host + Port - Persönliche Einstellungen - Öffne die Einstellungen deines Diaspora Accounts + Persönliche Einstellungen + Öffne die Einstellungen deines Diaspora Accounts - Kontakte - Bearbeite deine Kontaktliste + Kontakte + Bearbeite deine Kontaktliste - Tags verwalten - Verwalte die Liste der Hashtags, denen du folgst + Tags verwalten + Verwalte die Liste der Hashtags, denen du folgst - Account wechseln - Lösche lokale Sitzungsdaten und wechsle zu einem anderen Pod/Account - Das wird alle Cookies und Session-Daten löschen. Willst du wirklich den Account wechseln? + Account wechseln + Lösche lokale Sitzungsdaten und wechsle zu einem anderen Pod/Account + Das wird alle Cookies und Session-Daten löschen. Willst du wirklich den Account wechseln? + + + WebView Cache leeren + Cache leeren + Toolbars intelligent verstecken + Obere und untere Toolbar verstecken während des Scrollens von Inhalt diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0cc381ef..54ccc6d1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -158,9 +158,5 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br Mobil-/Desktopansicht umschalten Alle Tags - WebView Cache leeren - Cache leeren - Toolbars intelligent verstecken - Obere und untere Toolbar verstecken während des Scrollens von Inhalt diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml index f10f6f52..544fa9e8 100644 --- a/app/src/main/res/values-fr/strings-preferences.xml +++ b/app/src/main/res/values-fr/strings-preferences.xml @@ -1,43 +1,43 @@ - Apparance - Paramètres du réseau - Paramètres du pod + Apparance + Paramètres du réseau + Paramètres du pod - Taille de la police - + Taille de la police + Normal Grand Énorme - Charger les images - Disable image loading to safe mobile data + Charger les images + Disable image loading to safe mobile data - Activer Proxy - Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart + Activer Proxy + Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart - Hôte + Hôte - Port + Port - Paramètres personnels - Open your diaspora account settings + Paramètres personnels + Open your diaspora account settings - Contacts - Gérer votre liste des contacts + Contacts + Gérer votre liste des contacts - Gérer les Hashtags - Add and delete the hashtags you are following + Gérer les Hashtags + Add and delete the hashtags you are following - Changer de compte - Erase local session data and switch to another Diaspora pod/account - Cette opération va effacer les cookies et données de session. Voulez-vous vraiment changer de compte/pod? + Changer de compte + Erase local session data and switch to another Diaspora pod/account + Cette opération va effacer les cookies et données de session. Voulez-vous vraiment changer de compte/pod? \ No newline at end of file diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml index 1911b85a..216c0241 100644 --- a/app/src/main/res/values/strings-preferences.xml +++ b/app/src/main/res/values/strings-preferences.xml @@ -1,52 +1,84 @@ - - Appearance - Network - Pod settings + + podDomain + previousPodlist + pref_key_font_size + pref_key_intellihide_toolbars + pref_key_category_pod_settings + pref_key_category_visuals + pref_key_personal_settings + pref_key_manage_tags + pref_key_manage_contacts + pref_key_change_account + pref_key_category_network + pref_key_load_images + pref_key_clear_cache + + pref_key_proxy_enabled + pref_key_proxy_host + pref_key_proxy_port + wasProxyEnabled + + + podUserProfile_avatar + podUserProfile_name + podUserProfile_guid + podUserProfile_aspects + podUserProfile_followedTags + + + + Appearance + Network + Pod settings - Font size - + Font size + Normal Large Huge - + normal large huge - Load images - Disable image loading to safe mobile data + Load images + Disable image loading to safe mobile data - Enable Proxy - Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart + Enable Proxy + Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart - Host + Host - Port + Port - Personal settings - Open your diaspora account settings + Personal settings + Open your diaspora account settings - Contacts - Manage your contact list + Contacts + Manage your contact list - Manage Hashtags - Add and delete the hashtags you are following + Manage Hashtags + Add and delete the hashtags you are following - Change Account - Erase local session data and switch to another Diaspora pod/account - This will erase all cookies and session data. Do you really want to change your account? + Change Account + Erase local session data and switch to another Diaspora pod/account + This will erase all cookies and session data. Do you really want to change your account? - Clear cache - Clear WebView cache + Clear cache + Clear WebView cache + + + Hide top and bottom toolbars automatically while scrolling + Intellihide Toolbars \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4d8f9ef3..343a6a10 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -175,6 +175,4 @@ Warning: Could not set network proxy… All tags - Hide top and bottom toolbars automatically while scrolling - Intellihide Toolbars diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index d59a5fd7..df6eba30 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -2,83 +2,83 @@ + android:key="@string/pref_catkey__category_visuals" + android:title="@string/pref_cat__visuals"> + android:title="@string/pref_title__font_size"/> + android:key="@string/pref_key__intellihide_toolbars" + android:summary="@string/pref_desc__intellihide_toolbars" + android:title="@string/pref_title__intellihide_toolbars"/> + android:key="@string/pref_catkey__pod_settings" + android:title="@string/pref_cat__pod_settings"> + android:key="@string/pref_key__personal_settings" + android:summary="@string/pref_desc__personal_settings" + android:title="@string/pref_title__personal_settings"> + android:key="@string/pref_key__manage_tags" + android:summary="@string/pref_desc__manage_tags" + android:title="@string/pref_title__manage_tags"> + android:key="@string/pref_key__manage_contacts" + android:summary="@string/pref_desc__manage_contacts" + android:title="@string/pref_title__manage_contacts"> + android:key="@string/pref_key__change_account" + android:summary="@string/pref_desc__change_account" + android:title="@string/pref_title__change_account"> + android:key="@string/pref_catkey__network" + android:title="@string/pref_cat__network"> + android:key="@string/pref_key__load_images" + android:summary="@string/pref_desc__load_images" + android:title="@string/pref_title__load_images"/> + android:key="@string/pref_key__clear_cache" + android:summary="@string/pref_desc__clear_cache" + android:title="@string/pref_title__clear_cache"> + android:key="@string/pref_key__proxy_enabled" + android:summary="@string/pref_desc__proxy_enabled" + android:title="@string/pref_title__proxy_enabled"/> + android:key="@string/pref_key__proxy_host" + android:title="@string/pref_title__proxy_host"/> + android:key="@string/pref_key__proxy_port" + android:title="@string/pref_title__proxy_port"/> \ No newline at end of file