From 93442f74d1544a79d06d30ef90b4a92fde497627 Mon Sep 17 00:00:00 2001
From: Mohit <mohit2002ss@gmail.com>
Date: Tue, 8 Jun 2021 21:27:55 +0530
Subject: [PATCH] - Reformatted code - Changed textColor Attribute - Removed
 fixed themes for views - Fixed padding of tabs_toolbar

---
 src/main/res/layout/edit_repository.xml     | 409 ++++++++++----------
 src/main/res/layout/fragment.xml            |  69 ++--
 src/main/res/layout/link_item.xml           |  80 ++--
 src/main/res/layout/permissions_item.xml    |   9 +-
 src/main/res/layout/preference_item.xml     |  68 ++--
 src/main/res/layout/product_header_item.xml | 181 +++++----
 src/main/res/layout/product_item.xml        | 100 +++--
 src/main/res/layout/release_item.xml        | 193 +++++----
 src/main/res/layout/repository_item.xml     |  43 +-
 src/main/res/layout/section_item.xml        |  51 ++-
 src/main/res/layout/switch_item.xml         |  45 ++-
 src/main/res/layout/tabs_toolbar.xml        |  94 +++--
 src/main/res/layout/title_text_item.xml     |  41 +-
 13 files changed, 681 insertions(+), 702 deletions(-)

diff --git a/src/main/res/layout/edit_repository.xml b/src/main/res/layout/edit_repository.xml
index 218f6e34..0e91af87 100644
--- a/src/main/res/layout/edit_repository.xml
+++ b/src/main/res/layout/edit_repository.xml
@@ -1,218 +1,217 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:animateLayoutChanges="true">
-
-  <ScrollView
-    android:id="@android:id/list"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true">
+    android:animateLayoutChanges="true">
+
+    <ScrollView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingStart="12dp"
+            android:paddingTop="4dp"
+            android:paddingEnd="12dp"
+            android:paddingBottom="12dp">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="-12dp"
+                android:text="@string/address"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="12sp" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText
+                    android:id="@+id/address"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="https://"
+                    android:inputType="textUri"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:textSize="16sp"
+                    tools:ignore="Autofill,HardcodedText" />
+
+                <ImageView
+                    android:id="@+id/address_mirror"
+                    android:layout_width="36dp"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="end"
+                    android:background="?android:attr/actionBarItemBackground"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_arrow_down"
+                    android:tint="?android:attr/textColorSecondary"
+                    android:tintMode="src_in"
+                    android:visibility="gone"
+                    tools:ignore="ContentDescription" />
+
+            </FrameLayout>
+
+            <TextView
+                android:id="@+id/address_error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="-2dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="4dp"
+                android:textColor="?attr/colorError"
+                android:textSize="12sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="-12dp"
+                android:text="@string/fingerprint"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="12sp" />
+
+            <EditText
+                android:id="@+id/fingerprint"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="monospace"
+                android:gravity="top"
+                android:inputType="textNoSuggestions|textMultiLine"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:textSize="16sp"
+                tools:ignore="Autofill,LabelFor" />
+
+            <TextView
+                android:id="@+id/fingerprint_error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="-2dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="4dp"
+                android:textColor="?attr/colorError"
+                android:textSize="12sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="-12dp"
+                android:text="@string/username"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="12sp" />
+
+            <EditText
+                android:id="@+id/username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/username"
+                android:inputType="textNoSuggestions"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:textSize="16sp"
+                tools:ignore="Autofill,LabelFor" />
+
+            <TextView
+                android:id="@+id/username_error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="-2dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="4dp"
+                android:textColor="?attr/colorError"
+                android:textSize="12sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="-12dp"
+                android:text="@string/password"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="12sp" />
+
+            <EditText
+                android:id="@+id/password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/password"
+                android:inputType="textPassword"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:textSize="16sp"
+                tools:ignore="Autofill,LabelFor" />
+
+            <TextView
+                android:id="@+id/password_error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="-2dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="4dp"
+                android:textColor="?attr/colorError"
+                android:textSize="12sp"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+    </ScrollView>
 
     <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:paddingTop="4dp"
-      android:paddingStart="12dp"
-      android:paddingEnd="12dp"
-      android:paddingBottom="12dp">
-
-      <TextView
+        android:id="@+id/overlay"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="-12dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        android:text="@string/address" />
+        android:layout_height="match_parent"
+        android:background="?android:attr/colorBackground"
+        android:clickable="true"
+        android:gravity="center"
+        android:orientation="vertical"
+        tools:ignore="KeyboardInaccessibleWidget">
 
-      <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        <ProgressBar
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content" />
 
-        <EditText
-          android:id="@+id/address"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="16dp"
-          android:paddingBottom="16dp"
-          android:textSize="16sp"
-          android:inputType="textUri"
-          android:hint="https://"
-          tools:ignore="Autofill,HardcodedText" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:fontFamily="sans-serif-light"
+            android:text="@string/checking_repository"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="20sp" />
 
-        <ImageView
-          android:id="@+id/address_mirror"
-          android:layout_width="36dp"
-          android:layout_height="match_parent"
-          android:layout_gravity="end"
-          android:scaleType="center"
-          android:src="@drawable/ic_arrow_down"
-          android:tint="?android:attr/textColorSecondary"
-          android:tintMode="src_in"
-          android:background="?android:attr/actionBarItemBackground"
-          android:visibility="gone"
-          tools:ignore="ContentDescription" />
-
-      </FrameLayout>
-
-      <TextView
-        android:id="@+id/address_error"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-2dp"
-        android:layout_marginBottom="4dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:textColor="?attr/colorError"
-        android:textSize="12sp"
-        android:visibility="gone" />
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="-12dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        android:text="@string/fingerprint" />
-
-      <EditText
-        android:id="@+id/fingerprint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:gravity="top"
-        android:fontFamily="monospace"
-        android:textSize="16sp"
-        android:inputType="textNoSuggestions|textMultiLine"
-        tools:ignore="Autofill,LabelFor" />
-
-      <TextView
-        android:id="@+id/fingerprint_error"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-2dp"
-        android:layout_marginBottom="4dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:textColor="?attr/colorError"
-        android:textSize="12sp"
-        android:visibility="gone" />
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="-12dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        android:text="@string/username" />
-
-      <EditText
-        android:id="@+id/username"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:textSize="16sp"
-        android:inputType="textNoSuggestions"
-        android:hint="@string/username"
-        tools:ignore="Autofill,LabelFor" />
-
-      <TextView
-        android:id="@+id/username_error"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-2dp"
-        android:layout_marginBottom="4dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:textColor="?attr/colorError"
-        android:textSize="12sp"
-        android:visibility="gone" />
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="-12dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        android:text="@string/password" />
-
-      <EditText
-        android:id="@+id/password"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:textSize="16sp"
-        android:inputType="textPassword"
-        android:hint="@string/password"
-        tools:ignore="Autofill,LabelFor" />
-
-      <TextView
-        android:id="@+id/password_error"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-2dp"
-        android:layout_marginBottom="4dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:textColor="?attr/colorError"
-        android:textSize="12sp"
-        android:visibility="gone" />
+        <Button
+            android:id="@+id/skip"
+            style="@android:style/Widget.Material.Button.Borderless.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="@string/skip" />
 
     </LinearLayout>
 
-  </ScrollView>
-
-  <LinearLayout
-    android:id="@+id/overlay"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center"
-    android:background="?android:attr/colorBackground"
-    android:clickable="true"
-    tools:ignore="KeyboardInaccessibleWidget">
-
-    <ProgressBar
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content" />
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="16dp"
-      android:fontFamily="sans-serif-light"
-      android:textColor="?android:attr/textColorPrimary"
-      android:textSize="20sp"
-      android:text="@string/checking_repository" />
-
-    <Button
-      android:id="@+id/skip"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="4dp"
-      style="@android:style/Widget.Material.Button.Borderless.Colored"
-      android:text="@string/skip" />
-
-  </LinearLayout>
-
 </FrameLayout>
diff --git a/src/main/res/layout/fragment.xml b/src/main/res/layout/fragment.xml
index cb6a1f04..cd92f885 100644
--- a/src/main/res/layout/fragment.xml
+++ b/src/main/res/layout/fragment.xml
@@ -1,42 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--AppBar-->
-<com.looker.droidify.widget.FragmentLinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:elevation="0dp"
-  android:orientation="vertical">
-
-  <LinearLayout
+<?xml version="1.0" encoding="UTF-8"?><!--AppBar-->
+<com.looker.droidify.widget.FragmentLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:theme="?android:attr/actionBarTheme"
-    android:background="?android:attr/colorPrimaryDark"
-    android:elevation="0dp">
+    android:layout_height="match_parent"
+    android:elevation="0dp"
+    android:orientation="vertical">
 
-    <com.looker.droidify.widget.Toolbar
-      android:id="@+id/toolbar"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:popupTheme="@style/Theme.Main.Toolbar.Popup"
-      android:layout_margin="10dp"
-      android:background="@drawable/background_border"
-      android:theme="@style/Theme.Main.Light"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/colorBackground"
+        android:elevation="0dp"
+        android:orientation="vertical">
+
+        <com.looker.droidify.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:background="@drawable/background_border" />
+
+        <FrameLayout
+            android:id="@+id/toolbar_extra"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="10dp" />
+
+    </LinearLayout>
 
     <FrameLayout
-      android:id="@+id/toolbar_extra"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:theme="@style/Theme.Main.Light"/>
-
-  </LinearLayout>
-
-  <FrameLayout
-    android:id="@+id/fragment_content"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:background="?android:attr/colorBackground" />
+        android:id="@+id/fragment_content"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingHorizontal="10dp"
+        android:paddingTop="10dp"
+        android:layout_weight="1"
+        android:background="?android:attr/colorBackground" />
 
 </com.looker.droidify.widget.FragmentLinearLayout>
diff --git a/src/main/res/layout/link_item.xml b/src/main/res/layout/link_item.xml
index 65a69bc0..76ce77fb 100644
--- a/src/main/res/layout/link_item.xml
+++ b/src/main/res/layout/link_item.xml
@@ -1,48 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="horizontal"
-  android:paddingStart="16dp"
-  android:paddingEnd="16dp"
-  android:background="?android:attr/selectableItemBackground">
-
-  <ImageView
-    android:id="@+id/icon"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
-    android:scaleType="centerInside"
-    android:tint="?android:attr/textColor"
-    android:tintMode="src_in"
-    tools:ignore="ContentDescription" />
-
-  <LinearLayout
-    android:layout_width="0dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:orientation="vertical"
-    android:layout_marginStart="32dp"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp">
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="horizontal"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
 
-    <TextView
-      android:id="@+id/text"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="?android:attr/textColor"
-      android:textSize="16sp"
-      android:singleLine="true" />
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center"
+        android:scaleType="centerInside"
+        android:tint="?android:attr/textColor"
+        android:tintMode="src_in"
+        tools:ignore="ContentDescription" />
 
-    <TextView
-      android:id="@+id/link"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="?android:attr/textColor"
-      android:textSize="14sp"
-      android:singleLine="true" />
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:padding="16dp">
 
-  </LinearLayout>
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColor"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/link"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColor"
+            android:textSize="14sp" />
+
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/src/main/res/layout/permissions_item.xml b/src/main/res/layout/permissions_item.xml
index 66749de1..c1ee7b72 100644
--- a/src/main/res/layout/permissions_item.xml
+++ b/src/main/res/layout/permissions_item.xml
@@ -14,7 +14,8 @@
     android:layout_width="24dp"
     android:layout_height="24dp"
     android:scaleType="centerInside"
-    android:tint="?android:attr/textColorSecondary"
+      android:layout_gravity="center"
+      android:tint="?android:attr/textColorSecondary"
     android:tintMode="src_in"
     tools:ignore="ContentDescription" />
 
@@ -25,8 +26,8 @@
     android:layout_weight="1"
     android:layout_marginStart="32dp"
     android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textSize="16sp" />
+      android:paddingBottom="16dp"
+      android:textColor="?android:attr/textColor"
+      android:textSize="16sp" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/preference_item.xml b/src/main/res/layout/preference_item.xml
index 65befd68..a6ca8dbb 100644
--- a/src/main/res/layout/preference_item.xml
+++ b/src/main/res/layout/preference_item.xml
@@ -1,43 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="horizontal"
-  android:background="?android:attr/selectableItemBackground">
-
-  <LinearLayout
-    android:layout_width="0dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:orientation="vertical"
-    android:padding="16dp">
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="horizontal">
 
-    <TextView
-      android:id="@+id/title"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="?android:attr/textColor"
-      android:textSize="16sp"
-      android:singleLine="true" />
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:padding="16dp">
 
-    <TextView
-      android:id="@+id/summary"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="?android:attr/textColor"
-      android:textSize="14sp" />
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColor"
+            android:textSize="16sp" />
 
-  </LinearLayout>
+        <TextView
+            android:id="@+id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColor"
+            android:textSize="14sp" />
 
-  <Switch
-    android:id="@+id/check"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:layout_marginStart="-16dp"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:clickable="false"
-    android:visibility="gone" />
+    </LinearLayout>
+
+    <Switch
+        android:id="@+id/check"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginStart="-16dp"
+        android:clickable="false"
+        android:paddingHorizontal="12dp"
+        android:visibility="gone" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/product_header_item.xml b/src/main/res/layout/product_header_item.xml
index a575c1da..95b3f7f3 100644
--- a/src/main/res/layout/product_header_item.xml
+++ b/src/main/res/layout/product_header_item.xml
@@ -1,101 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical"
-  android:paddingTop="12dp"
-  android:paddingBottom="4dp"
-  android:paddingStart="12dp"
-  android:paddingEnd="12dp">
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingBottom="8dp">
-
-    <ImageView
-      android:id="@+id/icon"
-      android:layout_width="64dp"
-      android:layout_height="64dp"
-      android:layout_marginStart="1.667dp"
-      android:layout_marginEnd="1.667dp"
-      tools:ignore="ContentDescription" />
-
-    <LinearLayout
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:orientation="vertical"
-      android:layout_marginStart="12dp">
-
-      <TextView
-        android:id="@+id/name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif-medium"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="16sp"
-        android:singleLine="true" />
-
-      <TextView
-        android:id="@+id/package_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="14sp"
-        android:singleLine="true" />
-
-      <TextView
-        android:id="@+id/version"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="2sp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        android:singleLine="true" />
-
-    </LinearLayout>
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:id="@+id/status_layout"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:paddingStart="4dp"
-    android:paddingEnd="4dp">
+    android:paddingStart="12dp"
+    android:paddingTop="12dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="4dp">
 
-    <TextView
-      android:id="@+id/status"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:textColor="?android:attr/textColorSecondary"
-      android:textSize="12sp"
-      android:singleLine="true" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingBottom="8dp">
 
-    <ProgressBar
-      android:id="@+id/progress"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:layout_marginBottom="2dp"
-      style="@android:style/Widget.Material.ProgressBar.Horizontal"
-      android:indeterminateTint="?android:attr/colorPrimary"  />
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginStart="1.667dp"
+            android:layout_marginEnd="1.667dp"
+            tools:ignore="ContentDescription" />
 
-  </LinearLayout>
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
 
-  <Button
-      android:id="@+id/action"
-      android:background="@drawable/background_border"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="bottom"/>
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:singleLine="true"
+                android:textColor="?android:attr/textColor"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/package_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textColor="?android:attr/textColor"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="2sp"
+                android:singleLine="true"
+                android:textColor="?attr/subTextColor"
+                android:textSize="12sp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/status_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:paddingBottom="4dp">
+
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp" />
+
+        <ProgressBar
+            android:id="@+id/progress"
+            style="@android:style/Widget.Material.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginBottom="2dp"
+            android:indeterminateTint="?android:attr/colorPrimary" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/action"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="@drawable/background_border" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/product_item.xml b/src/main/res/layout/product_item.xml
index 75c91137..5728b913 100644
--- a/src/main/res/layout/product_item.xml
+++ b/src/main/res/layout/product_item.xml
@@ -1,61 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="horizontal"
-  android:layout_width="match_parent"
-  android:layout_height="72dp"
-  android:paddingStart="14dp"
-  android:paddingEnd="16dp"
-  android:gravity="center_vertical"
-  android:background="?android:attr/selectableItemBackground">
-
-  <ImageView
-    android:id="@+id/icon"
-    android:layout_width="44dp"
-    android:layout_height="44dp"
-    android:scaleType="centerInside"
-    tools:ignore="ContentDescription" />
-
-  <LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"
-    android:layout_marginStart="14dp"
-    android:orientation="vertical">
+    android:layout_height="72dp"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="14dp"
+    android:paddingEnd="16dp">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        tools:ignore="ContentDescription" />
 
     <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:gravity="center_vertical"
-      android:orientation="horizontal">
-
-      <TextView
-        android:id="@+id/name"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:textColor="?android:attr/textColor"
-        android:textSize="16sp"
-        android:singleLine="true" />
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="14dp"
+        android:orientation="vertical">
 
-      <TextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxWidth="70dp"
-        android:singleLine="true"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:singleLine="true"
+                android:textColor="?android:attr/textColor"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxWidth="70dp"
+                android:singleLine="true" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColor"
+            android:textSize="14sp" />
 
     </LinearLayout>
 
-    <TextView
-      android:id="@+id/summary"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="?android:attr/textColor"
-      android:textSize="14sp"
-      android:singleLine="true" />
-
-  </LinearLayout>
-
 </LinearLayout>
diff --git a/src/main/res/layout/release_item.xml b/src/main/res/layout/release_item.xml
index 4d5c4b7d..5210cace 100644
--- a/src/main/res/layout/release_item.xml
+++ b/src/main/res/layout/release_item.xml
@@ -1,114 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical"
-  android:gravity="center_vertical"
-  android:baselineAligned="false"
-  android:padding="16dp"
-  android:background="?android:attr/selectableItemBackground">
-
-  <LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="bottom">
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:orientation="vertical"
+    android:padding="16dp">
 
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1">
-
-      <LinearLayout
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        tools:ignore="UselessParent">
+        android:gravity="bottom"
+        android:orientation="horizontal">
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                tools:ignore="UselessParent">
+
+                <TextView
+                    android:id="@+id/version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:singleLine="true"
+                    android:textColor="?android:attr/textColor"
+                    android:textSize="16sp"
+                    tools:ignore="InefficientWeight" />
+
+                <TextView
+                    android:id="@+id/status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="1dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="4dp"
+                    android:paddingTop="1dp"
+                    android:paddingEnd="4dp"
+                    android:paddingBottom="1dp"
+                    android:singleLine="true"
+                    android:textAllCaps="true"
+                    android:textColor="?android:attr/colorBackground"
+                    android:textSize="10sp"
+                    tools:ignore="SmallSp" />
+
+            </LinearLayout>
+
+        </FrameLayout>
 
         <TextView
-          android:id="@+id/version"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:textColor="?android:attr/textColorPrimary"
-          android:textSize="16sp"
-          android:singleLine="true"
-          tools:ignore="InefficientWeight" />
+            android:id="@+id/added"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColor"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
         <TextView
-          android:id="@+id/status"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="1dp"
-          android:layout_marginStart="8dp"
-          android:paddingTop="1dp"
-          android:paddingBottom="1dp"
-          android:paddingStart="4dp"
-          android:paddingEnd="4dp"
-          android:fontFamily="sans-serif-medium"
-          android:textColor="?android:attr/colorBackground"
-          android:textSize="10sp"
-          android:textAllCaps="true"
-          android:singleLine="true"
-          tools:ignore="SmallSp" />
+            android:id="@+id/source"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="14sp" />
 
-      </LinearLayout>
+        <TextView
+            android:id="@+id/size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="14sp" />
 
-    </FrameLayout>
+    </LinearLayout>
 
     <TextView
-      android:id="@+id/added"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="16dp"
-      android:textColor="?android:attr/textColorPrimary"
-      android:textSize="14sp"
-      android:singleLine="true" />
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
+        android:id="@+id/signature"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="14sp" />
 
     <TextView
-      android:id="@+id/source"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:textColor="?android:attr/textColorSecondary"
-      android:textSize="14sp"
-      android:singleLine="true" />
-
-    <TextView
-      android:id="@+id/size"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="16dp"
-      android:textColor="?android:attr/textColorSecondary"
-      android:textSize="14sp"
-      android:singleLine="true" />
-
-  </LinearLayout>
-
-  <TextView
-    android:id="@+id/signature"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textColor="?android:attr/textColorSecondary"
-    android:textSize="14sp"
-    android:maxLines="1" />
-
-  <TextView
-    android:id="@+id/compatibility"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textColor="?android:attr/textColorSecondary"
-    android:textSize="14sp"
-    android:singleLine="true" />
+        android:id="@+id/compatibility"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="14sp" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/repository_item.xml b/src/main/res/layout/repository_item.xml
index a2ef6b32..083685e7 100644
--- a/src/main/res/layout/repository_item.xml
+++ b/src/main/res/layout/repository_item.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="54dp"
-  android:orientation="horizontal"
-  android:gravity="center_vertical"
-  android:background="?android:attr/selectableItemBackground">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="54dp"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
-  <TextView
-    android:id="@+id/name"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_marginStart="16dp"
-    android:textColor="?android:attr/textColor"
-    android:textSize="16sp"
-    android:singleLine="true" />
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_weight="1"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColor"
+        android:textSize="16sp" />
 
-  <Switch
-    android:id="@+id/enabled"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp" />
+    <Switch
+        android:id="@+id/enabled"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/section_item.xml b/src/main/res/layout/section_item.xml
index fba17b74..f4aeab9b 100644
--- a/src/main/res/layout/section_item.xml
+++ b/src/main/res/layout/section_item.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="horizontal"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:padding="16dp"
-  android:background="?android:attr/selectableItemBackground">
-
-  <TextView
-    android:id="@+id/title"
-    android:layout_width="0dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:fontFamily="sans-serif-medium"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textSize="14sp"
-    android:singleLine="true" />
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="horizontal"
+    android:padding="16dp">
 
-  <ImageView
-    android:id="@+id/icon"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:scaleType="center"
-    android:src="@drawable/ic_arrow_down"
-    android:tint="?android:attr/textColorPrimary"
-    android:tintMode="src_in"
-    tools:ignore="ContentDescription" />
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:fontFamily="sans-serif-medium"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColor"
+        android:textSize="14sp" />
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:scaleType="center"
+        android:src="@drawable/ic_arrow_down"
+        android:tint="?android:attr/textColor"
+        android:tintMode="src_in"
+        tools:ignore="ContentDescription" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/switch_item.xml b/src/main/res/layout/switch_item.xml
index fecddb38..48b253e1 100644
--- a/src/main/res/layout/switch_item.xml
+++ b/src/main/res/layout/switch_item.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="48dp"
-  android:orientation="horizontal"
-  android:gravity="center_vertical"
-  android:background="?android:attr/selectableItemBackground">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
-  <TextView
-    android:id="@+id/title"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_marginStart="16dp"
-    android:textColor="?android:attr/textColor"
-    android:textSize="16sp"
-    android:singleLine="true" />
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_weight="1"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColor"
+        android:textSize="16sp" />
 
-  <Switch
-    android:id="@+id/enabled"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:clickable="false" />
+    <Switch
+        android:id="@+id/enabled"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:clickable="false"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/tabs_toolbar.xml b/src/main/res/layout/tabs_toolbar.xml
index 3f070162..5891bda6 100644
--- a/src/main/res/layout/tabs_toolbar.xml
+++ b/src/main/res/layout/tabs_toolbar.xml
@@ -1,59 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical"
-  android:layout_marginHorizontal="5dp"
-  android:background="@drawable/background_border">
-
-  <LinearLayout
-    android:id="@+id/tabs"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:orientation="horizontal"
-    android:theme="@style/Theme.Main.Light"/>
-
-  <FrameLayout
-    android:id="@+id/section_layout"
-    android:layout_width="match_parent"
-    android:layout_height="0dp">
+    android:layout_height="wrap_content"
+    android:background="@drawable/background_border"
+    android:orientation="vertical">
 
     <LinearLayout
-      android:id="@+id/section_change"
-      android:layout_width="match_parent"
-      android:layout_height="48dp"
-      android:orientation="horizontal"
-      android:gravity="center_vertical"
-      android:paddingStart="12dp"
-      android:paddingEnd="12dp"
-      android:background="?android:attr/selectableItemBackground"
-      android:theme="@style/Theme.Main.Light"
-      tools:ignore="UselessParent">
+        android:id="@+id/tabs"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:orientation="horizontal" />
 
-      <TextView
-          android:id="@+id/section_name"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:fontFamily="sans-serif-medium"
-          android:gravity="center_vertical"
-          android:paddingStart="10dp"
-          android:paddingEnd="10dp"
-          android:textColor="?android:attr/textColorPrimary"
-          android:textSize="16sp" />
+    <FrameLayout
+        android:id="@+id/section_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp">
 
-      <ImageView
-        android:id="@+id/section_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="12dp"
-        android:src="@drawable/ic_arrow_down"
-        tools:ignore="ContentDescription" />
+        <LinearLayout
+            android:id="@+id/section_change"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            tools:ignore="UselessParent">
 
-    </LinearLayout>
+            <TextView
+                android:id="@+id/section_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center_vertical"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:textColor="?android:attr/textColor"
+                android:textSize="16sp" />
 
-  </FrameLayout>
+            <ImageView
+                android:id="@+id/section_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="12dp"
+                android:src="@drawable/ic_arrow_down"
+                tools:ignore="ContentDescription" />
+
+        </LinearLayout>
+
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/src/main/res/layout/title_text_item.xml b/src/main/res/layout/title_text_item.xml
index cf2057b1..b6b04994 100644
--- a/src/main/res/layout/title_text_item.xml
+++ b/src/main/res/layout/title_text_item.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical"
-  android:paddingTop="8dp"
-  android:paddingBottom="8dp"
-  android:paddingStart="16dp"
-  android:paddingEnd="16dp">
-
-  <TextView
-      android:id="@+id/title"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:textColor="?android:attr/textColor"
-      android:textSize="12sp" />
-
-  <TextView
-    android:id="@+id/text"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="4dp"
-    android:textColor="?android:attr/textColor"
-    android:textSize="16sp" />
+    android:orientation="vertical"
+    android:paddingVertical="8dp"
+    android:paddingHorizontal="16dp">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/textColor"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:textColor="?android:attr/textColor"
+        android:textSize="16sp" />
 
 </LinearLayout>