From 8c2029870f53ecae8834f73d85f6a04ab79f8050 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 22 Sep 2020 19:21:41 +0200
Subject: tv: make logo almost better

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 ui/src/main/res/layout/tv_activity.xml         | 26 +++++++++++++++++++-------
 ui/src/main/res/layout/tv_tunnel_list_item.xml |  4 ++--
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'ui')

diff --git a/ui/src/main/res/layout/tv_activity.xml b/ui/src/main/res/layout/tv_activity.xml
index 1fd708be..62c04076 100644
--- a/ui/src/main/res/layout/tv_activity.xml
+++ b/ui/src/main/res/layout/tv_activity.xml
@@ -26,15 +26,27 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <!-- TODO: Make into a neat square above the selection squares -->
-        <ImageView
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/banner_logo"
-            android:layout_width="240dp"
-            android:layout_height="50dp"
-            android:contentDescription="@string/app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            app:cardElevation="2dp"
+            app:contentPadding="0dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/tv_logo_banner" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:layout_width="320dp"
+                android:layout_height="67dp"
+                android:contentDescription="@string/app_name"
+                android:scaleType="fitXY"
+                app:srcCompat="@drawable/tv_logo_banner" />
+
+        </com.google.android.material.card.MaterialCardView>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/tunnel_list"
diff --git a/ui/src/main/res/layout/tv_tunnel_list_item.xml b/ui/src/main/res/layout/tv_tunnel_list_item.xml
index 00edabc5..f37f4cc6 100644
--- a/ui/src/main/res/layout/tv_tunnel_list_item.xml
+++ b/ui/src/main/res/layout/tv_tunnel_list_item.xml
@@ -26,8 +26,8 @@
 
     <!-- Rather than changing the background tint to red for deleting mode, it should instead just change the selection color -->
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="300dp"
-        android:layout_height="150dp"
+        android:layout_width="280dp"
+        android:layout_height="130dp"
         android:layout_margin="8dp"
         android:backgroundTint="@{isDeleting ? @color/error_tag_color : item.state == State.UP ? @color/secondary_dark_color : @color/tv_card_background}"
         android:checkable="true"
-- 
cgit v1.2.3-59-g8ed1b