From fb327ae35e31ce9fe96dfcf99eff84f42516a5aa Mon Sep 17 00:00:00 2001
From: Albert Vaca Cintora <albertvaka@gmail.com>
Date: Mon, 15 Apr 2024 18:21:49 +0200
Subject: [PATCH] Fixes from code review

---
 res/drawable-v24/ic_launcher_background.xml | 2 +-
 res/drawable/ic_kde_24dp.xml                | 1 -
 res/layout/widget_remotecommandplugin.xml   | 3 +++
 res/values/colors.xml                       | 8 ++++++++
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 res/values/colors.xml

diff --git a/res/drawable-v24/ic_launcher_background.xml b/res/drawable-v24/ic_launcher_background.xml
index 46fa7f3f..a87d81c3 100644
--- a/res/drawable-v24/ic_launcher_background.xml
+++ b/res/drawable-v24/ic_launcher_background.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="108">
   <path
       android:pathData="m0,0h108v108h-108z"
-      android:fillColor="?colorAccent"/>
+      android:fillColor="@color/launcher_background"/>
   <path
       android:pathData="m0,0h108v108h-108z"
       android:strokeAlpha="0.2"
diff --git a/res/drawable/ic_kde_24dp.xml b/res/drawable/ic_kde_24dp.xml
index 65cc8ee0..824308df 100644
--- a/res/drawable/ic_kde_24dp.xml
+++ b/res/drawable/ic_kde_24dp.xml
@@ -2,7 +2,6 @@
     android:viewportWidth="48" android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="?attr/colorControlNormal">
-    >
     <path
         android:fillColor="@android:color/white"
         android:pathData="m26.8172,6.058 l-5.9774,0.5722v24.6133l5.9142,-0.8904v-10.494l7.9499,11.6392 6.2324,-1.972 -8.1405,-11.1935 8.2042,-10.5576 -6.3594,-1.4621 -7.8865,10.5572zM13.2678,12.0558c-0.0675,0.0071 -0.1327,0.0369 -0.1834,0.0877l-2.346,2.3456c-0.0986,0.0989 -0.1172,0.2523 -0.0445,0.3721l2.7467,4.5238c-0.4872,0.819 -0.8776,1.7021 -1.1567,2.6336l-5.0426,1.0489c-0.1403,0.0291 -0.2414,0.1534 -0.2414,0.2973v3.3173c0,0.1403 0.096,0.2618 0.2312,0.2945l4.8943,1.1963c0.261,1.0789 0.6654,2.1016 1.2,3.0416l-2.833,4.32c-0.079,0.1208 -0.0625,0.2798 0.0396,0.3815l2.3452,2.3456c0.0986,0.0984 0.2526,0.1176 0.3729,0.0454l4.4393,-2.6961c0.872,0.5032 1.8124,0.8992 2.8063,1.1677l1.0358,4.98c0.0291,0.1412 0.1539,0.2414 0.2969,0.2414h3.3177c0.1395,0 0.2612,-0.0952 0.2945,-0.232l1.22,-4.9903c1.0246,-0.2765 1.9935,-0.6886 2.8869,-1.2147l4.3747,2.8684c0.1203,0.0792 0.2794,0.0633 0.3815,-0.0387l2.346,-2.3456c0.0992,-0.0992 0.117,-0.2526 0.0441,-0.3721l-1.597,-2.632 -0.5167,0.1634c-0.0753,0.0238 -0.1575,-0.0043 -0.2018,-0.0699 0,0 -1.0186,-1.4912 -2.3342,-3.4167 -1.5727,3.0779 -4.7723,5.1864 -8.4672,5.1864 -5.2496,0 -9.5055,-4.2561 -9.5055,-9.5059 0,-3.8619 2.3035,-7.1832 5.6102,-8.6711v-2.4523c-0.6018,0.2105 -1.1836,0.4644 -1.7362,0.7654 -0.0004,-0.0004 -0.0008,-0.0014 -0.0024,-0.0028l-4.4777,-2.9368c-0.0603,-0.0394 -0.1302,-0.0551 -0.1977,-0.0482z"/>
diff --git a/res/layout/widget_remotecommandplugin.xml b/res/layout/widget_remotecommandplugin.xml
index da5746b0..020d4b42 100644
--- a/res/layout/widget_remotecommandplugin.xml
+++ b/res/layout/widget_remotecommandplugin.xml
@@ -12,6 +12,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
     android:theme="@style/KdeConnectTheme"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
+    android:background="?colorSurface"
     tools:ignore="RtlSymmetry">
 
     <LinearLayout
@@ -28,6 +29,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_kde_24dp"
+            android:tint="?attr/colorOnSecondary"
             android:importantForAccessibility="no"
             tools:ignore="UseAppTint"/> <!-- can't use app:tint in RemoteView -->
 
@@ -39,6 +41,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
             android:text="@string/kde_connect"
             android:fadingEdge="horizontal"
             android:singleLine="true"
+            android:textColor="?attr/colorOnSecondary"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 00000000..ea510ba5
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="launcher_background">#3daee9</color>
+
+    <!-- Whenever possible, don't hardcode colors here and rely on the default ones (eg: from the system or user theme) -->
+
+</resources>