Skip to content

[DO NOT MERGE] add share menu in ios #2035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Tlaster wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[DO NOT MERGE] add share menu in ios #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions app/src/main/java/dev/dimension/flare/ui/screen/compose/ComposeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,13 @@ fun ShortcutComposeRoute(
initialText: String = "",
initialMedias: ImmutableList<Uri> = persistentListOf(),
) {
val activeAccountState by producePresenter(key = "shortcut_compose_active_account") {
activeAccountPresenter()
}
val accountType =
activeAccountState.user
.takeSuccess()
?.let { AccountType.Specific(it.key) }
?: AccountType.Guest
FlareTheme {
CompositionLocalProvider(
LocalContentColor provides MaterialTheme.colorScheme.onBackground,
) {
ComposeScreen(
onBack = onBack,
accountType = accountType,
accountType = null,
initialText = initialText,
initialMedias = initialMedias,
)
Expand Down
99 changes: 85 additions & 14 deletions compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/ComposeUIHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,26 @@ import coil3.SingletonImageLoader
import coil3.annotation.ExperimentalCoilApi
import coil3.network.ktor3.KtorNetworkFetcherFactory
import coil3.request.crossfade
import dev.dimension.flare.common.GlobalConfig
import dev.dimension.flare.common.InAppNotification
import dev.dimension.flare.common.Message
import dev.dimension.flare.common.SwiftOnDeviceAI
import dev.dimension.flare.data.database.migrateDatabase
import dev.dimension.flare.data.network.ktorClient
import dev.dimension.flare.di.KoinHelper
import dev.dimension.flare.ui.humanizer.SwiftFormatter
import dev.dimension.flare.ui.render.PlatformText
import dev.dimension.flare.ui.render.RenderContent
import dev.dimension.flare.ui.render.SwiftPlatformTextRenderer
import kotlinx.collections.immutable.ImmutableList
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.koin.core.context.startKoin
import org.koin.dsl.bind
import org.koin.dsl.module
import platform.Foundation.NSArray

public object ComposeUIHelper {
@OptIn(ExperimentalCoilApi::class)
Expand All @@ -27,7 +33,13 @@ public object ComposeUIHelper {
swiftFormatter: SwiftFormatter,
swiftPlatformTextRenderer: SwiftPlatformTextRenderer,
swiftOnDeviceAI: SwiftOnDeviceAI,
isMainApp: Boolean,
) {
if (isMainApp) {
migrateDatabase()
} else {
GlobalConfig.disableLogging = true
}
startKoin {
modules(KoinHelper.modules())
modules(
Expand All @@ -47,20 +59,79 @@ public object ComposeUIHelper {
},
)
}
SingletonImageLoader.setSafe { context ->
ImageLoader
.Builder(context)
.components {
add(
KtorNetworkFetcherFactory(
httpClient =
ktorClient {
useDefaultTransformers = false
},
),
)
}.crossfade(true)
.build()
if (isMainApp) {
SingletonImageLoader.setSafe { context ->
ImageLoader
.Builder(context)
.components {
add(
KtorNetworkFetcherFactory(
httpClient =
ktorClient {
useDefaultTransformers = false
},
),
)
}.crossfade(true)
.build()
}
}
}

public fun initializeLite() {
GlobalConfig.disableLogging = true
startKoin {
modules(KoinHelper.modules())
modules(
module {
single {
object : InAppNotification {
override fun onProgress(
message: Message,
progress: Int,
total: Int,
) {
}

override fun onSuccess(message: Message) {
}

override fun onError(
message: Message,
throwable: Throwable,
) {
}
}
} bind InAppNotification::class
single {
object : SwiftFormatter {
override fun formatNumber(number: Long): String = number.toString()
}
} bind SwiftFormatter::class
single {
object : SwiftOnDeviceAI {
override suspend fun isAvailable(): Boolean = false

override suspend fun translate(
source: String,
targetLanguage: String,
prompt: String,
): String? = null

override suspend fun tldr(
source: String,
targetLanguage: String,
prompt: String,
): String? = null
}
} bind SwiftOnDeviceAI::class
single {
object : SwiftPlatformTextRenderer {
override fun render(renderRuns: ImmutableList<RenderContent>): PlatformText = NSArray()
}
} bind SwiftPlatformTextRenderer::class
},
)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx64g -Dfile.encoding=UTF-8
android.useAndroidX=true
kotlin.code.style=official
android.nonTransitiveRClass=true
Expand Down
Loading