X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fabout_tab_version.xml;h=df2eccd44c5e1a36f97d52f7b9bce73c2740766e;hp=97a5293fa702f3846ec16249dea816725b477237;hb=3bc1a484194d3cbca03739cbf217dd21dd715f71;hpb=a44d1cbf2fdd6e460d88adcae1b84bff1802813f

diff --git a/app/src/main/res/layout/about_tab_version.xml b/app/src/main/res/layout/about_tab_version.xml
index 97a5293f..df2eccd4 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 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>.
 
@@ -18,302 +18,220 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- The ScrollView allows the LinearLayout to scroll if it exceeds the height of the page. -->
+<!-- The `ScrollView` allows the `LinearLayout` to scroll if it exceeds the height of the page. -->
 <ScrollView
-    android:id="@+id/about_version_scrollview"
     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:id="@+id/about_version_linearlayout"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:orientation="vertical"
         android:padding="16dp" >
 
-        <!-- The RelativeLayout contains the header. -->
+        <!-- The `RelativeLayout` contains the header. -->
         <RelativeLayout
-            android:id="@+id/about_version_relativelayout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            xmlns:tools="http://schemas.android.com/tools" >
+            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_width="wrap_content"
                 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" />
 
-            <!-- We need to include android:layout_toRightOf until API>=17. -->
             <TextView
                 android:id="@+id/about_version_privacy_browser_textview"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
                 android:text="@string/privacy_browser"
                 android:textStyle="bold"
                 android:textSize="22sp"
-                android:textColor="@color/black"
-                android:layout_toEndOf="@id/about_version_icon"
-                android:layout_toRightOf="@id/about_version_icon" />
+                android:textColor="?attr/aboutTitle"
+                android:paddingTop="12dp"
+                android:layout_toEndOf="@id/about_version_icon" />
 
-            <!-- We need to include android:layout_toRightOf until API>=17. -->
             <TextView
-                android:id="@+id/about_version_number_text"
-                android:layout_width="wrap_content"
+                android:id="@+id/about_version_number"
                 android:layout_height="wrap_content"
-                android:textColor="@color/blue"
+                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_toRightOf="@id/about_version_icon" />
+                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.
-          We have to use android:paddingLeft in addition to android:paddingStart until API>=17.
-          Although we don't need them, we have to include android:paddingEnd and android:paddingRight to make lint happy. -->
+        <!-- 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. -->
         <LinearLayout
-            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_width="match_parent"
             android:orientation="vertical"
             android:paddingTop="16dp"
             android:paddingStart="4dp"
-            android:paddingEnd="0dp"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp" >
+            android:paddingEnd="0dp" >
 
             <!-- Hardware. -->
             <TextView
-                android:id="@+id/about_version_hardware"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
                 android:text="@string/hardware"
                 android:textStyle="bold"
                 android:textSize="18sp"
-                android:textColor="@color/dark_blue" />
+                android:textColor="?attr/aboutTitle" />
 
-            <!-- Brand. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_brand_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/brand" />
-
-                <TextView
-                    android:id="@+id/about_version_brand_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
-
-            <!-- Manufacturer. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_manufacturer_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/manufacturer" />
-
-                <TextView
-                    android:id="@+id/about_version_manufacturer_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
-
-            <!-- Model. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
+            <TextView
+                android:id="@+id/about_version_brand"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_model_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/model" />
-
-                <TextView
-                    android:id="@+id/about_version_model_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
-
-            <!-- Device. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_manufacturer"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_device_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/device" />
-
-                <TextView
-                    android:id="@+id/about_version_device_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
-
-            <!-- Bootloader. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_model"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_bootloader_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/bootloader" />
-
-                <TextView
-                    android:id="@+id/about_version_bootloader_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
-
-            <!-- Radio. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_device"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:layout_width="wrap_content" />
 
-                <TextView
-                    android:id="@+id/about_version_radio_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/radio" />
+            <TextView
+                android:id="@+id/about_version_bootloader"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
 
-                <TextView
-                    android:id="@+id/about_version_radio_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
+            <TextView
+                android:id="@+id/about_version_radio"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
 
             <!-- Software. -->
             <TextView
-                android:id="@+id/about_version_software"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
                 android:text="@string/software"
                 android:textStyle="bold"
                 android:textSize="18sp"
-                android:textColor="@color/dark_blue"
+                android:textColor="?attr/aboutTitle"
                 android:paddingTop="12dp" />
 
-            <!-- Android. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
+            <TextView
+                android:id="@+id/about_version_android"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_android_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/android" />
-
-                <TextView
-                    android:id="@+id/about_version_android_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
-
-            <!-- Build. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_securitypatch"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_build_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/build" />
-
-                <TextView
-                    android:id="@+id/about_version_build_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
-
-            <!-- Security Patch. -->
-            <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_build"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_chrome"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_orbot"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <!-- Block Lists. -->
+            <TextView
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_securitypatch_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/security_patch" />
-
-                <TextView
-                    android:id="@+id/about_version_securitypatch_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-                </LinearLayout>
-
-            <!-- WebKit. -->
-            <LinearLayout
                 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"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_webkit_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/webkit" />
-
-                <TextView
-                    android:id="@+id/about_version_webkit_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
-
-            <!-- Chrome. -->
-            <LinearLayout
                 android:layout_width="wrap_content"
+                android:text="@string/package_signature"
+                android:textStyle="bold"
+                android:textSize="18sp"
+                android:textColor="?attr/aboutTitle"
+                android:paddingTop="12dp" />
+
+            <TextView
+                android:id="@+id/about_version_certificate_issuer_dn"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_certificate_subject_dn"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_certificate_start_date"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_certificate_end_date"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_certificate_version"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_certificate_serial_number"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content" />
+
+            <TextView
+                android:id="@+id/about_version_certificate_signature_algorithm"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/about_version_chrome_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/chrome" />
-
-                <TextView
-                    android:id="@+id/about_version_chrome_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/blue" />
-            </LinearLayout>
+                android:layout_width="wrap_content" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file