From c3093cb4cca98c981ea8861343471aee8c635f24 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Sun, 18 Jun 2023 14:01:26 +0200
Subject: [PATCH] Updater: Align with Settings / Materialize

* Better integrate with Settings by changing the background
  so it matches the Toolbar - one solid background
* Make updates distinct cards with rounded border and
  add spacing between them

Change-Id: If9c649f63e9bb3762f2ae272c96f5e62e0821e46
---
 .../res/layout-television/activity_updates.xml   | 11 ++++++-----
 .../res/layout-television/update_item_view.xml   |  7 +++++--
 app/src/main/res/layout/activity_updates.xml     | 16 +++++++++++-----
 app/src/main/res/layout/update_item_view.xml     | 14 +++++++++-----
 app/src/main/res/values-night/colors.xml         |  2 +-
 app/src/main/res/values/colors.xml               |  2 +-
 6 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/layout-television/activity_updates.xml b/app/src/main/res/layout-television/activity_updates.xml
index f14a803..c795ced 100644
--- a/app/src/main/res/layout-television/activity_updates.xml
+++ b/app/src/main/res/layout-television/activity_updates.xml
@@ -31,7 +31,7 @@
                 android:paddingBottom="16dp"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="56sp"
-                tools:text="LineageOS\n18.1" />
+                tools:text="LineageOS\n20" />
 
             <TextView
                 android:id="@+id/header_build_version"
@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="14sp"
-                tools:text="Android 11"/>
+                tools:text="Android 13"/>
 
             <TextView
                 android:id="@+id/header_build_date"
@@ -47,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="14sp"
-                tools:text="2022-01-01"/>
+                tools:text="1970-01-01"/>
 
             <TextView
                 android:id="@+id/header_last_check"
@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="14sp"
-                tools:text="Last checked: 2022-01-01"/>
+                tools:text="Last checked: 1970-01-01"/>
 
         </LinearLayout>
         <LinearLayout
@@ -116,7 +116,8 @@
             android:clipToPadding="false"
             android:paddingBottom="5dp"
             android:scrollbars="vertical"
-            android:layout_gravity="end" />
+            android:layout_gravity="end"
+            tools:listitem="@layout/update_item_view"/>
 
         <ProgressBar
             android:id="@+id/refresh_progress"
diff --git a/app/src/main/res/layout-television/update_item_view.xml b/app/src/main/res/layout-television/update_item_view.xml
index c6898f2..c307737 100644
--- a/app/src/main/res/layout-television/update_item_view.xml
+++ b/app/src/main/res/layout-television/update_item_view.xml
@@ -8,8 +8,11 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:nextFocusRight="@+id/update_action"
+    android:layout_marginTop="8dp"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
     app:cardBackgroundColor="@color/tv_card_background"
-    app:cardCornerRadius="0dp"
+    app:cardCornerRadius="16dp"
     app:contentPadding="16dp">
 
     <LinearLayout
@@ -82,7 +85,7 @@
                     android:ellipsize="marquee"
                     android:singleLine="true"
                     android:visibility="invisible"
-                    tools:text="162 of 300 MB (3 minutes left)"
+                    tools:text="162 of 1.1GB (3 minutes left)"
                     tools:visibility="visible" />
 
                 <TextView
diff --git a/app/src/main/res/layout/activity_updates.xml b/app/src/main/res/layout/activity_updates.xml
index 4651a7e..824f7a7 100644
--- a/app/src/main/res/layout/activity_updates.xml
+++ b/app/src/main/res/layout/activity_updates.xml
@@ -2,6 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -53,7 +54,8 @@
                     android:fontFamily="sans-serif-light"
                     android:paddingBottom="16dp"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="56sp" />
+                    android:textSize="56sp"
+                    tools:text="LineageOS\n20"/>
 
                 <TextView
                     android:id="@+id/header_build_version"
@@ -61,7 +63,8 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/header_title"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    tools:text="Android 13"/>
 
                 <TextView
                     android:id="@+id/header_build_date"
@@ -69,7 +72,8 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/header_build_version"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    tools:text="1970-01-01"/>
 
                 <TextView
                     android:id="@+id/header_last_check"
@@ -78,7 +82,8 @@
                     android:layout_below="@id/header_build_date"
                     android:layout_marginTop="8dp"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"
+                    tools:text="Last checked: 1970-01-01"/>
             </RelativeLayout>
 
             <androidx.appcompat.widget.Toolbar
@@ -113,5 +118,6 @@
         android:clipToPadding="false"
         android:paddingBottom="5dp"
         android:scrollbars="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/update_item_view" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/update_item_view.xml b/app/src/main/res/layout/update_item_view.xml
index c778334..7198c37 100644
--- a/app/src/main/res/layout/update_item_view.xml
+++ b/app/src/main/res/layout/update_item_view.xml
@@ -8,7 +8,10 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:nextFocusRight="@+id/update_action"
-    app:cardCornerRadius="0dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    app:cardCornerRadius="16dp"
     app:contentPadding="16dp">
 
     <LinearLayout
@@ -34,7 +37,7 @@
                 android:paddingBottom="8sp"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textSize="16sp"
-                tools:text="LineageOS 15.1" />
+                tools:text="LineageOS 20" />
 
             <TextView
                 android:id="@+id/build_date"
@@ -42,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:maxLines="1"
                 android:textSize="14sp"
-                tools:text="29 February 2018" />
+                tools:text="18 June 2023" />
 
             <RelativeLayout
                 android:layout_width="wrap_content"
@@ -81,7 +84,7 @@
                     android:ellipsize="marquee"
                     android:singleLine="true"
                     android:visibility="invisible"
-                    tools:text="162 of 300 MB (3 minutes left)"
+                    tools:text="162 of 1.1 GB (3 minutes left)"
                     tools:visibility="visible" />
 
                 <TextView
@@ -90,7 +93,7 @@
                     android:layout_height="wrap_content"
                     android:paddingTop="8sp"
                     android:singleLine="true"
-                    tools:text="300 MB"
+                    tools:text="1.1 GB"
                     tools:visibility="invisible" />
             </RelativeLayout>
         </LinearLayout>
@@ -110,6 +113,7 @@
             <Button
                 android:id="@id/update_action"
                 style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:background="?android:selectableItemBackgroundBorderless"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="8dp"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 21b0fdc..c8a4842 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -3,7 +3,7 @@
     <color name="theme_primary">#212121</color>
     <color name="theme_primary_dark">#1c1c1c</color>
     <color name="theme_accent">@*android:color/accent_device_default_dark</color>
-    <color name="background">@*android:color/system_neutral1_800</color>
+    <color name="background">@android:color/system_neutral1_900</color>
     <color name="toolbar_collapsed">@android:color/system_neutral1_700</color>
 
     <color name="inverted">#f5f5f5</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a7add88..3f37f9c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
     <color name="theme_primary">#f5f5f5</color>
     <color name="theme_primary_dark">#e0e0e0</color>
     <color name="theme_accent">@*android:color/accent_device_default_light</color>
-    <color name="background">@*android:color/system_neutral1_0</color>
+    <color name="background">@android:color/system_neutral1_50</color>
     <color name="toolbar_collapsed">@android:color/system_neutral1_100</color>
     <color name="tv_background">#FF0E0E0F</color>
     <color name="tv_card_background">#222222</color>