Address deprecations and warnings

oblakr24 · Mar 17, 2024 · 0ddccf4 · 0ddccf4
1 parent f495217
commit 0ddccf4
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 26 deletions.
diff --git a/app/src/main/java/com/rokoblak/chatbackup/conversation/InputBar.kt b/app/src/main/java/com/rokoblak/chatbackup/conversation/InputBar.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Send
 import androidx.compose.material.icons.filled.Send
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -30,8 +31,6 @@ import androidx.compose.ui.unit.dp
 import com.rokoblak.chatbackup.ui.theme.AppThemePreviews
 import com.rokoblak.chatbackup.ui.theme.ChatBackupTheme
 
-
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun InputBar(
     input: String,
@@ -60,8 +59,9 @@ fun InputBar(
                 value = input,
                 onValueChange = onChange,
                 maxLines = 1,
-                colors = TextFieldDefaults.textFieldColors(
-                    containerColor = bgColor,
+                colors = TextFieldDefaults.colors(
+                    focusedContainerColor = bgColor,
+                    unfocusedContainerColor = bgColor,
                     focusedIndicatorColor = Color.Transparent,
                     unfocusedIndicatorColor = Color.Transparent,
                     disabledIndicatorColor = Color.Transparent
@@ -86,7 +86,7 @@ fun InputBar(
                     }
                 ) {
                     Icon(
-                        imageVector = Icons.Filled.Send,
+                        imageVector = Icons.AutoMirrored.Filled.Send,
                         tint = MaterialTheme.colorScheme.onPrimaryContainer,
                         contentDescription = "Clear input"
                     )

diff --git a/app/src/main/java/com/rokoblak/chatbackup/createchat/ContactsListing.kt b/app/src/main/java/com/rokoblak/chatbackup/createchat/ContactsListing.kt
@@ -2,10 +2,9 @@ package com.rokoblak.chatbackup.createchat
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -43,7 +42,7 @@ fun ContactsListing(data: ContactsListingData, onItemClicked: (cId: String, numb
                         data = item,
                     )
                     if (idx < data.items.lastIndex) {
-                        Divider(color = MaterialTheme.colorScheme.primary, thickness = 1.dp)
+                        HorizontalDivider(color = MaterialTheme.colorScheme.primary, thickness = 1.dp)
                     }
                 }
             )

diff --git a/app/src/main/java/com/rokoblak/chatbackup/home/HomeContent.kt b/app/src/main/java/com/rokoblak/chatbackup/home/HomeContent.kt
@@ -7,6 +7,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Message
 import androidx.compose.material.icons.filled.Message
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.Text
@@ -62,7 +63,7 @@ fun HomeContent(
                     // then gently explain why the app requires this permission
                     Text("The app needs to read messages and contacts in order to list and export the data. Please grant the necessary permissions.")
 
-                    ButtonWithIcon("Grant permissions", icon = Icons.Filled.Message) {
+                    ButtonWithIcon("Grant permissions", icon = Icons.AutoMirrored.Filled.Message) {
                         onLaunchPermissions()
                     }
                 } else {
@@ -85,7 +86,7 @@ fun HomeContent(
                             )
                         }
                     } else {
-                        ButtonWithIcon("Grant permissions", icon = Icons.Filled.Message) {
+                        ButtonWithIcon("Grant permissions", icon = Icons.AutoMirrored.Filled.Message) {
                             onLaunchPermissions()
                         }
                     }
@@ -102,7 +103,7 @@ fun HomeContent(
 
                 Spacer(modifier = Modifier.height(24.dp))
 
-                ButtonWithIcon("Set as default", icon = Icons.Filled.Message) {
+                ButtonWithIcon("Set as default", icon = Icons.AutoMirrored.Filled.Message) {
                     onAction(HomeAction.OpenSetAsDefaultClicked)
                 }
             }

diff --git a/app/src/main/java/com/rokoblak/chatbackup/home/HomeDrawer.kt b/app/src/main/java/com/rokoblak/chatbackup/home/HomeDrawer.kt
@@ -12,6 +12,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Message
+import androidx.compose.material.icons.automirrored.filled.OpenInNew
 import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.Message
 import androidx.compose.material.icons.filled.OpenInNew
@@ -49,12 +51,12 @@ fun HomeDrawer(
         if (state.showComposeAndImport) {
             ButtonWithIcon(modifier = Modifier.padding(horizontal = 16.dp),
                 text = "Compose",
-                icon = Icons.Filled.Message,
+                icon = Icons.AutoMirrored.Filled.Message,
                 onClick = { onAction(HomeAction.ComposeClicked) })
             Spacer(modifier = Modifier.height(8.dp))
             ButtonWithIcon(modifier = Modifier.padding(horizontal = 16.dp),
                 text = "Import",
-                icon = Icons.Filled.OpenInNew,
+                icon = Icons.AutoMirrored.Filled.OpenInNew,
                 onClick = { onAction(HomeAction.ImportClicked) })
             Spacer(modifier = Modifier.height(8.dp))
         }
@@ -117,7 +119,7 @@ fun HomeDrawer(
                 ) {
                     Text("This is not the default SMS app.\nChange to enable additional functionalities such as restoring imported messages and deleting.")
                     Spacer(modifier = Modifier.height(12.dp))
-                    ButtonWithIcon("Make default", Icons.Filled.Message) {
+                    ButtonWithIcon("Make default", Icons.AutoMirrored.Filled.Message) {
                         onAction(HomeAction.OpenSetAsDefaultClicked)
                     }
                 }

diff --git a/app/src/main/java/com/rokoblak/chatbackup/home/HomeScaffold.kt b/app/src/main/java/com/rokoblak/chatbackup/home/HomeScaffold.kt
@@ -2,6 +2,7 @@ package com.rokoblak.chatbackup.home
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Message
 import androidx.compose.material.icons.filled.Message
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.DrawerValue
@@ -81,7 +82,7 @@ private fun HomeScaffoldContent(
             if (state.contentPermissions is HomeContentUIPermissionsState.PermissionsGiven) {
                 ButtonWithIcon(modifier = Modifier,
                     text = "Compose",
-                    icon = Icons.Filled.Message,
+                    icon = Icons.AutoMirrored.Filled.Message,
                     onClick = { onAction(HomeAction.ComposeClicked) })
             }
         }

diff --git a/app/src/main/java/com/rokoblak/chatbackup/home/HomeTopAppBar.kt b/app/src/main/java/com/rokoblak/chatbackup/home/HomeTopAppBar.kt
@@ -40,7 +40,7 @@ fun HomeTopAppBar(
     onNavIconClick: () -> Unit
 ) {
     TopAppBar(
-        colors = TopAppBarDefaults.smallTopAppBarColors(
+        colors = TopAppBarDefaults.topAppBarColors(
             containerColor = MaterialTheme.colorScheme.primaryContainer,
             titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer
         ),

diff --git a/app/src/main/java/com/rokoblak/chatbackup/importfile/ImportTopToolbar.kt b/app/src/main/java/com/rokoblak/chatbackup/importfile/ImportTopToolbar.kt
@@ -4,6 +4,8 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Message
+import androidx.compose.material.icons.automirrored.filled.OpenInNew
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -42,7 +44,7 @@ fun ImportTopToolbar(
     onAction: (ImportAction) -> Unit,
 ) {
     TopAppBar(
-        colors = TopAppBarDefaults.smallTopAppBarColors(
+        colors = TopAppBarDefaults.topAppBarColors(
             containerColor = MaterialTheme.colorScheme.primaryContainer,
             titleContentColor = MaterialTheme.colorScheme.primaryContainer
         ),
@@ -84,7 +86,7 @@ fun ImportTopToolbar(
                                     .widthIn(20.dp, 220.dp)
                             )
                             val owner = LocalContext.current
-                            ButtonWithIcon("Set as default", Icons.Filled.Message) {
+                            ButtonWithIcon("Set as default", Icons.AutoMirrored.Filled.Message) {
                                 openSMSDefaultPrompt = false
                                 onAction(ImportAction.OpenSetAsDefaultClicked(owner))
                             }
@@ -230,7 +232,7 @@ fun ImportTopToolbar(
                 }
             ) {
                 Icon(
-                    imageVector = Icons.Filled.OpenInNew,
+                    imageVector = Icons.AutoMirrored.Filled.OpenInNew,
                     contentDescription = "Show open file submenu"
                 )
             }

diff --git a/app/src/main/java/com/rokoblak/chatbackup/ui/commonui/ConversationsListing.kt b/app/src/main/java/com/rokoblak/chatbackup/ui/commonui/ConversationsListing.kt
@@ -3,12 +3,18 @@ package com.rokoblak.chatbackup.ui.commonui
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ImportExport
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -108,7 +114,7 @@ fun ConversationsListing(
                             })
 
                         if (idx < state.items.lastIndex) {
-                            Divider(color = MaterialTheme.colorScheme.primary, thickness = 1.dp)
+                            HorizontalDivider(color = MaterialTheme.colorScheme.primary, thickness = 1.dp)
                         }
                     }
                 )

diff --git a/app/src/main/java/com/rokoblak/chatbackup/ui/commonui/DetailsHeader.kt b/app/src/main/java/com/rokoblak/chatbackup/ui/commonui/DetailsHeader.kt
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material3.MaterialTheme
@@ -64,7 +65,7 @@ fun DetailsHeader(
             contentAlignment = Alignment.CenterStart
         ) {
             Image(
-                imageVector = Icons.Filled.ArrowBack,
+                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                 contentDescription = null,
                 modifier = Modifier
                     .fillMaxHeight()

diff --git a/app/src/main/java/com/rokoblak/chatbackup/ui/commonui/SearchBar.kt b/app/src/main/java/com/rokoblak/chatbackup/ui/commonui/SearchBar.kt
@@ -45,7 +45,8 @@ fun SearchBar(
         modifier = modifier
             .padding(horizontal = 16.dp, vertical = 4.dp)
             .fillMaxWidth()
-            .height(50.dp).clip(RoundedCornerShape(25.dp)),
+            .height(50.dp)
+            .clip(RoundedCornerShape(25.dp)),
         shadowElevation = 4.dp,
         border = BorderStroke(1.dp, MaterialTheme.colorScheme.onPrimary.alpha(0.5f)),
         shape = RoundedCornerShape(25.dp),
@@ -66,7 +67,10 @@ fun SearchBar(
                 value = text,
                 onValueChange = onChange,
                 maxLines = 1,
-                colors = TextFieldDefaults.textFieldColors(containerColor = MaterialTheme.colorScheme.background),
+                colors = TextFieldDefaults.colors(
+                    focusedContainerColor = MaterialTheme.colorScheme.background,
+                    unfocusedContainerColor = MaterialTheme.colorScheme.background
+                ),
                 placeholder = {
                     Text(
                         text = placeholder,

diff --git a/app/src/main/java/com/rokoblak/chatbackup/ui/theme/Theme.kt b/app/src/main/java/com/rokoblak/chatbackup/ui/theme/Theme.kt
@@ -32,7 +32,7 @@ fun ChatBackupTheme(
     overrideDarkMode: Boolean? = null,
     darkTheme: Boolean = overrideDarkMode ?: isSystemInDarkTheme(),
     // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
+//    dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
     val colorScheme = when {