From f78eeced2a24d869e514330467395b0471fb2adc Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 24 Nov 2021 23:53:08 +0100
Subject: improve settings list entry layouts

---
 app/src/main/res/values/attrs.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d3a88b81..5631e3f3 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,15 +8,18 @@
     <attr name="text" format="string|reference"/>
     <attr name="icon" format="reference"/>
     <attr name="subtitle" format="string|reference"/>
+    <attr name="singleLine" format="boolean"/>
     <declare-styleable name="IconSwitchEntry">
         <attr name="text"/>
         <attr name="subtitle" />
         <attr name="icon"/>
+        <attr name="singleLine"/>
     </declare-styleable>
 
     <declare-styleable name="IconTextEntry">
         <attr name="text"/>
         <attr name="subtitle" />
         <attr name="icon"/>
+        <attr name="singleLine"/>
     </declare-styleable>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 6fb2050aaf6e992bf96d41c5f6b19f5c1a3771c3 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 25 Nov 2021 01:54:18 +0100
Subject: implement separate settings fragment

---
 app/src/main/res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d62cc3b..c49a456e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,6 +112,7 @@
   <string name="require_root">Requires root permissions</string>
   <string name="show_experimental">Show experimental features</string>
   <string name="hide_experimental">Hide experimental features</string>
+  <string name="experimental_features">Experimental features</string>
   <string name="tethering_enabled_message">Please make sure to enable tethering in the <![CDATA[<b>system settings</b>]]> first.</string>
   <string name="tethering_message">Share your VPN with other devices via:</string>
   <string name="tethering_wifi">Wi-Fi hotspot</string>
@@ -183,5 +184,9 @@
   <string name="retry_unobfuscated">Retry unobfuscated</string>
   <string name="hide_connection_details">Hide connection details</string>
   <string name="error_network_connection">%s has no internet connection. Please check your WiFi and cellular data settings.</string>
+  <string name="censorship_circumvention">Censorship circumvention</string>
+  <string name="use_snowflake">Use Snowflake</string>
+  <string name="snowflake_description">Circumvent blocking of the provider\'s configuration server.</string>
+  <string name="vpn_settings">VPN settings</string>
 
 </resources>
-- 
cgit v1.2.3