diff --git a/compose-core/build.gradle.kts b/compose-core/build.gradle.kts index 27af5da7..f90b7725 100644 --- a/compose-core/build.gradle.kts +++ b/compose-core/build.gradle.kts @@ -44,12 +44,9 @@ android { } dependencies { - api(Dep.AndroidX.annotation) api(Dep.AndroidX.appcompat) - api(Dep.AndroidX.coreKtx) api(Dep.Compose.ui) api(Dep.Compose.animation) api(Dep.Compose.material) api(Dep.Compose.compiler) - api(Dep.Compose.constraintlayout) } \ No newline at end of file diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 5f3a56db..9853088e 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -45,4 +45,5 @@ android { dependencies { api(project(":compose-core")) + api(Dep.Compose.constraintlayout) } \ No newline at end of file diff --git a/compose/src/main/java/com/qmuiteam/compose/modal/ModalImpl.kt b/compose/src/main/java/com/qmuiteam/compose/modal/ModalImpl.kt index d3cf09d6..5a281b29 100644 --- a/compose/src/main/java/com/qmuiteam/compose/modal/ModalImpl.kt +++ b/compose/src/main/java/com/qmuiteam/compose/modal/ModalImpl.kt @@ -19,7 +19,6 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.ComposeView -import androidx.core.view.isVisible import kotlinx.coroutines.flow.MutableStateFlow internal abstract class QMUIModalPresent( @@ -61,7 +60,7 @@ internal abstract class QMUIModalPresent( private fun doAfterDismiss() { isDismissing = false - composeLayout.isVisible = false + composeLayout.visibility = View.GONE composeLayout.disposeComposition() rootLayout.removeView(composeLayout) onBackPressedCallback.remove() diff --git a/photo-coil/build.gradle.kts b/photo-coil/build.gradle.kts index 69888982..c8f41852 100644 --- a/photo-coil/build.gradle.kts +++ b/photo-coil/build.gradle.kts @@ -45,7 +45,8 @@ android { } dependencies { - api(project(":compose-core")) - compileOnly(project(":photo")) + implementation(project(":compose-core")) + implementation(Dep.AndroidX.coreKtx) + api(project(":photo")) api(Dep.Coil.compose) } \ No newline at end of file diff --git a/photo-glide/build.gradle.kts b/photo-glide/build.gradle.kts index 4e3008c9..17614acc 100644 --- a/photo-glide/build.gradle.kts +++ b/photo-glide/build.gradle.kts @@ -46,8 +46,9 @@ android { } dependencies { - api(project(":compose-core")) - compileOnly(project(":photo")) + implementation(project(":compose-core")) + implementation(Dep.AndroidX.coreKtx) + api(project(":photo")) api(Dep.Glide.glide) kapt(Dep.Glide.compiler) } \ No newline at end of file diff --git a/photo/build.gradle.kts b/photo/build.gradle.kts index 12ed3f86..07552dcf 100644 --- a/photo/build.gradle.kts +++ b/photo/build.gradle.kts @@ -44,8 +44,10 @@ android { } dependencies { - api(project(":compose-core")) - api(Dep.AndroidX.activity) - api(Dep.Compose.activity) - api(Dep.Compose.pager) + implementation(Dep.AndroidX.appcompat) + implementation(project(":compose-core")) + implementation(Dep.AndroidX.activity) + implementation(Dep.Compose.activity) + implementation(Dep.Compose.pager) + implementation(Dep.Compose.constraintlayout) } \ No newline at end of file