Remove deprecated Mdc3 library

build.gradle.kts

@@ -155,7 +155,6 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.activity.compose)
-    implementation(libs.accompanist.themeadapter.material3) // TODO: Remove deprecated library https://google.github.io/accompanist/themeadapter-material3/
     implementation(libs.androidx.constraintlayout.compose)
 
     implementation(libs.androidx.compose.ui.tooling.preview)

gradle/libs.versions.toml

@@ -1,5 +1,4 @@
 [versions]
-accompanistThemeadapterMaterial3 = "0.32.0"
 activityCompose = "1.8.2"
 androidDesugarJdkLibs = "2.0.4"
 androidGradlePlugin = "8.3.0"
@@ -41,7 +40,6 @@ univocityParsers = "2.9.1"
 sl4j = "2.0.4"
 
 [libraries]
-accompanist-themeadapter-material3 = { module = "com.google.accompanist:accompanist-themeadapter-material3", version.ref = "accompanistThemeadapterMaterial3" }
 android-desugarJdkLibs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
 android-smsmms = { module = "org.kde.invent.sredman:android-smsmms", version.ref = "androidSmsmms" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }

src/org/kde/kdeconnect/Plugins/MousePadPlugin/ComposeSendActivity.kt

@@ -24,11 +24,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.preference.PreferenceManager
-import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import org.kde.kdeconnect.KdeConnect
 import org.kde.kdeconnect.NetworkPacket
 import org.kde.kdeconnect.UserInterface.compose.KdeTextButton
 import org.kde.kdeconnect.UserInterface.compose.KdeTextField
+import org.kde.kdeconnect.UserInterface.compose.KdeTheme
 import org.kde.kdeconnect.UserInterface.compose.KdeTopAppBar
 import org.kde.kdeconnect_tp.R
 
@@ -89,7 +89,7 @@ class ComposeSendActivity : AppCompatActivity() {
 
     @Composable
     private fun ComposeSendScreen() {
-        Mdc3Theme {
+        KdeTheme(this) {
             Scaffold(
                 topBar = {
                     KdeTopAppBar(

src/org/kde/kdeconnect/Plugins/PresenterPlugin/PresenterActivity.kt

@@ -33,9 +33,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.media.VolumeProviderCompat
-import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import org.kde.kdeconnect.KdeConnect
 import org.kde.kdeconnect.UserInterface.compose.KdeButton
+import org.kde.kdeconnect.UserInterface.compose.KdeTheme
 import org.kde.kdeconnect.UserInterface.compose.KdeTopAppBar
 import org.kde.kdeconnect_tp.R
 
@@ -115,7 +115,7 @@ class PresenterActivity : AppCompatActivity(), SensorEventListener {
 
         val sensorManager = LocalContext.current.getSystemService(SENSOR_SERVICE) as? SensorManager
 
-        Mdc3Theme {
+        KdeTheme(this) {
             Scaffold(topBar = { PresenterAppBar() }) {
                 Column(
                     modifier = Modifier.fillMaxSize().padding(it).padding(16.dp),
@@ -199,4 +199,4 @@ class PresenterActivity : AppCompatActivity(), SensorEventListener {
             }
         )
     }
-}
+}

src/org/kde/kdeconnect/UserInterface/DeviceFragment.kt

@@ -31,7 +31,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.*
 import androidx.fragment.app.Fragment
-import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.kde.kdeconnect.BackgroundService
 import org.kde.kdeconnect.Device
@@ -44,6 +43,7 @@ import org.kde.kdeconnect.Plugins.MprisPlugin.MprisPlugin
 import org.kde.kdeconnect.Plugins.Plugin
 import org.kde.kdeconnect.Plugins.PresenterPlugin.PresenterPlugin
 import org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandPlugin
+import org.kde.kdeconnect.UserInterface.compose.KdeTheme
 import org.kde.kdeconnect_tp.R
 import org.kde.kdeconnect_tp.databinding.ActivityDeviceBinding
 import org.kde.kdeconnect_tp.databinding.ViewPairErrorBinding
@@ -288,7 +288,7 @@ class DeviceFragment : Fragment() {
                     requireDeviceBinding().deviceView.visibility = View.VISIBLE
                     requireDeviceBinding().deviceViewCompose.apply {
                         setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-                        setContent { Mdc3Theme { PluginList(device) } }
+                        setContent { KdeTheme(context) { PluginList(device) } }
                     }
                     displayBatteryInfoIfPossible()
                 } else {

src/org/kde/kdeconnect/UserInterface/compose/KdeTheme.kt

@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+ */
+
+package org.kde.kdeconnect.UserInterface.compose
+
+import android.content.Context
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+
+@Composable
+fun KdeTheme(context : Context, content: @Composable () -> Unit) {
+    val colorScheme = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        when (isSystemInDarkTheme()) {
+            true -> dynamicDarkColorScheme(context)
+            false -> dynamicLightColorScheme(context)
+        }
+    } else {
+        when (isSystemInDarkTheme()) {
+            true -> darkColorScheme()
+            false -> lightColorScheme()
+        }
+    }
+    MaterialTheme(
+        colorScheme = colorScheme,
+        content = content,
+    )
+}