update License strings and AboutFragment

1 files changed, 44 insertions, 15 deletions

diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml
index b10cc555..acf686eb 100644
--- a/app/src/main/res/layout/f_about.xml
+++ b/app/src/main/res/layout/f_about.xml
@@ -167,14 +167,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/mbetTLS"
+            android:text="@string/asio"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:autoLink="web"
-            android:text="@string/copyright_mbetTLS" />
+            android:text="@string/copyright_asio" />
 
         <Space
             android:layout_width="match_parent"
@@ -183,13 +182,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/asio"
+            android:text="@string/shapeshifter_library"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_asio" />
+            android:text="@string/copyright_shapeshifter_library" />
 
         <Space
             android:layout_width="match_parent"
@@ -198,13 +197,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/openvpn3"
+            android:text="@string/obfs4"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_openvpn3" />
+            android:text="@string/copyright_obfs4" />
 
         <Space
             android:layout_width="match_parent"
@@ -213,13 +212,13 @@
         <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:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_shapeshifter_library" />
+            android:text="@string/copyright_shapeshifter_transports" />
 
         <Space
             android:layout_width="match_parent"
@@ -228,13 +227,13 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/shapeshifter_dispatcher"
+            android:text="@string/circleImageView"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_shapeshifter_dispatcher" />
+            android:text="@string/copyright_circleImageView" />
 
         <Space
             android:layout_width="match_parent"
@@ -243,13 +242,13 @@
         <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:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_shapeshifter_transports" />
+            android:text="@string/copyright_tor_android" />
 
         <Space
             android:layout_width="match_parent"
@@ -258,13 +257,43 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/circleImageView"
+            android:text="@string/tor"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/copyright_circleImageView" />
+            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:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            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:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_snowflake" />
     </LinearLayout>
 
 </ScrollView>