mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
tweak proxy UI (#3322)
* use string 'Saved Proxies' as header for proxy settings 'Connections' is a bit broad, also there is only one connection. 'Saved Proxies' is also what Telegram is using. * move proxy settings in 'Advanced' down logically, this seems to be a better fit. Account/Password is still the most important bit, even if not directly needed in chatmail and Proxy is used more often. * add proxy settings icon to main screen * use 'cable' instead of 'shield'. things are rewired, but not more protected or secured.
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:tint="#FFFFFF"
|
||||
android:viewportHeight="24" android:viewportWidth="24"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M20,5V4c0,-0.55 -0.45,-1 -1,-1h-2c-0.55,0 -1,0.45 -1,1v1h-1v4c0,0.55 0.45,1 1,1h1v7c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2V7c0,-2.21 -1.79,-4 -4,-4S5,4.79 5,7v7H4c-0.55,0 -1,0.45 -1,1v4h1v1c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-1h1v-4c0,-0.55 -0.45,-1 -1,-1H7V7c0,-1.1 0.9,-2 2,-2s2,0.9 2,2v10c0,2.21 1.79,4 4,4s4,-1.79 4,-4v-7h1c0.55,0 1,-0.45 1,-1V5H20z"/>
|
||||
</vector>
|
||||
@@ -5,12 +5,7 @@
|
||||
<item android:title="@string/qr_code"
|
||||
android:id="@+id/menu_qr"
|
||||
android:icon="@drawable/baseline_qr_code_24"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
<item android:title="@string/proxy_settings"
|
||||
android:id="@+id/menu_proxy_settings"
|
||||
android:visible="false"
|
||||
/>
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
<item android:title="@string/invite_friends"
|
||||
android:id="@+id/menu_invite_friends" />
|
||||
@@ -26,6 +21,13 @@
|
||||
android:visible="false"
|
||||
/>
|
||||
|
||||
<item android:title="@string/proxy_settings"
|
||||
android:id="@+id/menu_proxy_settings"
|
||||
android:icon="@drawable/baseline_proxy_24"
|
||||
app:showAsAction="always"
|
||||
android:visible="false"
|
||||
/>
|
||||
|
||||
<item android:title="@string/menu_settings"
|
||||
android:id="@+id/menu_settings" />
|
||||
|
||||
|
||||
@@ -612,7 +612,7 @@
|
||||
<string name="proxy_add_explain">Supported proxy types: HTTP(S), SOCKS5 and Shadowsocks.</string>
|
||||
<string name="proxy_add_url_hint">Enter proxy URL here</string>
|
||||
<string name="proxy_invalid">Invalid or unsupported proxy URL</string>
|
||||
<string name="proxy_list_header">Connections</string>
|
||||
<string name="proxy_list_header">Saved Proxies</string>
|
||||
<string name="proxy_delete">Delete Proxy</string>
|
||||
<string name="proxy_delete_explain">Are you sure you want to delete \"%1$s\"?</string>
|
||||
|
||||
|
||||
@@ -90,12 +90,12 @@
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_server">
|
||||
|
||||
<Preference android:key="proxy_settings_button"
|
||||
android:title="@string/proxy_settings"/>
|
||||
|
||||
<Preference android:key="password_account_settings_button"
|
||||
android:title="@string/pref_password_and_account_settings"/>
|
||||
|
||||
<Preference android:key="proxy_settings_button"
|
||||
android:title="@string/proxy_settings"/>
|
||||
|
||||
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
|
||||
android:defaultValue="true"
|
||||
android:key="pref_sentbox_watch"
|
||||
|
||||
Reference in New Issue
Block a user