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=19922b2c6c2569ec3d2b0739d3b1392a0f447f3c;hb=ba632a37a66aad3feeac8fcf12afdbe38032049d;hpb=74857298f431569df1849e8ef91387cb25274095

diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml
index 19922b2c..1df1ef0d 100644
--- a/app/src/main/res/layout/about_tab_version.xml
+++ b/app/src/main/res/layout/about_tab_version.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2018 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -23,7 +23,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    android:background="?attr/aboutBackground" >
 
     <LinearLayout
         android:layout_height="wrap_content"
@@ -36,33 +37,36 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" >
 
-            <!-- `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. -->
+            <!--`tools:ignore="RtlSymmetry"` suppressed the lint warning about adding `android:paddingStart`, which wouldn't work with this layout.
+                `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"
                 android:paddingTop="10dp"
-                tools:ignore="ContentDescription" />
+                android:paddingEnd="5dp"
+                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"
                 android:textStyle="bold"
                 android:textSize="22sp"
                 android:textColor="?attr/aboutTitle"
-                android:layout_toEndOf="@id/about_version_icon" />
+                android:paddingTop="12dp"
+                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`.
@@ -85,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" />
 
@@ -125,32 +129,67 @@
                 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_build"
+                android:id="@+id/security_patch"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_securitypatch"
+                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"/>
+
+            <!-- Block Lists. -->
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/blocklists"
+                android:textStyle="bold"
+                android:textSize="18sp"
+                android:textColor="?attr/aboutTitle"
+                android:paddingTop="12dp" />
+
+            <TextView
+                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/fanboy_annoyance"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/fanboy_social"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/ultraprivacy"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
@@ -165,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>