X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fabout_tab_version.xml;h=1df1ef0de5c236a557859acb3ecb3bcdb29022de;hp=bfaa7f4d9bcc44e7159ab8b19f980642547167ff;hb=ba632a37a66aad3feeac8fcf12afdbe38032049d;hpb=012e5595c82d6e8d0b8a46f1ef18a02a56341182

diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml
index bfaa7f4d..1df1ef0d 100644
--- a/app/src/main/res/layout/about_tab_version.xml
+++ b/app/src/main/res/layout/about_tab_version.xml
@@ -41,7 +41,7 @@
                 `tools:ignore="ContentDescription"` suppresses the lint warning about supplying a content description for the `ImageView`,
                 which isn't needed in this case because the `ImageView` is only decorative. -->
             <ImageView
-                android:id="@+id/about_version_icon"
+                android:id="@+id/icon"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:src="@mipmap/privacy_browser"
@@ -50,7 +50,7 @@
                 tools:ignore="RtlSymmetry,ContentDescription" />
 
             <TextView
-                android:id="@+id/about_version_privacy_browser_textview"
+                android:id="@+id/privacy_browser_textview"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:text="@string/privacy_browser"
@@ -58,15 +58,15 @@
                 android:textSize="22sp"
                 android:textColor="?attr/aboutTitle"
                 android:paddingTop="12dp"
-                android:layout_toEndOf="@id/about_version_icon" />
+                android:layout_toEndOf="@id/icon" />
 
             <TextView
-                android:id="@+id/about_version_number"
+                android:id="@+id/version"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:textColor="?attr/aboutText"
-                android:layout_below="@id/about_version_privacy_browser_textview"
-                android:layout_toEndOf="@id/about_version_icon" />
+                android:layout_below="@id/privacy_browser_textview"
+                android:layout_toEndOf="@id/icon" />
         </RelativeLayout>
 
         <!-- The purpose of this `LinearLayout` is to provide padding on the start of the `TextViews` to make them line up with `about_version_icon`.
@@ -89,32 +89,32 @@
                 android:textColor="?attr/aboutTitle" />
 
             <TextView
-                android:id="@+id/about_version_brand"
+                android:id="@+id/brand"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_manufacturer"
+                android:id="@+id/manufacturer"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_model"
+                android:id="@+id/model"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_device"
+                android:id="@+id/device"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_bootloader"
+                android:id="@+id/bootloader"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_radio"
+                android:id="@+id/radio"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
@@ -129,34 +129,34 @@
                 android:paddingTop="12dp" />
 
             <TextView
-                android:id="@+id/about_version_android"
+                android:id="@+id/android"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_securitypatch"
+                android:id="@+id/security_patch"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_build"
+                android:id="@+id/build"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_webkit"
+                android:id="@+id/webview"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_chrome"
+                android:id="@+id/orbot"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_orbot"
+                android:id="@+id/open_keychain"
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content" />
+                android:layout_width="wrap_content"/>
 
             <!-- Block Lists. -->
             <TextView
@@ -169,22 +169,27 @@
                 android:paddingTop="12dp" />
 
             <TextView
-                android:id="@+id/about_version_easylist"
+                android:id="@+id/easylist"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/easyprivacy"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_easyprivacy"
+                android:id="@+id/fanboy_annoyance"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_fanboy-annoyance"
+                android:id="@+id/fanboy_social"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_fanboy-social"
+                android:id="@+id/ultraprivacy"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
@@ -199,37 +204,37 @@
                 android:paddingTop="12dp" />
 
             <TextView
-                android:id="@+id/about_version_certificate_issuer_dn"
+                android:id="@+id/certificate_issuer_dn"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_certificate_subject_dn"
+                android:id="@+id/certificate_subject_dn"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_certificate_start_date"
+                android:id="@+id/certificate_start_date"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_certificate_end_date"
+                android:id="@+id/certificate_end_date"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_certificate_version"
+                android:id="@+id/certificate_version"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_certificate_serial_number"
+                android:id="@+id/certificate_serial_number"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_certificate_signature_algorithm"
+                android:id="@+id/certificate_signature_algorithm"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
         </LinearLayout>