Merge branch 'update_AboutActivity' into 'master'

Update about activity

See merge request leap/bitmask_android!169

1 files changed, 63 insertions, 14 deletions

diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index e018c8fc..f2432e04 100644
--- a/app/src/main/res/layout-xlarge/f_about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
@@ -169,7 +169,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/mbetTLS"
+            android:text="@string/asio"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -177,8 +177,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:autoLink="web"
-            android:text="@string/copyright_mbetTLS" />
+            android:text="@string/copyright_asio" />
 
         <Space
             android:layout_width="match_parent"
@@ -187,7 +186,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/asio"
+            android:text="@string/shapeshifter_library"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -195,7 +194,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:text="@string/copyright_asio" />
+            android:text="@string/copyright_shapeshifter_library" />
 
         <Space
             android:layout_width="match_parent"
@@ -204,7 +203,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/openvpn3"
+            android:text="@string/obfs4"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -212,7 +211,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:text="@string/copyright_openvpn3" />
+            android:text="@string/copyright_obfs4" />
 
         <Space
             android:layout_width="match_parent"
@@ -221,7 +220,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_library"
+            android:text="@string/shapeshifter_transports"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -229,7 +228,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:text="@string/copyright_shapeshifter_library" />
+            android:text="@string/copyright_shapeshifter_transports" />
 
         <Space
             android:layout_width="match_parent"
@@ -238,7 +237,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_dispatcher"
+            android:text="@string/circleImageView"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -246,7 +245,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:text="@string/copyright_shapeshifter_dispatcher" />
+            android:text="@string/copyright_circleImageView" />
 
         <Space
             android:layout_width="match_parent"
@@ -255,7 +254,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_transports"
+            android:text="@string/tor_android"
             android:textSize="24sp"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -263,7 +262,57 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:text="@string/copyright_shapeshifter_transports" />
-    </LinearLayout>
+            android:text="@string/copyright_tor_android" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/tor"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_tor" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/iptproxy"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_iptproxy" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/snowflake"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_snowflake" />
+    </LinearLayout>
 </ScrollView>