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

Added some strings and started to integrate settingsActivity into the app

Browse source
This commit is contained in:
vanitasvitae 2016-06-11 00:28:26 +02:00
parent ec922f139f
commit 8996d4a73a
5 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/res/values/strings-preferences.xml
View file

@ -12,10 +12,11 @@
<item>Large</item>
<item>Huge</item>
</array>
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<array name="pref_entry_values_font_size" translatable="false">
<item>normal</item>
<item>big</item>
<item>huge</item>
<item>s8</item>
<item>s16</item>
<item>s20</item>
</array>
<!-- Mobile/Desktop view -->
<string name="pref_title_desktop_view">Desktop mode</string>
@ -23,10 +24,11 @@
<!-- Load images -->
<string name="pref_title_load_images">Load images</string>
<string name="pref_desc_load_images">You can disable image loading to safe mobile data</string>
<string name="pref_desc_load_images">Disable image loading to safe mobile data</string>
<!-- Proxy -->
<string name="pref_title_proxy_enabled">Enable Proxy</string>
<string name="pref_desc_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
<string name="pref_title_proxy_host">Host</string>
<string name="pref_title_proxy_port">Port</string>

5
app/src/main/res/xml/preferences.xml
View file

@ -6,6 +6,7 @@
<ListPreference
android:title="@string/pref_title_font_size"
android:key="pref_key_font_size"
android:summary="%s"
android:dialogTitle="@string/pref_title_font_size"
android:entries="@array/pref_entries_font_size"
android:entryValues="@array/pref_entry_values_font_size" />
@ -28,11 +29,13 @@
<CheckBoxPreference
android:title="@string/pref_title_proxy_enabled"
android:key="pref_key_proxy_enabled"
android:summary="@string/pref_desc_proxy_enabled"
android:defaultValue="false" />
<EditTextPreference
android:title="@string/pref_title_proxy_host"
android:key="pref_key_proxy_host"
android:dependency="pref_key_proxy_enabled" />
android:dependency="pref_key_proxy_enabled"
android:inputType="textNoSuggestions"/>
<EditTextPreference
android:title="@string/pref_title_proxy_port"
android:key="pref_key_proxy_port"