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

Commit 9d152496 authored by Catherine Liang's avatar Catherine Liang
Browse files

Update to use MaterialSwitch 

Flag: com.android.systemui.shared.new_customization_picker_ui
Test: manually verified
Bug: 390233022
Change-Id: I1df036c7a2d3851421febb8d09cf67f5b08d79f4
parent 5e52d56b

res/layout/customization_option_entry_themed_icons.xml

+2 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@+id/option_entry_title" />



    <Switch

    <com.google.android.material.materialswitch.MaterialSwitch

        android:id="@+id/option_entry_switch"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -57,6 +57,5 @@ 
        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        style="@style/Switch.SettingsLib"

        tools:ignore="UseSwitchCompatOrMaterialXml" />

        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />

</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file

res/layout/floating_sheet_clock_font_content.xml

+4 −4
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
        style="@style/CustomizationOptionEntryTitleTextStyle"

        android:text="@string/tab_placeholder_text" />



    <Switch

    <com.google.android.material.materialswitch.MaterialSwitch

        android:id="@+id/clock_axis_switch1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -121,7 +121,7 @@ 
        app:layout_constraintStart_toEndOf="@+id/clock_axis_switch_name1"

        android:layout_marginVertical="@dimen/clock_axis_control_switch_row_margin_vertical"

        android:layout_marginStart="@dimen/clock_axis_control_text_margin_end"

        style="@style/Switch.SettingsLib" />

        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />



    <ImageView

        android:id="@+id/divider"
@@ -149,7 +149,7 @@ 
        style="@style/CustomizationOptionEntryTitleTextStyle"

        android:text="@string/tab_placeholder_text" />



    <Switch

    <com.google.android.material.materialswitch.MaterialSwitch

        android:id="@+id/clock_axis_switch2"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -157,5 +157,5 @@ 
        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        android:layout_marginVertical="@dimen/clock_axis_control_switch_row_margin_vertical"

        style="@style/Switch.SettingsLib" />

        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />

</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file

res/layout/floating_sheet_clock_style_content.xml

+2 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
        app:layout_constraintTop_toBottomOf="@+id/clock_style_clock_size_title"

        app:layout_constraintBottom_toBottomOf="parent" />



    <Switch

    <com.google.android.material.materialswitch.MaterialSwitch

        android:id="@+id/clock_style_clock_size_switch"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -94,6 +94,5 @@ 
        app:layout_constraintTop_toTopOf="@+id/clock_style_clock_size_title"

        app:layout_constraintBottom_toBottomOf="@+id/clock_style_clock_size_description"

        app:layout_constraintEnd_toEndOf="parent"

        style="@style/Switch.SettingsLib"

        tools:ignore="UseSwitchCompatOrMaterialXml" />

        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />

</androidx.constraintlayout.widget.ConstraintLayout>

res/layout/floating_sheet_colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -65,14 +65,14 @@ 
                android:layout_weight="1"

                android:text="@string/mode_title" />



            <Switch

            <com.google.android.material.materialswitch.MaterialSwitch

                android:id="@+id/dark_mode_toggle"

                style="@style/Switch.SettingsLib"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:background="@null"

                android:focusable="false"

                android:minHeight="0dp" />

                android:minHeight="0dp"

                android:theme="@style/Theme.Material3.DynamicColors.DayNight" />

        </LinearLayout>

    </LinearLayout>

src/com/android/customization/picker/mode/ui/binder/DarkModeBinder.kt

+6 −2
Original line number Diff line number Diff line
@@ -16,16 +16,20 @@ 


package com.android.customization.picker.mode.ui.binder



import android.widget.Switch

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.LifecycleOwner

import androidx.lifecycle.lifecycleScope

import androidx.lifecycle.repeatOnLifecycle

import com.android.customization.picker.mode.ui.viewmodel.DarkModeViewModel

import com.google.android.material.materialswitch.MaterialSwitch

import kotlinx.coroutines.launch



object DarkModeBinder {

    fun bind(darkModeToggle: Switch, viewModel: DarkModeViewModel, lifecycleOwner: LifecycleOwner) {

    fun bind(

        darkModeToggle: MaterialSwitch,

        viewModel: DarkModeViewModel,

        lifecycleOwner: LifecycleOwner,

    ) {

        lifecycleOwner.lifecycleScope.launch {

            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {

                launch { viewModel.isEnabled.collect { darkModeToggle.isEnabled = it } }