-Compose v1.7. Bump and Info.plist Fixed

KhubaibKhan4 · Oct 23, 2024 · 9b4af59 · 9b4af59
1 parent 9713312
commit 9b4af59
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/...src/commonMain/kotlin/org/flexi/app/presentation/ui/screens/detail/common/DetailScreen.kt b/...src/commonMain/kotlin/org/flexi/app/presentation/ui/screens/detail/common/DetailScreen.kt
@@ -2,6 +2,7 @@ package org.flexi.app.presentation.ui.screens.detail.common
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.tween
+import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -287,7 +288,7 @@ class DetailScreen(
                                                 .size(25.dp)
                                                 .clickable(
                                                     interactionSource = MutableInteractionSource(),
-                                                    indication = rememberRipple(color = Color.Red),
+                                                    indication = LocalIndication.current,
                                                     onClick = {
                                                         isFavourite = !isFavourite
                                                     }
@@ -631,7 +632,7 @@ fun ExpandableDescription(description: String) {
             modifier = Modifier.padding(top = 6.dp, start = 12.dp)
                 .clickable(
                     interactionSource = MutableInteractionSource(),
-                    indication = rememberRipple(color = Color.Transparent),
+                    indication = LocalIndication.current,
                     enabled = true,
                     role = Role.Button,
                     onClick = {

diff --git a/composeApp/src/commonMain/kotlin/org/flexi/app/presentation/ui/screens/home/HomeScreen.kt b/composeApp/src/commonMain/kotlin/org/flexi/app/presentation/ui/screens/home/HomeScreen.kt
@@ -325,7 +325,7 @@ class HomeScreen : Screen {
                                     tint = Color.Gray
                                 )
                             },
-                            colors = TextFieldDefaults.textFieldColors(
+                            colors = TextFieldDefaults.colors(
                                 cursorColor = Color.Black,
                                 focusedIndicatorColor = Color.Transparent,
                                 unfocusedIndicatorColor = Color.Transparent

diff --git a/.../commonMain/kotlin/org/flexi/app/presentation/ui/screens/setting/account/AccountScreen.kt b/.../commonMain/kotlin/org/flexi/app/presentation/ui/screens/setting/account/AccountScreen.kt
@@ -275,7 +275,7 @@ fun UserDetailsCard(
                         modifier = Modifier.fillMaxWidth(),
                         singleLine = true,
                         textStyle = MaterialTheme.typography.bodyLarge,
-                        colors = TextFieldDefaults.outlinedTextFieldColors(focusedBorderColor = Color.Gray)
+                        colors = TextFieldDefaults.colors()
                     )
                 } else {
                     Text(text = value, style = MaterialTheme.typography.bodySmall)

diff --git a/composeApp/src/iosMain/kotlin/main.kt b/composeApp/src/iosMain/kotlin/main.kt
@@ -4,4 +4,4 @@ import org.flexi.app.di.appModule
 import org.koin.core.context.startKoin
 import platform.UIKit.UIViewController
 
-fun MainViewController(): UIViewController = ComposeUIViewController { App() }
+fun MainViewController(): UIViewController = ComposeUIViewController(configure = {enforceStrictPlistSanityCheck = false}) { App() }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ composeAuth = "2.3.1"
 composeAuthUi = "2.3.1"
 koinAnnotations = "1.3.1"
 kotlin = "2.0.0"
-compose = "1.6.11"
+compose = "1.7.0"
 agp = "8.2.2"
 androidx-activityCompose = "1.9.3"
 androidx-uiTest = "1.7.4"

diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -297,6 +297,7 @@
 					"$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = iosApp/Info.plist;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -330,6 +331,7 @@
 					"$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = iosApp/Info.plist;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>