2
0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-22 09:58:08 +00:00

Remove colors from theme

We had a mix of specific colors and theme-based Material You colors.
This aims to remove any hardcoded color so the app only uses the colors
from the current theme.
This commit is contained in:
Albert Vaca Cintora 2024-04-05 13:38:39 +02:00
parent afb45416b1
commit ffa0049c09
No known key found for this signature in database
24 changed files with 16 additions and 181 deletions

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/primary" android:state_checked="true" />
<item android:drawable="@color/darkStatusBarBackground" android:state_checked="false" />
</selector>

View File

@ -6,7 +6,7 @@
android:viewportHeight="108"> android:viewportHeight="108">
<path <path
android:pathData="m0,0h108v108h-108z" android:pathData="m0,0h108v108h-108z"
android:fillColor="@color/accent"/> android:fillColor="?colorAccent"/>
<path <path
android:pathData="m0,0h108v108h-108z" android:pathData="m0,0h108v108h-108z"
android:strokeAlpha="0.2" android:strokeAlpha="0.2"

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="@color/accent" /> <solid android:color="?colorAccent" />
<corners android:bottomRightRadius="2dip" <corners android:bottomRightRadius="2dip"
android:bottomLeftRadius="2dip" android:bottomLeftRadius="2dip"
android:topRightRadius="2dip" android:topRightRadius="2dip"

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:color="@color/primary" />
<item android:state_enabled="false" android:color="@color/disabled_grey" />
</selector>

View File

@ -1,4 +1,9 @@
<vector android:height="24dp" android:viewportHeight="48" <vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:viewportWidth="48" android:width="24dp"
<path android:fillColor="#fcfcfc" 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"/> 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"/>
</vector> </vector>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/primary" android:state_checked="true" />
<item android:drawable="@color/background_floating_material_light" android:state_checked="false" />
</selector>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/primary" android:state_checked="true" />
<item android:drawable="@color/darkStatusBarBackground" android:state_checked="false" />
</selector>

View File

@ -56,7 +56,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
android:contentDescription="@string/visit_contributors_homepage" android:contentDescription="@string/visit_contributors_homepage"
android:src="@drawable/ic_baseline_web_24" android:src="@drawable/ic_baseline_web_24"
android:visibility="gone" android:visibility="gone"
app:tint="@color/text_color"
tools:visibility="visible" /> tools:visibility="visible" />
</LinearLayout> </LinearLayout>

View File

@ -38,8 +38,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
android:text="@string/kde_be_free" android:text="@string/kde_be_free"
android:textAppearance="?attr/textAppearanceHeadline6" android:textAppearance="?attr/textAppearanceHeadline6"
app:drawableLeftCompat="@drawable/ic_kde_48dp" app:drawableLeftCompat="@drawable/ic_kde_48dp"
app:drawableStartCompat="@drawable/ic_kde_48dp" app:drawableStartCompat="@drawable/ic_kde_48dp"/>
app:drawableTint="@color/text_color" />
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
xmlns:card_view="https://schemas.android.com/apk/res-auto" xmlns:card_view="https://schemas.android.com/apk/res-auto"

View File

@ -27,7 +27,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:singleLine="true" android:singleLine="true"
android:text="" android:text=""
android:textColor="@color/text_color"
tools:text="Item entry" tools:text="Item entry"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />

View File

@ -15,7 +15,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
app:cardCornerRadius="8dp" app:cardCornerRadius="8dp"
app:cardElevation="0dp" app:cardElevation="0dp"
app:contentPadding="8dp" app:contentPadding="8dp"
app:strokeColor="@color/card_stroke_color"
app:strokeWidth="1dp"> app:strokeWidth="1dp">
<LinearLayout <LinearLayout
@ -50,8 +49,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:contentDescription="@string/mute" android:contentDescription="@string/mute"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_volume_black" android:src="@drawable/ic_volume_black"/>
app:tint="?attr/colorHighContrast" />
<SeekBar <SeekBar
android:id="@+id/systemvolume_seek" android:id="@+id/systemvolume_seek"

View File

@ -198,8 +198,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
android:layout_weight="0" android:layout_weight="0"
android:contentDescription="@string/mpris_volume" android:contentDescription="@string/mpris_volume"
android:maxWidth="30dip" android:maxWidth="30dip"
android:src="@drawable/ic_volume_black" android:src="@drawable/ic_volume_black"/>
app:tint="?attr/colorHighContrast" />
<SeekBar <SeekBar

View File

@ -65,7 +65,7 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="32dp" android:layout_height="32dp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="?divider" android:background="?colorPrimary"
/> />
<!-- Preference will place its actual preference widget here. --> <!-- Preference will place its actual preference widget here. -->
<LinearLayout <LinearLayout
@ -76,6 +76,5 @@
android:gravity="center" android:gravity="center"
android:padding="16dp" android:padding="16dp"
android:orientation="vertical" android:orientation="vertical"
tools:background="@color/primary"
/> />
</LinearLayout> </LinearLayout>

View File

@ -30,9 +30,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:paddingEnd="8dip" android:paddingEnd="8dip"
android:paddingStart="0dip" android:paddingStart="0dip"
android:src="@drawable/ic_error_outline_48dp" android:src="@drawable/ic_error_outline_48dp" />
app:tint="?attr/colorHighContrast"
tools:ignore="UnusedAttribute" />
<TextView <TextView
android:id="@+id/not_reachable_message" android:id="@+id/not_reachable_message"

View File

@ -9,7 +9,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/activity_background"
android:theme="@style/KdeConnectTheme" android:theme="@style/KdeConnectTheme"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -17,7 +16,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<LinearLayout <LinearLayout
android:id="@+id/widget_title_wrapper" android:id="@+id/widget_title_wrapper"
android:background="@color/on_secondary" android:background="?colorSecondary"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -28,7 +27,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
android:paddingEnd="6dip" android:paddingEnd="6dip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:tint="@color/text_color"
android:src="@drawable/ic_kde_24dp" android:src="@drawable/ic_kde_24dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
tools:ignore="UseAppTint"/> <!-- can't use app:tint in RemoteView --> tools:ignore="UseAppTint"/> <!-- can't use app:tint in RemoteView -->
@ -38,7 +36,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textColor="@color/text_color"
android:text="@string/kde_connect" android:text="@string/kde_connect"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:singleLine="true" android:singleLine="true"

View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
SPDX-FileCopyrightText: 2022 Arun Parolikkal <actuday6418@gmail.com>
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-->
<resources>
<color name="primary">@android:color/system_accent2_300</color>
<color name="primaryDark">@android:color/system_neutral1_900</color>
<color name="accent">@android:color/system_accent2_300</color>
<color name="disabled_grey">#EEEEEE</color>
<color name="on_secondary">@android:color/system_accent1_700</color>
<color name="on_high_contrast">@android:color/system_neutral1_50</color>
<color name="text_color_primary">@android:color/system_neutral2_0</color>
<color name="text_color">@android:color/system_neutral2_50</color>
<color name="toolbar_color">@android:color/system_neutral1_900</color>
<color name="card_stroke_color">@android:color/system_neutral2_800</color>
<color name="activity_background">@android:color/system_neutral1_900</color>
<!-- This is for dark theme. In dark theme both selected and unselected text in the
navigation bar should be white. This is different from the light theme as both states have
different colors so light theme has a selector for this value-->
<color name="state_list_drawer_text">@android:color/white</color>
</resources>

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
SPDX-FileCopyrightText: 2020 Anjani Kumar <anjanik012@gmail.com>
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-->
<resources>
<color name="primaryDark">@android:color/black</color>
<color name="darkGrey">#555555</color>
<color name="darkToolbarBackground">#222222</color>
<color name="darkStatusBarBackground">#333333</color>
<color name="on_secondary">@android:color/black</color>
<color name="on_high_contrast">@android:color/white</color>
<color name="text_color_primary">@android:color/white</color>
<color name="text_color">@android:color/white</color>
<color name="toolbar_color">@android:color/black</color>
<color name="card_stroke_color">#8C8C8C</color>
<color name="activity_background">@android:color/black</color>
<!-- This is for dark theme. In dark theme both selected and unselected text in the
navigation bar should be white. This is different from the light theme as both states have
different colors so light theme has a selector for this value-->
<color name="state_list_drawer_text">@android:color/white</color>
</resources>

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
SPDX-FileCopyrightText: 2022 Arun Parolikkal <actuday6418@gmail.com>
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-->
<resources>
<color name="primary">@android:color/system_accent2_500</color>
<color name="primaryDark">@android:color/system_neutral1_50</color>
<color name="accent">@android:color/system_accent2_500</color>
<color name="disabled_grey">#EEEEEE</color>
<color name="on_secondary">@android:color/system_accent1_200</color>
<color name="on_high_contrast">@android:color/system_accent1_700</color>
<color name="text_color_primary">@android:color/system_accent2_700</color>
<color name="text_color">@android:color/system_neutral2_700</color>
<color name="toolbar_color">@android:color/system_neutral1_50</color>
<color name="card_stroke_color">@android:color/system_neutral2_100</color>
<color name="activity_background">@android:color/system_neutral1_50</color>
</resources>

View File

@ -6,12 +6,9 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<resources> <resources>
<!-- A high-contrast color for important visual elements (for less important elements, use colorControlNormal instead) --> <!-- A high-contrast color for important visual elements (for less important elements, use colorControlNormal instead) -->
<attr name="colorHighContrast" format="color" />
<declare-styleable name="AutoGridLayout"> <declare-styleable name="AutoGridLayout">
<!-- The width of one column. Used to align --> <!-- The width of one column. Used to align -->
<attr name="columnWidth" format="dimension" /> <attr name="columnWidth" format="dimension" />
<!-- I think that everything is clear from the name --> <!-- I think that everything is clear from the name -->
<attr name="changeColumnCountIfTheyHaveOnlyOneElement" format="boolean" /> <attr name="changeColumnCountIfTheyHaveOnlyOneElement" format="boolean" />
</declare-styleable> </declare-styleable>

View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
SPDX-FileCopyrightText: 2020 Anjani Kumar <anjanik012@gmail.com>
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-->
<resources>
<color name="primary">#F67400</color>
<color name="primaryDark">@android:color/white</color>
<color name="accent">#F67400</color>
<color name="disabled_grey">#EEEEEE</color>
<color name="on_secondary">#C8C8C8</color>
<color name="on_high_contrast">@android:color/black</color>
<color name="text_color_primary">@android:color/black</color>
<color name="text_color">@android:color/black</color>
<color name="toolbar_color">@android:color/white</color>
<color name="card_stroke_color">#C8C8C8</color>
<color name="activity_background">@android:color/white</color>
</resources>

View File

@ -8,28 +8,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<!-- NoActionBar because we use a Toolbar widget as ActionBar --> <!-- NoActionBar because we use a Toolbar widget as ActionBar -->
<style name="KdeConnectThemeBase" parent="Theme.Material3.DayNight.NoActionBar"> <style name="KdeConnectThemeBase" parent="Theme.Material3.DayNight.NoActionBar">
<!-- The main color attributes --> <!-- The main color attributes -->
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item>
<item name="colorSecondary">@color/primary</item>
<item name="colorOnSecondary">@color/on_secondary</item>
<item name="colorHighContrast">@color/on_high_contrast</item>
<!-- TODO: The 2 items below change too much (eg snackbar text is now black, should be white) -->
<item name="android:textColorPrimary">@color/text_color_primary</item>
<item name="android:textColor">@color/text_color</item>
<!--For android below 23 api-->
<item name="android:statusBarColor">@android:color/black</item>
<!-- Drawable definitions and overrides --> <!-- Drawable definitions and overrides -->
<item name="divider">?colorHighContrast</item>
<!-- Style overrides -->
<item name="actionModeStyle">@style/Widget.Material3.ActionMode</item>
<item name="toolbarStyle">@style/Widget.Material3.Toolbar</item>
<!-- Theme overrides -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
<item name="materialCardViewStyle">@style/KdeConnectCardStyle</item> <item name="materialCardViewStyle">@style/KdeConnectCardStyle</item>
@ -47,13 +26,11 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<style name="KdeConnectTheme.NoActionBar" parent="KdeConnectThemeBase.NoActionBar" /> <style name="KdeConnectTheme.NoActionBar" parent="KdeConnectThemeBase.NoActionBar" />
<style name="KdeConnectTheme.Toolbar" parent="Widget.AppCompat.Toolbar"> <style name="KdeConnectTheme.Toolbar" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/toolbar_color</item>
</style> </style>
<style name="KdeConnectDialogStyle" parent="ThemeOverlay.Material3.MaterialAlertDialog"> <style name="KdeConnectDialogStyle" parent="ThemeOverlay.Material3.MaterialAlertDialog">
<item name="android:layout" tools:ignore="PrivateResource">@layout/m3_alert_dialog</item> <item name="android:layout" tools:ignore="PrivateResource">@layout/m3_alert_dialog</item>
<item name="dialogCornerRadius" tools:ignore="PrivateResource">@dimen/m3_alert_dialog_corner_size</item> <item name="dialogCornerRadius" tools:ignore="PrivateResource">@dimen/m3_alert_dialog_corner_size</item>
<item name="android:colorBackground">?colorSurface</item>
</style> </style>
<style name="KdeConnectCardStyle" parent="@style/Widget.Material3.CardView.Elevated"/> <style name="KdeConnectCardStyle" parent="@style/Widget.Material3.CardView.Elevated"/>
@ -61,14 +38,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<style name="KdeConnectCardStyle.Filled" parent="@style/Widget.Material3.CardView.Filled"/> <style name="KdeConnectCardStyle.Filled" parent="@style/Widget.Material3.CardView.Filled"/>
<style name="MainNavigationView"> <style name="MainNavigationView">
<item name="android:background">@drawable/state_list_drawer_background</item>
<item name="itemBackground">@drawable/state_list_drawer_background</item>
<item name="itemIconTint">@color/state_list_drawer_text</item>
<item name="itemTextColor">@color/state_list_drawer_text</item>
</style>
<style name="DisableableButton" parent="ThemeOverlay.AppCompat">
<item name="colorButtonNormal">@drawable/disableable_button</item>
</style> </style>
<style name="KdeConnectButton.IconButton" parent="Widget.Material3.Button.IconButton.Filled"> <style name="KdeConnectButton.IconButton" parent="Widget.Material3.Button.IconButton.Filled">
@ -82,7 +51,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
</style> </style>
<style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode"> <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
<item name="background">@color/primaryDark</item>
</style> </style>
<style name="Theme.Transparent" parent="@style/Theme.AppCompat.NoActionBar"> <style name="Theme.Transparent" parent="@style/Theme.AppCompat.NoActionBar">
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
@ -106,6 +74,5 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<item name="android:drawablePadding">4dp</item> <item name="android:drawablePadding">4dp</item>
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<item name="drawableTint">@color/text_color</item>
</style> </style>
</resources> </resources>

View File

@ -369,7 +369,6 @@ class MprisMediaSession : OnSharedPreferenceChangeListener, NotificationReceiver
.setContentIntent(piOpenActivity) .setContentIntent(piOpenActivity)
.setSmallIcon(R.drawable.ic_play_white) .setSmallIcon(R.drawable.ic_play_white)
.setShowWhen(false) .setShowWhen(false)
.setColor(ContextCompat.getColor(context!!, R.color.primary))
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setSubText(device.name) .setSubText(device.name)

View File

@ -276,7 +276,6 @@ class MprisNowPlayingFragment : Fragment(), VolumeKeyListener {
if (albumArt == null) { if (albumArt == null) {
val drawable = ContextCompat.getDrawable(requireContext(), R.drawable.ic_album_art_placeholder)!! val drawable = ContextCompat.getDrawable(requireContext(), R.drawable.ic_album_art_placeholder)!!
val placeholder_art = DrawableCompat.wrap(drawable) val placeholder_art = DrawableCompat.wrap(drawable)
DrawableCompat.setTint(placeholder_art, ContextCompat.getColor(requireContext(), R.color.primary))
activityMprisBinding.albumArt.setImageDrawable(placeholder_art) activityMprisBinding.albumArt.setImageDrawable(placeholder_art)
} else { } else {
activityMprisBinding.albumArt.setImageBitmap(albumArt) activityMprisBinding.albumArt.setImageBitmap(albumArt)

View File

@ -59,10 +59,6 @@ class EasterEggActivity : AppCompatActivity(), SensorEventListener {
if (!isAlreadyLongClicked) { if (!isAlreadyLongClicked) {
isAlreadyLongClicked = true isAlreadyLongClicked = true
binding!!.easterEggLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.activity_background))
binding!!.logo.setColorFilter(ContextCompat.getColor(this, R.color.text_color))
binding!!.angle.setTextColor(ContextCompat.getColor(this, R.color.text_color))
var typedArray = this.theme.obtainStyledAttributes(intArrayOf(android.R.attr.statusBarColor)) var typedArray = this.theme.obtainStyledAttributes(intArrayOf(android.R.attr.statusBarColor))
window.statusBarColor = typedArray.getColor(0, Color.WHITE) window.statusBarColor = typedArray.getColor(0, Color.WHITE)
window.navigationBarColor = typedArray.getColor(0, Color.WHITE) window.navigationBarColor = typedArray.getColor(0, Color.WHITE)