fix conflict

DDD-Community · Oct 28, 2024 · b138e2a · b138e2a
1 parent c1f07f3
commit b138e2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/presentation/resource/src/main/java/com/dkin/chevit/presentation/resource/ChevitInput.kt b/presentation/resource/src/main/java/com/dkin/chevit/presentation/resource/ChevitInput.kt
@@ -3,6 +3,7 @@ package com.dkin.chevit.presentation.resource
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable

diff --git a/presentation/resource/src/main/java/com/dkin/chevit/presentation/resource/ChevitTextField.kt b/presentation/resource/src/main/java/com/dkin/chevit/presentation/resource/ChevitTextField.kt
@@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import androidx.compose.material3.ExperimentalMaterial3Api
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/...ation/resource/src/main/java/com/dkin/chevit/presentation/resource/util/LifecycleEvent.kt b/...ation/resource/src/main/java/com/dkin/chevit/presentation/resource/util/LifecycleEvent.kt
@@ -6,10 +6,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.compose.LocalLifecycleOwner
 
 @Composable
 fun rememberLifecycleEvent(lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current): Lifecycle.Event {