chore: Fix iOS build

Author: ishubhamsingh

.fleet/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": true
+}

composeApp/src/androidMain/kotlin/dev/ishubhamsingh/splashy/core/utils/CommonUtils.kt

@@ -15,16 +15,12 @@
  */
 package dev.ishubhamsingh.splashy.core.utils
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
 import androidx.core.view.WindowCompat
 import dev.ishubhamsingh.splashy.BuildConfig
 import io.ktor.client.HttpClient
@@ -50,14 +46,6 @@ actual fun getHttpClient(): HttpClient {
   return httpClient
 }
 
-@SuppressLint("DiscouragedApi")
-@Composable
-actual fun font(name: String, res: String, weight: FontWeight, style: FontStyle): Font {
-  val context = LocalContext.current
-  val id = context.resources.getIdentifier(res, "font", context.packageName)
-  return Font(id, weight, style)
-}
-
 actual fun getFormattedDateTime(timestamp: String, format: String): String {
   val date = ZonedDateTime.parse(timestamp)
   val formatter = DateTimeFormatter.ofPattern(format)

composeApp/src/commonMain/kotlin/dev/ishubhamsingh/splashy/core/utils/CommonUtils.kt

@@ -17,15 +17,10 @@ package dev.ishubhamsingh.splashy.core.utils
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
 import io.ktor.client.HttpClient
 
 expect fun getHttpClient(): HttpClient
 
-@Composable expect fun font(name: String, res: String, weight: FontWeight, style: FontStyle): Font
-
 expect fun getFormattedDateTime(timestamp: String, format: String = "dd MMM yyyy, hh:mm a"): String
 
 expect fun getPlatform(): Platform

composeApp/src/iosMain/kotlin/dev/ishubhamsingh/splashy/core/utils/CommonUtils.kt

@@ -20,15 +20,10 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.darwin.Darwin
 import kotlin.experimental.ExperimentalNativeApi
 import kotlin.native.Platform as NativePlatform
-import kotlinx.coroutines.runBlocking
-import org.jetbrains.compose.resources.ExperimentalResourceApi
-import org.jetbrains.compose.resources.resource
 import platform.Foundation.NSDateFormatter
 import platform.Foundation.NSISO8601DateFormatter
 import platform.Foundation.NSLocale
@@ -52,15 +47,6 @@ actual fun getHttpClient(): HttpClient {
 
 private val cache: MutableMap<String, Font> = mutableMapOf()
 
-@OptIn(ExperimentalResourceApi::class, ExperimentalResourceApi::class)
-@Composable
-actual fun font(name: String, res: String, weight: FontWeight, style: FontStyle): Font {
-  return cache.getOrPut(res) {
-    val byteArray = runBlocking { resource("font/$res.ttf").readBytes() }
-    androidx.compose.ui.text.platform.Font(res, byteArray, weight, style)
-  }
-}
-
 actual fun getFormattedDateTime(timestamp: String, format: String): String {
   val date = NSISO8601DateFormatter().dateFromString(timestamp) ?: return ""
 

composeApp/src/iosMain/kotlin/dev/ishubhamsingh/splashy/core/utils/FileUtils.kt

@@ -16,8 +16,10 @@
 package dev.ishubhamsingh.splashy.core.utils
 
 import com.eygraber.uri.Uri
-import dev.ishubhamsingh.splashy.core.presentation.CommonRes
 import dev.ishubhamsingh.splashy.features.details.WallpaperScreenType
+import dev.ishubhamsingh.splashy.resources.Res
+import dev.ishubhamsingh.splashy.resources.saved_failure_message
+import dev.ishubhamsingh.splashy.resources.saved_success_message
 import kotlin.coroutines.coroutineContext
 import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.ExperimentalForeignApi
@@ -27,6 +29,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import kotlinx.coroutines.launch
+import org.jetbrains.compose.resources.getString
 import platform.Foundation.NSData
 import platform.Foundation.create
 import platform.UIKit.UIImage
@@ -55,11 +58,11 @@ actual class FileUtils {
           }
         }
         .onSuccess {
-          result = CommonRes.saved_success_message
+          result = getString(Res.string.saved_success_message)
           updateMessage.invoke(result)
         }
         .onFailure {
-          result = CommonRes.saved_failure_message
+          result = getString(Res.string.saved_failure_message)
           updateMessage.invoke(result)
           it.printStackTrace()
         }