X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fabout_tab_version.xml;h=ac900a5dcc286e3958e46aedcaf843f9afa9947c;hb=06f516f2f5c745981e292451d01b9df7d1fd57eb;hp=172d74d40fa6c91eb92d574cccf111407d595599;hpb=0fb7991532a1633a4377b27b1704fa525d35aa87;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml
index 172d74d4..ac900a5d 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,15 +37,17 @@
             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: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"
@@ -53,20 +56,21 @@
                 android:text="@string/privacy_browser"
                 android:textStyle="bold"
                 android:textSize="22sp"
-                android:textColor="@color/blue_900"
+                android:textColor="?attr/aboutTitle"
+                android:paddingTop="12dp"
                 android:layout_toEndOf="@id/about_version_icon" />
 
             <TextView
                 android:id="@+id/about_version_number"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:textColor="@color/blue_700"
+                android:textColor="?attr/aboutText"
                 android:layout_below="@id/about_version_privacy_browser_textview"
                 android:layout_toEndOf="@id/about_version_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`.
-          Although we don't need it, we have to include `android:paddingEnd` to make lint happy. -->
+             Although we don't need it, we have to include `android:paddingEnd` to make lint happy. -->
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
@@ -82,7 +86,7 @@
                 android:text="@string/hardware"
                 android:textStyle="bold"
                 android:textSize="18sp"
-                android:textColor="@color/blue_900" />
+                android:textColor="?attr/aboutTitle" />
 
             <TextView
                 android:id="@+id/about_version_brand"
@@ -121,7 +125,7 @@
                 android:text="@string/software"
                 android:textStyle="bold"
                 android:textSize="18sp"
-                android:textColor="@color/blue_900"
+                android:textColor="?attr/aboutTitle"
                 android:paddingTop="12dp" />
 
             <TextView
@@ -130,12 +134,12 @@
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_build"
+                android:id="@+id/about_version_securitypatch"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
             <TextView
-                android:id="@+id/about_version_securitypatch"
+                android:id="@+id/about_version_build"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content" />
 
@@ -154,6 +158,41 @@
                 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/about_version_easylist"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_easyprivacy"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_fanboy-annoyance"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_fanboy-social"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_ultraprivacy"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
             <!-- Package Signature. -->
             <TextView
                 android:layout_height="wrap_content"
@@ -161,7 +200,7 @@
                 android:text="@string/package_signature"
                 android:textStyle="bold"
                 android:textSize="18sp"
-                android:textColor="@color/blue_900"
+                android:textColor="?attr/aboutTitle"
                 android:paddingTop="12dp" />
 
             <TextView