From 5656d771d2c4c98af614952eb5cedd4813992d6a Mon Sep 17 00:00:00 2001 From: Diego Beraldin Date: Mon, 18 Dec 2023 00:01:45 +0100 Subject: [PATCH] refactor: move modals to separate module (#322) --- core-commonui/build.gradle.kts | 1 + core-commonui/modals/build.gradle.kts | 61 +++++++++++++++++++ .../commonui/modals}/CustomTextToolbar.kt | 2 +- .../core/commonui/modals/di/Utils.kt | 18 ++++++ .../core/commonui/modals/ColorBottomSheet.kt | 0 .../core/commonui/modals/ColorPickerDialog.kt | 0 .../modals/CommentBarThemeBottomSheet.kt | 0 .../commonui/modals/DurationBottomSheet.kt | 0 .../commonui/modals/FontFamilyBottomSheet.kt | 0 .../commonui/modals/FontScaleBottomSheet.kt | 0 .../core/commonui/modals/InboxTypeSheet.kt | 0 .../commonui/modals/LanguageBottomSheet.kt | 0 .../commonui/modals/ListingTypeBottomSheet.kt | 0 .../commonui/modals/PostLayoutBottomSheet.kt | 0 .../core/commonui/modals/RawContentDialog.kt | 2 +- .../commonui/modals/ReportListTypeSheet.kt | 0 .../core/commonui/modals/SliderBottomSheet.kt | 0 .../core/commonui/modals/SortBottomSheet.kt | 0 .../core/commonui/modals/ThemeBottomSheet.kt | 0 .../commonui/modals/VoteFormatBottomSheet.kt | 0 .../commonui/modals/VoteThemeBottomSheet.kt | 0 .../core/commonui/modals/di/Utils.kt | 10 +++ .../core/commonui/modals/di/Utils.kt | 13 ++++ .../raccoonforlemmy/core/commonui/di/Utils.kt | 18 +----- .../raccoonforlemmy/core/commonui/di/Utils.kt | 8 --- .../raccoonforlemmy/core/commonui/di/Utils.kt | 11 ---- feature-home/build.gradle.kts | 1 + feature-inbox/build.gradle.kts | 1 + feature-profile/build.gradle.kts | 1 + feature-search/build.gradle.kts | 1 + feature-settings/build.gradle.kts | 1 + settings.gradle.kts | 1 + 32 files changed, 112 insertions(+), 38 deletions(-) create mode 100644 core-commonui/modals/build.gradle.kts rename core-commonui/{src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui => modals/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals}/CustomTextToolbar.kt (98%) create mode 100644 core-commonui/modals/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorPickerDialog.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThemeBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/DurationBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontFamilyBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontScaleBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/InboxTypeSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ListingTypeBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/PostLayoutBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt (99%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ReportListTypeSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SliderBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SortBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ThemeBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteFormatBottomSheet.kt (100%) rename core-commonui/{ => modals}/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteThemeBottomSheet.kt (100%) create mode 100644 core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt create mode 100644 core-commonui/modals/src/iosMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt diff --git a/core-commonui/build.gradle.kts b/core-commonui/build.gradle.kts index 854305bf3..623d222a8 100644 --- a/core-commonui/build.gradle.kts +++ b/core-commonui/build.gradle.kts @@ -57,6 +57,7 @@ kotlin { implementation(projects.coreNavigation) implementation(projects.coreCommonui.components) implementation(projects.coreCommonui.lemmyui) + implementation(projects.coreCommonui.modals) implementation(projects.domainLemmy.data) implementation(projects.domainLemmy.repository) diff --git a/core-commonui/modals/build.gradle.kts b/core-commonui/modals/build.gradle.kts new file mode 100644 index 000000000..2e05fd437 --- /dev/null +++ b/core-commonui/modals/build.gradle.kts @@ -0,0 +1,61 @@ +plugins { + alias(libs.plugins.kotlin.multiplatform) + alias(libs.plugins.android.library) + alias(libs.plugins.compose) +} + +@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class) +kotlin { + applyDefaultHierarchyTemplate() + + androidTarget { + compilations.all { + kotlinOptions { + jvmTarget = "1.8" + } + } + } + iosX64() + iosArm64() + iosSimulatorArm64() + + sourceSets { + val commonMain by getting { + dependencies { + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.material3) + @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + implementation(compose.materialIconsExtended) + + implementation(libs.koin.core) + implementation(libs.voyager.navigator) + implementation(libs.voyager.bottomsheet) + + implementation(projects.coreUtils) + implementation(projects.coreAppearance) + implementation(projects.coreCommonui.components) + implementation(projects.coreNavigation) + implementation(projects.corePersistence) + implementation(projects.coreNotifications) + implementation(projects.domainLemmy.data) + implementation(projects.resources) + } + } + val commonTest by getting { + dependencies { + implementation(kotlin("test")) + } + } + } +} + +android { + namespace = "com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals" + compileSdk = libs.versions.android.targetSdk.get().toInt() + defaultConfig { + minSdk = libs.versions.android.minSdk.get().toInt() + } +} diff --git a/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/CustomTextToolbar.kt b/core-commonui/modals/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CustomTextToolbar.kt similarity index 98% rename from core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/CustomTextToolbar.kt rename to core-commonui/modals/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CustomTextToolbar.kt index 6ec133fa3..ae8e499f5 100644 --- a/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/CustomTextToolbar.kt +++ b/core-commonui/modals/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CustomTextToolbar.kt @@ -1,4 +1,4 @@ -package com.github.diegoberaldin.raccoonforlemmy.core.commonui +package com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals import android.view.ActionMode import android.view.Menu diff --git a/core-commonui/modals/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt b/core-commonui/modals/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt new file mode 100644 index 000000000..81a124c03 --- /dev/null +++ b/core-commonui/modals/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt @@ -0,0 +1,18 @@ +package com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.di + +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.platform.TextToolbar +import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.CustomTextToolbar + +@Composable +actual fun getCustomTextToolbar( + onShare: () -> Unit, + onQuote: () -> Unit, +): TextToolbar { + return CustomTextToolbar( + view = LocalView.current, + onShare = onShare, + onQuote = onQuote, + ) +} diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorPickerDialog.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorPickerDialog.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorPickerDialog.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ColorPickerDialog.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThemeBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThemeBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThemeBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThemeBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/DurationBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/DurationBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/DurationBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/DurationBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontFamilyBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontFamilyBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontFamilyBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontFamilyBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontScaleBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontScaleBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontScaleBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/FontScaleBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/InboxTypeSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/InboxTypeSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/InboxTypeSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/InboxTypeSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/LanguageBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ListingTypeBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ListingTypeBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ListingTypeBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ListingTypeBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/PostLayoutBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/PostLayoutBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/PostLayoutBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/PostLayoutBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt similarity index 99% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt index a9b069f20..83231d393 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt +++ b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/RawContentDialog.kt @@ -32,7 +32,7 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.IconSize import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing -import com.github.diegoberaldin.raccoonforlemmy.core.commonui.di.getCustomTextToolbar +import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.di.getCustomTextToolbar import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback import com.github.diegoberaldin.raccoonforlemmy.core.utils.share.getShareHelper import com.github.diegoberaldin.raccoonforlemmy.resources.MR diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ReportListTypeSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ReportListTypeSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ReportListTypeSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ReportListTypeSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SliderBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SliderBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SliderBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SliderBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SortBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SortBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SortBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/SortBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ThemeBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ThemeBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ThemeBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/ThemeBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteFormatBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteFormatBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteFormatBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteFormatBottomSheet.kt diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteThemeBottomSheet.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteThemeBottomSheet.kt similarity index 100% rename from core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteThemeBottomSheet.kt rename to core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/VoteThemeBottomSheet.kt diff --git a/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt new file mode 100644 index 000000000..d7d604fd1 --- /dev/null +++ b/core-commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt @@ -0,0 +1,10 @@ +package com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.di + +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.TextToolbar + +@Composable +expect fun getCustomTextToolbar( + onShare: () -> Unit, + onQuote: () -> Unit, +): TextToolbar diff --git a/core-commonui/modals/src/iosMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt b/core-commonui/modals/src/iosMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt new file mode 100644 index 000000000..a60271a86 --- /dev/null +++ b/core-commonui/modals/src/iosMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/di/Utils.kt @@ -0,0 +1,13 @@ +package com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.di + +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalTextToolbar +import androidx.compose.ui.platform.TextToolbar + +@Composable +actual fun getCustomTextToolbar( + onShare: () -> Unit, + onQuote: () -> Unit, +): TextToolbar { + return LocalTextToolbar.current +} diff --git a/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt b/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt index 14043ae10..34b7b2b3b 100644 --- a/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt +++ b/core-commonui/src/androidMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt @@ -1,9 +1,5 @@ package com.github.diegoberaldin.raccoonforlemmy.core.commonui.di -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalView -import androidx.compose.ui.platform.TextToolbar -import com.github.diegoberaldin.raccoonforlemmy.core.commonui.CustomTextToolbar import com.github.diegoberaldin.raccoonforlemmy.core.commonui.ban.BanUserMviModel import com.github.diegoberaldin.raccoonforlemmy.core.commonui.chat.InboxChatMviModel import com.github.diegoberaldin.raccoonforlemmy.core.commonui.communityInfo.CommunityInfoMviModel @@ -133,18 +129,6 @@ actual fun getSelectCommunityViewModel(): SelectCommunityMviModel { } -@Composable -actual fun getCustomTextToolbar( - onShare: () -> Unit, - onQuote: () -> Unit, -): TextToolbar { - return CustomTextToolbar( - view = LocalView.current, - onShare = onShare, - onQuote = onQuote, - ) -} - actual fun getRemoveViewModel( postId: Int?, commentId: Int?, @@ -181,4 +165,4 @@ actual fun getBanUserViewModel( ) }) return res -} \ No newline at end of file +} diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt index 49dbed016..5a8f32dc2 100644 --- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt +++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt @@ -1,7 +1,5 @@ package com.github.diegoberaldin.raccoonforlemmy.core.commonui.di -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.TextToolbar import com.github.diegoberaldin.raccoonforlemmy.core.commonui.ban.BanUserMviModel import com.github.diegoberaldin.raccoonforlemmy.core.commonui.chat.InboxChatMviModel import com.github.diegoberaldin.raccoonforlemmy.core.commonui.communityInfo.CommunityInfoMviModel @@ -70,12 +68,6 @@ expect fun getCreateReportViewModel( commentId: Int? = null, ): CreateReportMviModel -@Composable -expect fun getCustomTextToolbar( - onShare: () -> Unit, - onQuote: () -> Unit, -): TextToolbar - expect fun getSelectCommunityViewModel(): SelectCommunityMviModel expect fun getRemoveViewModel( diff --git a/core-commonui/src/iosMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt b/core-commonui/src/iosMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt index 58441dacc..6a2c6d0e5 100644 --- a/core-commonui/src/iosMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt +++ b/core-commonui/src/iosMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/di/Utils.kt @@ -1,8 +1,5 @@ package com.github.diegoberaldin.raccoonforlemmy.core.commonui.di -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalTextToolbar -import androidx.compose.ui.platform.TextToolbar import com.github.diegoberaldin.raccoonforlemmy.core.commonui.ban.BanUserMviModel import com.github.diegoberaldin.raccoonforlemmy.core.commonui.chat.InboxChatMviModel import com.github.diegoberaldin.raccoonforlemmy.core.commonui.communityInfo.CommunityInfoMviModel @@ -231,11 +228,3 @@ object CommonUiViewModelHelper : KoinComponent { return model } } - -@Composable -actual fun getCustomTextToolbar( - onShare: () -> Unit, - onQuote: () -> Unit, -): TextToolbar { - return LocalTextToolbar.current -} diff --git a/feature-home/build.gradle.kts b/feature-home/build.gradle.kts index 739991e7b..d34c8752f 100644 --- a/feature-home/build.gradle.kts +++ b/feature-home/build.gradle.kts @@ -52,6 +52,7 @@ kotlin { implementation(projects.coreCommonui) implementation(projects.coreCommonui.components) implementation(projects.coreCommonui.lemmyui) + implementation(projects.coreCommonui.modals) implementation(projects.coreNotifications) implementation(projects.domainIdentity) diff --git a/feature-inbox/build.gradle.kts b/feature-inbox/build.gradle.kts index 0dd3a12d9..0acc016b9 100644 --- a/feature-inbox/build.gradle.kts +++ b/feature-inbox/build.gradle.kts @@ -50,6 +50,7 @@ kotlin { implementation(projects.coreCommonui) implementation(projects.coreCommonui.components) implementation(projects.coreCommonui.lemmyui) + implementation(projects.coreCommonui.modals) implementation(projects.coreUtils) implementation(projects.corePreferences) implementation(projects.corePersistence) diff --git a/feature-profile/build.gradle.kts b/feature-profile/build.gradle.kts index 07843255b..6d2d1a8a7 100644 --- a/feature-profile/build.gradle.kts +++ b/feature-profile/build.gradle.kts @@ -53,6 +53,7 @@ kotlin { implementation(projects.coreCommonui) implementation(projects.coreCommonui.components) implementation(projects.coreCommonui.lemmyui) + implementation(projects.coreCommonui.modals) implementation(projects.corePreferences) implementation(projects.coreNotifications) implementation(projects.corePersistence) diff --git a/feature-search/build.gradle.kts b/feature-search/build.gradle.kts index 401521fe7..bd571039d 100644 --- a/feature-search/build.gradle.kts +++ b/feature-search/build.gradle.kts @@ -52,6 +52,7 @@ kotlin { implementation(projects.coreCommonui) implementation(projects.coreCommonui.components) implementation(projects.coreCommonui.lemmyui) + implementation(projects.coreCommonui.modals) implementation(projects.coreNotifications) implementation(projects.domainIdentity) diff --git a/feature-settings/build.gradle.kts b/feature-settings/build.gradle.kts index c0f97f4d4..1e0c3149d 100644 --- a/feature-settings/build.gradle.kts +++ b/feature-settings/build.gradle.kts @@ -51,6 +51,7 @@ kotlin { implementation(projects.coreCommonui) implementation(projects.coreCommonui.components) implementation(projects.coreCommonui.lemmyui) + implementation(projects.coreCommonui.modals) implementation(projects.coreNotifications) implementation(projects.resources) implementation(projects.domainLemmy.data) diff --git a/settings.gradle.kts b/settings.gradle.kts index e5b8d6736..a9f1049df 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,6 +29,7 @@ include(":core-md") include(":core-commonui") include(":core-commonui:components") include(":core-commonui:lemmyui") +include(":core-commonui:modals") include(":core-notifications") include(":core-persistence") include(":core-navigation")