fix-ups for Non-Mac system

2024-10-18 04:44:32 +02:00 · 2021-05-08 23:20:49 +05:30 · 2021-05-08 23:20:49 +05:30 · 789818474e
commit 789818474e
parent 1776b67306
11 changed files with 110 additions and 93 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -29,7 +29,6 @@ allprojects {
        maven(url = "https://dl.bintray.com/ekito/koin")
        maven(url = "https://kotlin.bintray.com/kotlinx/")
        maven(url = "https://dl.bintray.com/icerockdev/moko")
-        // maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers/")
        maven(url = "https://dl.bintray.com/kotlin/kotlin-js-wrappers")
        maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev")
    }
--- a/common/compose/src/androidMain/kotlin/com/shabinder/common/uikit/AndroidImages.kt
+++ b/common/compose/src/androidMain/kotlin/com/shabinder/common/uikit/AndroidImages.kt
@ -18,52 +18,16 @@

 package com.shabinder.common.uikit

-import androidx.compose.animation.Crossfade
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.Image
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ImageBitmap
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import com.shabinder.common.database.R
-import com.shabinder.common.di.Picture
-import com.shabinder.common.di.dispatcherIO
-import com.shabinder.common.models.methods
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.withContext

-@Composable
-actual fun ImageLoad(
-    link: String,
-    loader: suspend (String) -> Picture,
-    desc: String,
-    modifier: Modifier,
-    // placeholder: ImageVector
-) {
-    var pic by remember(link) { mutableStateOf<ImageBitmap?>(null) }
-
-    LaunchedEffect(link) {
-        withContext(dispatcherIO) {
-            pic = loader(link).image
-        }
-    }
-
-    Crossfade(pic) {
-        if (it == null) {
-            Image(PlaceHolderImage(), desc, modifier, contentScale = ContentScale.Crop)
-        } else Image(it, desc, modifier, contentScale = ContentScale.Crop)
-    }
-}

 actual fun montserratFont() = FontFamily(
    Font(R.font.montserrat_light, FontWeight.Light),
--- a/common/compose/src/androidMain/kotlin/com/shabinder/common/uikit/ImageLoad.kt
+++ b/common/compose/src/androidMain/kotlin/com/shabinder/common/uikit/ImageLoad.kt
@ -0,0 +1,35 @@
+package com.shabinder.common.uikit
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.Image
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import com.shabinder.common.di.Picture
+import com.shabinder.common.di.dispatcherIO
+import kotlinx.coroutines.withContext
+
+
+@Composable
+actual fun ImageLoad(
+    link: String,
+    loader: suspend (String) -> Picture,
+    desc: String,
+    modifier: Modifier,
+    // placeholder: ImageVector
+) {
+    var pic by remember(link) { mutableStateOf<ImageBitmap?>(null) }
+
+    LaunchedEffect(link) {
+        withContext(dispatcherIO) {
+            pic = loader(link).image
+        }
+    }
+
+    Crossfade(pic) {
+        if (it == null) {
+            Image(PlaceHolderImage(), desc, modifier, contentScale = ContentScale.Crop)
+        } else Image(it, desc, modifier, contentScale = ContentScale.Crop)
+    }
+}
--- a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/ExpectImages.kt
+++ b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/ExpectImages.kt
@ -22,15 +22,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import com.shabinder.common.di.Picture

-@Composable
-expect fun ImageLoad(
-    link: String,
-    loader: suspend (String) -> Picture,
-    desc: String = "Album Art",
-    modifier: Modifier = Modifier,
-    // placeholder:Painter = PlaceHolderImage()
-)
-
@Composable
 expect fun DownloadImageTick()

--- a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/ImageLoad.kt
+++ b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/ImageLoad.kt
@ -0,0 +1,14 @@
+package com.shabinder.common.uikit
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.shabinder.common.di.Picture
+
+@Composable
+expect fun ImageLoad(
+    link: String,
+    loader: suspend (String) -> Picture,
+    desc: String = "Album Art",
+    modifier: Modifier = Modifier,
+    // placeholder:Painter = PlaceHolderImage()
+)
--- a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/SpotiFlyerMainUi.kt
+++ b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/SpotiFlyerMainUi.kt
@ -424,14 +424,14 @@ fun HistoryColumn(
                    modifier = Modifier.padding(top = 8.dp).fillMaxSize()
                )

-                VerticalScrollbar(
+                /*VerticalScrollbar(
                    modifier = Modifier.padding(end = 2.dp).align(Alignment.CenterEnd).fillMaxHeight(),
                    adapter = rememberScrollbarAdapter(
                        scrollState = listState,
                        itemCount = itemList.size,
                        averageItemSize = 70.dp
                    )
-                )
+                )*/
            }
        }
    }
--- a/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt
+++ b/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt
@ -39,26 +39,6 @@ import com.shabinder.common.di.dispatcherIO
 import com.shabinder.common.models.methods
 import kotlinx.coroutines.withContext

-@Composable
-actual fun ImageLoad(
-    link: String,
-    loader: suspend (String) -> Picture,
-    desc: String,
-    modifier: Modifier,
-    // placeholder: ImageVector
-) {
-    var pic by remember(link) { mutableStateOf<ImageBitmap?>(null) }
-    LaunchedEffect(link) {
-        withContext(dispatcherIO) {
-            pic = loader(link).image
-        }
-    }
-
-    Crossfade(pic) {
-        if (it == null) Image(PlaceHolderImage(), desc, modifier, contentScale = ContentScale.Crop) else Image(it, desc, modifier, contentScale = ContentScale.Crop)
-    }
-}
-
@Composable
 actual fun DownloadImageTick() {
    Image(
--- a/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/ImageLoad.kt
+++ b/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/ImageLoad.kt
@ -0,0 +1,32 @@
+package com.shabinder.common.uikit
+
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.Image
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import com.shabinder.common.di.Picture
+import com.shabinder.common.di.dispatcherIO
+import kotlinx.coroutines.withContext
+
+@Composable
+actual fun ImageLoad(
+    link: String,
+    loader: suspend (String) -> Picture,
+    desc: String,
+    modifier: Modifier,
+    // placeholder: ImageVector
+) {
+    var pic by remember(link) { mutableStateOf<ImageBitmap?>(null) }
+    LaunchedEffect(link) {
+        withContext(dispatcherIO) {
+            pic = loader(link).image
+        }
+    }
+
+    Crossfade(pic) {
+        if (it == null) Image(PlaceHolderImage(), desc, modifier, contentScale = ContentScale.Crop) else Image(it, desc, modifier, contentScale = ContentScale.Crop)
+    }
+}
--- a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/Actions.kt
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/Actions.kt
@ -42,7 +42,7 @@ interface Actions {
 }


-private fun stubActions() = object :Actions {
+private fun stubActions(): Actions = object :Actions {
    override val platformActions = StubPlatformActions
    override fun showPopUpMessage(string: String, long: Boolean) {}
    override fun setDownloadDirectoryAction() {}
--- a/common/root/build.gradle.kts
+++ b/common/root/build.gradle.kts
@ -68,33 +68,36 @@ kotlin {
            }
        }
    }
-
-    /*Required to Export `packForXcode`*/
-    sourceSets {
-        named("iosMain") {
-            dependencies {
-                api(project(":common:dependency-injection"))
-                api(project(":common:data-models"))
-                api(project(":common:database"))
-                api(project(":common:list"))
-                api(project(":common:main"))
-                api(Decompose.decompose)
-                api(MVIKotlin.mvikotlinMain)
-                api(MVIKotlin.mvikotlinLogging)
+    if(HostOS.isMac){
+        /*Required to Export `packForXcode`*/
+        sourceSets {
+            named("iosMain") {
+                dependencies {
+                    api(project(":common:dependency-injection"))
+                    api(project(":common:data-models"))
+                    api(project(":common:database"))
+                    api(project(":common:list"))
+                    api(project(":common:main"))
+                    api(Decompose.decompose)
+                    api(MVIKotlin.mvikotlinMain)
+                    api(MVIKotlin.mvikotlinLogging)
+                }
            }
        }
    }
 }

 val packForXcode by tasks.creating(Sync::class) {
-    group = "build"
-    val mode = System.getenv("CONFIGURATION") ?: "DEBUG"
-    val targetName = "ios"
-    val framework = kotlin.targets.getByName<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget>(targetName)
-        .binaries.getFramework(mode)
-    inputs.property("mode", mode)
-    dependsOn(framework.linkTask)
-    val targetDir = File(buildDir, "xcode-frameworks")
-    from(framework.outputDirectory)
-    into(targetDir)
+    if(HostOS.isMac){
+        group = "build"
+        val mode = System.getenv("CONFIGURATION") ?: "DEBUG"
+        val targetName = "ios"
+        val framework = kotlin.targets.getByName<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget>(targetName)
+            .binaries.getFramework(mode)
+        inputs.property("mode", mode)
+        dependsOn(framework.linkTask)
+        val targetDir = File(buildDir, "xcode-frameworks")
+        from(framework.outputDirectory)
+        into(targetDir)
+    }
 }
--- a/desktop/src/jvmMain/kotlin/Main.kt
+++ b/desktop/src/jvmMain/kotlin/Main.kt
@ -47,7 +47,6 @@ import java.awt.Desktop
 import java.net.URI
 import javax.swing.JFileChooser
 import javax.swing.JFileChooser.APPROVE_OPTION
-import javax.swing.JFileChooser.CANCEL_OPTION

 private val koin = initKoin(enableNetworkLogs = true).koin
 private lateinit var showToast: (String)->Unit