avdim · avdim · Jan 22, 2022 · Jan 22, 2022 · Jan 22, 2022 · Jan 22, 2022
diff --git a/include-config/build.gradle.kts b/include-config/build.gradle.kts
@@ -11,6 +11,13 @@ kotlin {
     js(IR) {
         browser()
     }
+    ios {
+        binaries {
+            framework {
+                baseName = "config"
+            }
+        }
+    }
     sourceSets {
         val commonMain by getting {
             dependencies {

diff --git a/include-mapview/build.gradle.kts b/include-mapview/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
                 implementation("com.map:model:1.0-SNAPSHOT")
                 implementation("com.map:tile-image:1.0-SNAPSHOT")
                 implementation(compose.runtime)
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
             }
         }
         val androidMain by getting {

diff --git a/include-model/build.gradle.kts b/include-model/build.gradle.kts
@@ -11,11 +11,18 @@ kotlin {
     js(IR) {
         browser()
     }
+    ios {
+        binaries {
+            framework {
+                baseName = "model"
+            }
+        }
+    }
     sourceSets {
         val commonMain by getting {
             dependencies {
                 implementation("com.map:config:1.0-SNAPSHOT")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
             }
         }
         val jsMain by getting {

diff --git a/include-model/src/jsMain/kotlin/com/map/Time_js.kt b/include-model/src/jsMain/kotlin/com/map/Time_js.kt
diff --git a/include-secret/build.gradle.kts b/include-secret/build.gradle.kts
@@ -12,6 +12,13 @@ kotlin {
     js(IR) {
         browser()
     }
+    ios {
+        binaries {
+            framework {
+                baseName = "secret"
+            }
+        }
+    }
     sourceSets {
         val commonMain by getting {
             dependencies {

diff --git a/include-tile-image/build.gradle.kts b/include-tile-image/build.gradle.kts
@@ -12,29 +12,43 @@ kotlin {
     js(IR) {
         browser()
     }
+    ios {
+        binaries {
+            framework {
+                baseName = "tileimage"
+            }
+        }
+    }
     sourceSets {
         val commonMain by getting {
             dependencies {
                 implementation("com.map:config:1.0-SNAPSHOT")
-                api(compose.runtime)
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
             }
         }
         val androidMain by getting {
             dependencies {
                 api(compose.foundation)
+                api(compose.runtime)
             }
         }
         val desktopMain by getting {
             dependencies {
                 api(compose.foundation)
+                api(compose.runtime)
             }
         }
         val jsMain by getting {
             dependencies {
+                api(compose.runtime)
                 implementation(npm("colors", "=1.4.0"))//temp vulnerability fix, use strict version 1.4.0
             }
         }
+        val iosMain by getting {
+            dependencies {
+
+            }
+        }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))

diff --git a/include-tile-image/src/commonMain/kotlin/com/map/SearchOrCrop.kt b/include-tile-image/src/commonMain/kotlin/com/map/SearchOrCrop.kt
@@ -4,7 +4,7 @@ import kotlin.math.max
 
 /**
  * Из кэша найти графику для нужного тайла.
- * Если нужной графики нету, то можно тайли tile с меньшим zoom и вырезать из него кусочек.
+ * Если нужной графики нету, то можно найти tile с меньшим zoom и вырезать из него кусочек.
  */
 fun Map<Tile, TileImage>.searchOrCrop(tile: Tile): TileImage? {
     val img1 = get(tile)

diff --git a/include-tile-image/src/iosMain/kotlin/com/map/TileImage_ios.kt b/include-tile-image/src/iosMain/kotlin/com/map/TileImage_ios.kt
@@ -0,0 +1,25 @@
+package com.map
+
+import platform.CoreGraphics.*
+import platform.Foundation.*
+import platform.UIKit.*
+import platform.posix.*
+
+
+//typealias ImageIos = CGImage
+typealias ImageIos = UIImage
+
+actual class TileImage(
+    val platformSpecificData: ImageIos,
+    actual val offsetX: Int = 0,
+    actual val offsetY: Int = 0,
+    actual val cropSize: Int = TILE_SIZE,
+) {
+    actual fun lightweightDuplicate(offsetX: Int, offsetY: Int, cropSize: Int): TileImage =
+        TileImage(
+            platformSpecificData,
+            offsetX = offsetX,
+            offsetY = offsetY,
+            cropSize = cropSize
+        )
+}
diff --git a/...ndroidMain/kotlin/com/map/Time_android.kt → ...ndroidMain/kotlin/com/map/Time_android.kt b/...ndroidMain/kotlin/com/map/Time_android.kt → ...ndroidMain/kotlin/com/map/Time_android.kt
diff --git a/.../commonMain/kotlin/com/map/Time_common.kt → .../commonMain/kotlin/com/map/Time_common.kt b/.../commonMain/kotlin/com/map/Time_common.kt → .../commonMain/kotlin/com/map/Time_common.kt
diff --git a/...esktopMain/kotlin/com/map/Time_desktop.kt → ...esktopMain/kotlin/com/map/Time_desktop.kt b/...esktopMain/kotlin/com/map/Time_desktop.kt → ...esktopMain/kotlin/com/map/Time_desktop.kt
diff --git a/include-ui-browser/src/jsMain/kotlin/com/map/Time_js.kt b/include-ui-browser/src/jsMain/kotlin/com/map/Time_js.kt
@@ -0,0 +1,3 @@
+package com.map
+
+inline fun timeMs(): Long = kotlin.js.Date.now().toLong()
diff --git a/ioshelper/build.gradle.kts b/ioshelper/build.gradle.kts
@@ -0,0 +1,41 @@
+plugins {
+    kotlin("multiplatform")
+}
+
+repositories {
+    google()
+    mavenCentral()
+}
+
+kotlin {
+//    android()
+    ios {
+        binaries {
+            framework {
+                baseName = "ioshelper"
+            }
+        }
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation("com.map:config:1.0-SNAPSHOT")
+                implementation("com.map:model:1.0-SNAPSHOT")
+                implementation("com.map:tile-image:1.0-SNAPSHOT")
+                implementation("com.map:secret:1.0-SNAPSHOT")//todo bad
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+        val iosMain by getting {
+            dependencies {
+                implementation("com.soywiz.korlibs.korim:korim:2.2.2")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
+            }
+        }
+        val iosTest by getting
+    }
+}
diff --git a/ioshelper/src/iosMain/kotlin/com/map/MapStoreAdapter.kt b/ioshelper/src/iosMain/kotlin/com/map/MapStoreAdapter.kt
@@ -0,0 +1,33 @@
+package com.map
+
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+
+class MapStoreAdapter(val sideEffectHandler: (Store<MapState<TileImage>, MapIntent<TileImage>>, MapSideEffect) -> Unit) {
+    val scope = MainScope()
+    val store: Store<MapState<TileImage>, MapIntent<TileImage>> = scope.createMapStore(
+        latitude = 0.0,
+        longitude = 0.0,
+        startScale = 1.0,
+        searchOrCropOrNull = { searchOrCrop(it) },
+    ) { store, sideEffect ->
+        sideEffectHandler(store, sideEffect)
+    }
+
+    fun sendIntent(intent: MapIntent<TileImage>) {
+        store.send(intent)
+    }
+
+    fun getLastState(): MapState<TileImage> {
+        return store.stateFlow.value
+    }
+
+    fun addListener(listener: (MapState<TileImage>) -> Unit) {
+        scope.launch {
+            store.stateFlow.collectLatest {
+                listener(it)
+            }
+        }
+    }
+}
diff --git a/ioshelper/src/iosMain/kotlin/com/map/SwiftHelpers.kt b/ioshelper/src/iosMain/kotlin/com/map/SwiftHelpers.kt
@@ -0,0 +1,27 @@
+package com.map
+
+import platform.CoreGraphics.*
+
+fun sideEffectAsLoadTile(effect: MapSideEffect): MapSideEffect.LoadTile? {
+    return when (effect) {
+        is MapSideEffect.LoadTile -> effect
+        else -> null
+    }
3D11}
+
+fun createIntentTileLoaded(tile: Tile, imageIos: ImageIos /*CGImage*/) = MapIntent.TileImageLoaded<TileImage>(
+    tile = tile,
+    image = TileImage(
+        platformSpecificData = imageIos,
+    )
+)
+
+fun createIntentMove(x: Int, y: Int) = MapIntent.Input.Move<TileImage>(Pt(x, y))
+fun createIntentZoom(x: Int, y: Int, delta: Float) = MapIntent.Input.Zoom<TileImage>(Pt(x, y), delta.toDouble())
+fun createIntentSetSize(width:Int, height:Int) = MapIntent.Input.SetSize<TileImage>(width, height)
+
+fun createTileUrl(tile: Tile): String {
+    return Config.createTileUrl(tile.zoom, tile.x, tile.y, mapTilerSecretKey = MAPTILER_SECRET_KEY)
+}
+
+fun extract(tileImage: TileImage) = tileImage.platformSpecificData
diff --git a/sample-ios/build.gradle.kts b/sample-ios/build.gradle.kts
@@ -0,0 +1,22 @@
+plugins {
+    id("org.jetbrains.gradle.apple.applePlugin") version "212.4638.14-0.14"
+}
+
+apple {
+    iosApp {
+        productName = "mapviewios"
+
+        sceneDelegateClass = "SceneDelegate"
+        launchStoryboard = "LaunchScreen"
+
+        //productInfo["NSAppTransportSecurity"] = mapOf("NSAllowsArbitraryLoads" to true)
+        //buildSettings.OTHER_LDFLAGS("")
+
+        dependencies {
+            implementation("com.map:config:1.0-SNAPSHOT")
+            implementation("com.map:model:1.0-SNAPSHOT")
+            implementation("com.map:tile-image:1.0-SNAPSHOT")
+            implementation(project(":ioshelper"))
+        }
+    }
+}
diff --git a/sample-ios/src/iosAppMain/apple/AppDelegate.swift b/sample-ios/src/iosAppMain/apple/AppDelegate.swift
@@ -0,0 +1,16 @@
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        return true
+    }
+
+    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+    }
+
+    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
+    }
+}
+
diff --git a/sample-ios/src/iosAppMain/apple/Assets.xcassets/AppIcon.appiconset/Contents.json b/sample-ios/src/iosAppMain/apple/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/sample-ios/src/iosAppMain/apple/Assets.xcassets/Contents.json b/sample-ios/src/iosAppMain/apple/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.map

		inline fun timeMs(): Long = kotlin.js.Date.now().toLong()