Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4e0e040 authored by Inhishonor's avatar Inhishonor Committed by Luca Stefani
Browse files

DeskClock: Migrate to Material 3 Expressive 

Contains the following big changes:
- Migrate Material 2 elements to 3
- Migrate to Material Dynamic Colors
- Migrate away from app compat themes
- Migrate to Material Buttons where necessary

And last but not least migrates to Material 3 Expressive.

Change-Id: Id80b5550bdb5114b6c4c73d5d10eee8b6bd41433
parent 52275bfd

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ plugins { 


android {

    namespace 'com.android.deskclock'

    compileSdk 34

    compileSdk 36



    defaultConfig {

        applicationId "com.android.deskclock"
@@ -49,7 +49,7 @@ android { 
}



dependencies {

    implementation 'com.google.android.material:material:1.7.0-alpha03'

    implementation 'com.google.android.material:material:1.14.0-alpha09'

    implementation 'androidx.appcompat:appcompat:1.5.1'

    implementation 'androidx.preference:preference:1.2.0'

    implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01'

res/color/switch_thumb_icon.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2026 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="?attr/colorPrimary" android:state_checked="true" />

    <item android:color="?attr/colorSurfaceContainerHighest" />

</selector>

res/color/tab_tint_color.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_focused="true" android:color="@color/accent_color" />

    <item android:state_selected="true" android:color="@color/accent_color" />

    <item android:state_focused="true" android:color="?attr/colorPrimary" />

    <item android:state_selected="true" android:color="?attr/colorPrimary" />

    <item android:color="@color/white_50p" />

</selector>

res/drawable/alarm_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">



    <solid android:color="@color/default_background_lighter" />

    <solid android:color="?attr/colorSurfaceVariant" />

    <corners android:radius="28dp" />

</shape>

res/drawable/bg_day_selected.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
        android:bottom="8dp">

        <shape android:shape="oval" >

            <size android:height="20dp" android:width="20dp" />

            <solid android:color="@color/accent_color" />

            <solid android:color="?attr/colorPrimary" />

        </shape>

    </item>

</layer-list>