v0.2.4

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

app/ios/iosApp/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.2</string>
+	<string>0.2.4</string>
 	<key>CFBundleVersion</key>
-	<string>022</string>
+	<string>024</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

app/shared/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.kotlin.multiplatform.library)
-    kotlin("plugin.serialization") version "1.9.22"
+    alias(libs.plugins.kotlin.serialization)
 }
 
 kotlin {

app/shared/src/commonMain/kotlin/ru/fromchat/Constants.kt

@@ -1,18 +0,0 @@
-package ru.fromchat
-
-import kotlinx.datetime.LocalDateTime
-import kotlinx.datetime.format.char
-
-val DATETIME_FORMAT = LocalDateTime.Format {
-    day()
-    char('.')
-    monthNumber()
-    char('.')
-    year()
-
-    char(' ')
-
-    hour()
-    char(':')
-    minute()
-}

app/shared/src/commonMain/kotlin/ru/fromchat/api/Models.kt

@@ -60,9 +60,7 @@ data class Message(
     val reply_to: Message? = null,
     val client_message_id: String? = null,
     val reactions: List<ReactionData>? = null
-) {
+)
-    val utcTimestamp = "${timestamp}Z"
-}
 
 @Serializable
 data class SendMessageRequest(

app/shared/src/commonMain/kotlin/ru/fromchat/api/WebSocketData.kt

@@ -36,8 +36,3 @@ data class TypingUpdateData(
     val userId: Int,
     val username: String
 )
-
-@Serializable
-data class WebSocketAuthMessage(
-    val token: String
-)

app/shared/src/commonMain/kotlin/ru/fromchat/core/Settings.kt

@@ -8,19 +8,75 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import ru.fromchat.ui.Theme
 
+/**
+ * Server configuration data
+ */
+data class ServerConfigData(
+    val serverUrl: String,
+    val httpsEnabled: Boolean
+)
+
 object Settings {
+    private const val MATERIAL_YOU_KEY = "materialYou"
+    private const val THEME_KEY = "theme"
+    private const val SERVER_URL_KEY = "server_url"
+    private const val HTTPS_ENABLED_KEY = "https_enabled"
+
     private val settings = Settings()
 
     private fun runIO(block: suspend CoroutineScope.() -> Unit) {
         CoroutineScope(Dispatchers.IO).launch(block = block)
     }
 
+    private fun serverConfigNotInitialized(): Nothing
+        = throw IllegalStateException("Server config not initialized")
+
     var materialYou: Boolean
-        get() = runBlocking { settings.getBoolean("materialYou", true) }
+        get() = runBlocking { settings.getBoolean(MATERIAL_YOU_KEY, true) }
-        set(value) = runIO { settings.putBoolean("materialYou", value) }
+        set(value) = runIO { settings.putBoolean(MATERIAL_YOU_KEY, value) }
 
     var theme: Theme
-        get() = runBlocking { Theme.entries[settings.getInt("theme", Theme.AsSystem.ordinal)] }
+        get() = runBlocking { Theme.entries[settings.getInt(THEME_KEY, Theme.AsSystem.ordinal)] }
-        set(value) = runIO { settings.putInt("theme", value.ordinal) }
+        set(value) = runIO { settings.putInt(THEME_KEY, value.ordinal) }
+
+    var serverUrl: String
+        get() = runBlocking {
+            settings.getString(SERVER_URL_KEY).ifEmpty {
+                serverConfigNotInitialized()
+            }
+        }
+        set(value) = runIO { settings.putString(SERVER_URL_KEY, value) }
+
+    var httpsEnabled: Boolean
+        get() = runBlocking {
+            if (settings.contains(HTTPS_ENABLED_KEY))
+                settings.getBoolean(HTTPS_ENABLED_KEY, true)
+            else serverConfigNotInitialized()
+        }
+        set(value) = runIO { settings.putBoolean(HTTPS_ENABLED_KEY, value) }
+
+    val hasServerConfig get() = try {
+        serverUrl
+        httpsEnabled
+        true
+    } catch (_: IllegalStateException) {
+        false
+    }
+
+    var serverConfig: ServerConfigData
+        get() {
+            if (!hasServerConfig) {
+                serverUrl = "fromchat.ru"
+                httpsEnabled = true
+
+                return ServerConfigData("fromchat.ru", true)
+            }
+
+            return ServerConfigData(serverUrl, httpsEnabled)
+        }
+        set(value) {
+            serverUrl = value.serverUrl
+            httpsEnabled = value.httpsEnabled
+        }
 }
 

app/shared/src/commonMain/kotlin/ru/fromchat/core/config/Config.kt

@@ -1,10 +1,10 @@
 package ru.fromchat.core.config
 
-import com.pr0gramm3r101.utils.storage.ServerConfigData
-import com.pr0gramm3r101.utils.storage.ServerConfigStorage
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import ru.fromchat.core.ServerConfigData
+import ru.fromchat.core.Settings
 
 /**
  * Application configuration
@@ -19,18 +19,15 @@ object Config {
     /**
      * Initialize configuration by loading from storage
      */
-    suspend fun initialize() {
+    fun initialize() {
-        _serverConfig.value = ServerConfigStorage.getConfig()
+        _serverConfig.value = Settings.serverConfig
-
-        // Set default values and prevent corruption
-        ServerConfigStorage.getConfig()
     }
     
     /**
      * Update server configuration
      */
-    suspend fun updateServerConfig(config: ServerConfigData) {
+    fun updateServerConfig(config: ServerConfigData) {
-        ServerConfigStorage.saveConfig(config)
+        Settings.serverConfig = config
         _serverConfig.value = config
     }
     
@@ -45,9 +42,4 @@ object Config {
      */
     val webSocketUrl
         get() = "${if (config.httpsEnabled) "wss" else "ws"}://${config.serverUrl}/api/chat/ws"
-    
-    /**
-     * Checks if server configuration exists
-     */
-    suspend fun hasServerConfig() = ServerConfigStorage.hasConfiguration()
 }

app/shared/src/commonMain/kotlin/ru/fromchat/ui/chat/ChatGradients.kt

@@ -26,6 +26,27 @@ fun getMessageGradient(isDark: Boolean) = Brush.linearGradient(
     end = Offset(1000f, 1000f)
 )
 
+/**
+ * Get gradient brush for own messages
+ */
+fun getReplyMessageGradient(isDark: Boolean) = Brush.linearGradient(
+    colors = if (isDark) {
+        listOf(
+            Color(0xFF5f11a6),
+            Color(0xFF1418da),
+            Color(0xFF1b3d73)
+        )
+    } else {
+        listOf(
+            Color(0xFF7836ee),
+            Color(0xFF2034f3),
+            Color(0xFF076eed)
+        )
+    },
+    start = Offset(0f, 0f),
+    end = Offset(1000f, 1000f)
+)
+
 /**
  * Generate a consistent gradient from a name for avatar fallback
  */

app/shared/src/commonMain/kotlin/ru/fromchat/ui/chat/ChatInput.kt

@@ -167,15 +167,12 @@ fun ChatInput(
         }
     }
 
-    Column(
-        Modifier.windowInsetsPadding(WindowInsets.navigationBars)
-    ) {
-        // Input field with blur
     Box(
         modifier = Modifier
             .fillMaxWidth()
             .background(Color.Transparent)
-                .padding(horizontal = 8.dp, vertical = 8.dp)
+            .windowInsetsPadding(WindowInsets.navigationBars)
+            .padding(start = 8.dp, end = 8.dp, bottom = 8.dp)
     ) {
         val shape = RoundedCornerShape(24.dp)
 
@@ -272,5 +269,4 @@ fun ChatInput(
             )
         }
     }
-    }
 }

app/shared/src/commonMain/kotlin/ru/fromchat/ui/chat/ChatScreen.kt

@@ -307,12 +307,13 @@ fun ChatScreen(
                 LazyColumn(
                     state = listState,
                     modifier = Modifier.fillMaxSize(), // Fill the entire space of the Box
-                    verticalArrangement = Arrangement.spacedBy(4.dp, alignment = Alignment.Bottom)
+                    verticalArrangement = Arrangement.spacedBy(4.dp, alignment = Alignment.Bottom),
+                    reverseLayout = true
                 ) {
-                    item { Spacer(Modifier.height(innerPadding.calculateTopPadding())) } // Spacer for TopAppBar
+                    item { Spacer(Modifier.height(innerPadding.calculateBottomPadding())) } // Spacer for chat input
 
                     items(
-                        items = panelState.messages,
+                        items = panelState.messages.reversed(),
                         key = { it.id }
                     ) { message ->
                         val isAuthor = message.user_id == currentUserId
@@ -349,7 +350,7 @@ fun ChatScreen(
                         }
                     }
 
-                    item { Spacer(Modifier.height(innerPadding.calculateBottomPadding())) } // Spacer for chat input
+                    item { Spacer(Modifier.height(innerPadding.calculateTopPadding())) } // Spacer for TopAppBar
                 }
             }
 

app/shared/src/commonMain/kotlin/ru/fromchat/ui/chat/MessageItem.kt

@@ -12,9 +12,12 @@ import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
@@ -27,12 +30,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.pr0gramm3r101.utils.conditional
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import ru.fromchat.api.Message
@@ -92,18 +95,11 @@ fun MessageItem(
                     .widthIn(max = 280.dp),
                 horizontalAlignment = if (isAuthor) Alignment.End else Alignment.Start
             ) {
-                // Reply preview
-                message.reply_to?.let { replyTo ->
-                    ReplyPreview(
-                        replyTo = replyTo,
-                        modifier = Modifier.padding(bottom = 4.dp)
-                    )
-                }
-
                 // Message bubble
                 val isDark = isSystemInDarkTheme()
                 Box(
                     modifier = Modifier
+                        .width(IntrinsicSize.Min)
                         .clip(
                             RoundedCornerShape(
                                 topStart = 20.dp,
@@ -112,9 +108,11 @@ fun MessageItem(
                                 bottomEnd = if (isAuthor) 8.dp else 20.dp
                             )
                         )
-                        .then(
+                        .conditional(
-                            if (isAuthor) {
+                            isAuthor,
-                                Modifier.shadow(
+                            `if` = {
+                                it
+                                    .shadow(
                                         elevation = 8.dp,
                                         shape = RoundedCornerShape(
                                             topStart = 20.dp,
@@ -124,23 +122,13 @@ fun MessageItem(
                                         ),
                                         spotColor = if (isDark) Color(0x66000000) else Color(0x33000000)
                                     )
-                            } else {
+                                    .background(getMessageGradient(isDark))
-                                Modifier
+                            },
+                            `else` = {
+                                background(MaterialTheme.colorScheme.surfaceContainerHighest)
                             }
                         )
-                        .background(
+                        .padding(top = 6.dp)
-                            brush = if (isAuthor) {
-                                getMessageGradient(isDark)
-                            } else {
-                                Brush.linearGradient(
-                                    listOf(
-                                        MaterialTheme.colorScheme.surfaceContainerHighest,
-                                        MaterialTheme.colorScheme.surfaceContainerHighest
-                                    )
-                                )
-                            }
-                        )
-                        .padding(horizontal = 12.dp, vertical = 8.dp)
                 ) {
                     Column {
                         // Username inside bubble (for received messages)
@@ -150,10 +138,59 @@ fun MessageItem(
                                 style = MaterialTheme.typography.labelMedium,
                                 fontWeight = FontWeight.SemiBold,
                                 color = MaterialTheme.colorScheme.primary,
-                                modifier = Modifier.padding(bottom = 4.dp)
+                                modifier = Modifier.padding(start = 12.dp, end = 12.dp, bottom = 4.dp)
                             )
                         }
 
+                        // Reply preview
+                        message.reply_to?.let { replyTo ->
+                            Box(
+                                Modifier.padding(bottom = 4.dp, start = 6.dp, end = 6.dp)
+                            ) {
+                                Row(
+                                    modifier = Modifier
+                                        .clip(RoundedCornerShape(12.dp))
+                                        .fillMaxWidth()
+                                        .height(IntrinsicSize.Min)
+                                        .conditional(
+                                            isAuthor,
+                                            `if` = {
+                                                background(getReplyMessageGradient(isDark))
+                                            },
+                                            `else` = {
+                                                background(MaterialTheme.colorScheme.surfaceVariant)
+                                            }
+                                        )
+                                ) {
+                                    Box(
+                                        Modifier
+                                            .background(MaterialTheme.colorScheme.primary)
+                                            .width(3.dp)
+                                            .fillMaxHeight()
+                                    )
+
+                                    Column(
+                                        Modifier.padding(horizontal = 8.dp, vertical = 6.dp)
+                                    ) {
+                                        Text(
+                                            text = replyTo.username,
+                                            style = MaterialTheme.typography.labelSmall,
+                                            fontWeight = FontWeight.SemiBold,
+                                            color = MaterialTheme.colorScheme.primary,
+                                            fontSize = 11.sp
+                                        )
+                                        Text(
+                                            text = replyTo.content.take(50) + if (replyTo.content.length > 50) "..." else "",
+                                            style = MaterialTheme.typography.bodySmall,
+                                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                            fontSize = 12.sp,
+                                            maxLines = 1
+                                        )
+                                    }
+                                }
+                            }
+                        }
+
                         // Message content
                         Text(
                             text = message.content,
@@ -162,12 +199,14 @@ fun MessageItem(
                                 Color.White
                             } else {
                                 MaterialTheme.colorScheme.onSurface
-                            }
+                            },
+                            modifier = Modifier.padding(horizontal = 12.dp)
                         )
 
                         // Timestamp and edited indicator
                         Row(
-                            modifier = Modifier.padding(top = 4.dp),
+                            modifier = Modifier
+                                .padding(start = 12.dp, end = 12.dp, top = 4.dp, bottom = 8.dp),
                             horizontalArrangement = Arrangement.End,
                             verticalAlignment = Alignment.CenterVertically
                         ) {
@@ -202,45 +241,17 @@ fun MessageItem(
     }
 }
 
-@Composable
-private fun ReplyPreview(
-    replyTo: Message,
-    modifier: Modifier = Modifier
-) {
-    Box(
-        modifier = modifier
-            .clip(RoundedCornerShape(16.dp))
-            .background(MaterialTheme.colorScheme.surfaceVariant)
-            .padding(horizontal = 8.dp, vertical = 6.dp)
-    ) {
-        Column {
-            Text(
-                text = replyTo.username,
-                style = MaterialTheme.typography.labelSmall,
-                fontWeight = FontWeight.SemiBold,
-                color = MaterialTheme.colorScheme.primary,
-                fontSize = 11.sp
-            )
-            Text(
-                text = replyTo.content.take(50) + if (replyTo.content.length > 50) "..." else "",
-                style = MaterialTheme.typography.bodySmall,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                fontSize = 12.sp,
-                maxLines = 1
-            )
-        }
-    }
-}
-
 @ExperimentalTime
 private fun formatTime(timestamp: String): String {
     return try {
-        val instant = Instant.parse(timestamp)
+        Instant.parse(timestamp).toLocalDateTime(TimeZone.currentSystemDefault()).let {
-        val localDateTime = instant.toLocalDateTime(TimeZone.currentSystemDefault())
+            "${
-        val hour = localDateTime.hour.toString().padStart(2, '0')
+                it.hour.toString().padStart(2, '0')
-        val minute = localDateTime.minute.toString().padStart(2, '0')
+            }:${
-        "$hour:$minute"
+                it.minute.toString().padStart(2, '0')
-    } catch (e: Exception) {
+            }"
+        }
+    } catch (_: Exception) {
         // Fallback: try parsing without timezone if it fails
         try {
             val parts = timestamp.split("T")
@@ -254,9 +265,8 @@ private fun formatTime(timestamp: String): String {
             } else {
                 ""
             }
-        } catch (e2: Exception) {
+        } catch (_: Exception) {
             ""
         }
     }
 }
-

app/shared/src/commonMain/kotlin/ru/fromchat/ui/setup/ServerConfigScreen.kt

@@ -40,13 +40,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
 import com.pr0gramm3r101.utils.navigateAndWipeBackStack
-import com.pr0gramm3r101.utils.storage.ServerConfigData
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.stringResource
 import ru.fromchat.Res
 import ru.fromchat.api.ApiClient
 import ru.fromchat.api.WebSocketManager
 import ru.fromchat.back
+import ru.fromchat.core.ServerConfigData
 import ru.fromchat.core.config.Config
 import ru.fromchat.https_enabled
 import ru.fromchat.save_continue

app/shared/src/iosMain/kotlin/ru/fromchat/MainViewController.kt

@@ -1,7 +1,8 @@
 package ru.fromchat
 
-import ru.fromchat.ui.App
 import androidx.compose.ui.window.ComposeUIViewController
+import ru.fromchat.ui.App
 
+@Suppress("unused")
 fun MainViewController() = ComposeUIViewController { App() }
 

gradle/libs.versions.toml

@@ -17,7 +17,8 @@ gson = "2.13.2"
 kotlinxIoBytestring = "0.8.2"
 kotlinxCoroutinesCore = "1.10.2"
 kotlinxIoCore = "0.8.2"
-kotlinxSerializationJson = "1.9.0"
+serialization = "2.3.0"
+serialization-json = "1.9.0"
 material = "1.13.0"
 activityKtx = "1.12.2"
 navigationCompose = "2.9.1"
@@ -45,7 +46,7 @@ kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", versio
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinxIoCore" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization-json" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activityKtx" }
 navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
@@ -76,3 +77,4 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
 android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.3.0" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization" }

utils/shared/src/androidMain/kotlin/com/pr0gramm3r101/utils/Utils.android.kt

@@ -720,6 +720,7 @@ val ActivityInfo.launchIntent get() = Intent().apply {
     flags = FLAG_ACTIVITY_NEW_TASK
 }
 
+@SuppressLint("QueryPermissionsNeeded")
 @RequiresPermission(Manifest.permission.QUERY_ALL_PACKAGES)
 fun ActivityInfo.isLauncher(context: Context): Boolean {
     with (context) {

utils/shared/src/androidMain/kotlin/com/pr0gramm3r101/utils/settings/AndroidSettings.kt

@@ -93,4 +93,15 @@ class AndroidSettings(): Settings {
             preferences.remove(stringSetPreferencesKey(key))
         }
     }
+
+    override suspend fun contains(key: String): Boolean {
+        return dataStore.data.map { preferences ->
+            preferences.contains(stringPreferencesKey(key)) ||
+                    preferences.contains(intPreferencesKey(key)) ||
+                    preferences.contains(longPreferencesKey(key)) ||
+                    preferences.contains(floatPreferencesKey(key)) ||
+                    preferences.contains(booleanPreferencesKey(key)) ||
+                    preferences.contains(stringSetPreferencesKey(key))
+        }.first()
+    }
 }

utils/shared/src/androidMain/kotlin/com/pr0gramm3r101/utils/settings/AsyncSettings.android.kt

@@ -1,128 +0,0 @@
-package com.pr0gramm3r101.utils.settings
-
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.booleanPreferencesKey
-import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.floatPreferencesKey
-import androidx.datastore.preferences.core.intPreferencesKey
-import androidx.datastore.preferences.core.longPreferencesKey
-import androidx.datastore.preferences.core.stringPreferencesKey
-import androidx.datastore.preferences.core.stringSetPreferencesKey
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-
-class AndroidAsyncSettings : AsyncSettings {
-    private val dataStore: DataStore<Preferences>
-        get() = DataStoreSingleton.dataStore
-    
-    override suspend fun putString(key: String, value: String) {
-        dataStore.edit { preferences ->
-            preferences[stringPreferencesKey(key)] = value
-        }
-    }
-    
-    override suspend fun getString(key: String, default: String): String {
-        return dataStore.data.map { preferences ->
-            preferences[stringPreferencesKey(key)] ?: default
-        }.first()
-    }
-    
-    override suspend fun putInt(key: String, value: Int) {
-        dataStore.edit { preferences ->
-            preferences[intPreferencesKey(key)] = value
-        }
-    }
-    
-    override suspend fun getInt(key: String, default: Int): Int {
-        return dataStore.data.map { preferences ->
-            preferences[intPreferencesKey(key)] ?: default
-        }.first()
-    }
-    
-    override suspend fun putLong(key: String, value: Long) {
-        dataStore.edit { preferences ->
-            preferences[longPreferencesKey(key)] = value
-        }
-    }
-    
-    override suspend fun getLong(key: String, default: Long): Long {
-        return dataStore.data.map { preferences ->
-            preferences[longPreferencesKey(key)] ?: default
-        }.first()
-    }
-    
-    override suspend fun putFloat(key: String, value: Float) {
-        dataStore.edit { preferences ->
-            preferences[floatPreferencesKey(key)] = value
-        }
-    }
-    
-    override suspend fun getFloat(key: String, default: Float): Float {
-        return dataStore.data.map { preferences ->
-            preferences[floatPreferencesKey(key)] ?: default
-        }.first()
-    }
-    
-    override suspend fun putBoolean(key: String, value: Boolean) {
-        dataStore.edit { preferences ->
-            preferences[booleanPreferencesKey(key)] = value
-        }
-    }
-    
-    override suspend fun getBoolean(key: String, default: Boolean): Boolean {
-        return dataStore.data.map { preferences ->
-            preferences[booleanPreferencesKey(key)] ?: default
-        }.first()
-    }
-    
-    override suspend fun putStringSet(key: String, value: Set<String>) {
-        dataStore.edit { preferences ->
-            preferences[stringSetPreferencesKey(key)] = value
-        }
-    }
-    
-    override suspend fun getStringSet(key: String, default: Set<String>): Set<String> {
-        return dataStore.data.map { preferences ->
-            preferences[stringSetPreferencesKey(key)] ?: default
-        }.first()
-    }
-    
-    override suspend fun putStringList(key: String, value: List<String>) {
-        putStringSet(key, value.toSet())
-    }
-    
-    override suspend fun getStringList(key: String, default: List<String>): List<String> {
-        return getStringSet(key, default.toSet()).toList()
-    }
-    
-    override suspend fun remove(key: String) {
-        dataStore.edit { preferences ->
-            preferences.remove(stringPreferencesKey(key))
-            preferences.remove(intPreferencesKey(key))
-            preferences.remove(longPreferencesKey(key))
-            preferences.remove(floatPreferencesKey(key))
-            preferences.remove(booleanPreferencesKey(key))
-            preferences.remove(stringSetPreferencesKey(key))
-        }
-    }
-    
-    override suspend fun contains(key: String): Boolean {
-        return dataStore.data.map { preferences ->
-            preferences.contains(stringPreferencesKey(key)) ||
-            preferences.contains(intPreferencesKey(key)) ||
-            preferences.contains(longPreferencesKey(key)) ||
-            preferences.contains(floatPreferencesKey(key)) ||
-            preferences.contains(booleanPreferencesKey(key)) ||
-            preferences.contains(stringSetPreferencesKey(key))
-        }.first()
-    }
-    
-    override suspend fun clear() {
-        dataStore.edit { preferences ->
-            preferences.clear()
-        }
-    }
-}
-
-actual val asyncSettings: AsyncSettings = AndroidAsyncSettings()

utils/shared/src/androidMain/kotlin/com/pr0gramm3r101/utils/settings/SettingsFactory.android.kt

@@ -1,3 +1,5 @@
 package com.pr0gramm3r101.utils.settings
 
 actual val settings: Settings get() = AndroidSettings()
+actual val secureSettings: Settings
+    get() = TODO("Not yet implemented")

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/utils/Compose.kt

@@ -1,5 +1,6 @@
 package com.pr0gramm3r101.utils
 
+import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 
 /**
@@ -21,18 +22,22 @@ fun NavController.navigateAndWipeBackStack(route: String, launchSingleTop: Boole
     val currentRoute = currentBackStackEntry?.destination?.route
 
     // Navigate to the new route, removing the current screen as well
-    if (currentRoute != null && currentRoute != route) {
     navigate(route) {
+        if (currentRoute != null && currentRoute != route) {
             popUpTo(currentRoute) {
                 inclusive = true
             }
-            this.launchSingleTop = launchSingleTop
         }
-    } else {
-        // Fallback: just navigate if current route is same or null
-        navigate(route) {
         this.launchSingleTop = launchSingleTop
     }
-    }
 }
 
+inline fun Modifier.conditional(
+    condition: Boolean,
+    `else`: Modifier.(Modifier) -> Modifier = { Modifier },
+    `if`: Modifier.(Modifier) -> Modifier
+) = if (condition) {
+    this + `if`(this)
+} else {
+    this + `else`(this)
+}

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/utils/settings/AsyncSettings.kt

@@ -1,37 +0,0 @@
-package com.pr0gramm3r101.utils.settings
-
-/**
- * Async version of Settings API using suspend functions
- */
-interface AsyncSettings {
-    suspend fun putString(key: String, value: String)
-    suspend fun getString(key: String, default: String = ""): String
-    
-    suspend fun putInt(key: String, value: Int)
-    suspend fun getInt(key: String, default: Int = 0): Int
-    
-    suspend fun putLong(key: String, value: Long)
-    suspend fun getLong(key: String, default: Long = 0L): Long
-    
-    suspend fun putFloat(key: String, value: Float)
-    suspend fun getFloat(key: String, default: Float = 0f): Float
-    
-    suspend fun putBoolean(key: String, value: Boolean)
-    suspend fun getBoolean(key: String, default: Boolean = false): Boolean
-    
-    suspend fun putStringSet(key: String, value: Set<String>)
-    suspend fun getStringSet(key: String, default: Set<String> = emptySet()): Set<String>
-    
-    suspend fun putStringList(key: String, value: List<String>)
-    suspend fun getStringList(key: String, default: List<String> = emptyList()): List<String>
-    
-    suspend fun remove(key: String)
-    
-    suspend fun contains(key: String): Boolean
-    suspend fun clear()
-}
-
-/**
- * Global async settings instance
- */
-expect val asyncSettings: AsyncSettings

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/utils/settings/Settings.kt

@@ -30,4 +30,6 @@ interface Settings {
     suspend fun getStringList(key: String, default: List<String> = emptyList()): List<String>
 
     suspend fun remove(key: String)
+
+    suspend fun contains(key: String): Boolean
 } 

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/utils/settings/SettingsFactory.kt

@@ -1,3 +1,4 @@
 package com.pr0gramm3r101.utils.settings
 
 expect val settings: Settings
+expect val secureSettings: Settings

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/utils/storage/AuthStorage.kt

@@ -1,29 +0,0 @@
-package com.pr0gramm3r101.utils.storage
-
-/**
- * Authentication token storage
- */
-object AuthStorage {
-    private val storage = NamespacedStorage("auth")
-    
-    suspend fun getToken(): String? {
-        val token = storage.getString("token")
-        return token.ifEmpty { null }
-    }
-    
-    suspend fun setToken(token: String?) {
-        if (token != null) {
-            storage.putString("token", token)
-        } else {
-            storage.remove("token")
-        }
-    }
-    
-    suspend fun clearToken() {
-        storage.remove("token")
-    }
-    
-    suspend fun putString(key: String, value: String) = storage.putString(key, value)
-    suspend fun getString(key: String, default: String = ""): String = storage.getString(key, default)
-    suspend fun remove(key: String) = storage.remove(key)
-}

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/utils/storage/ServerConfigStorage.kt

@@ -1,52 +0,0 @@
-package com.pr0gramm3r101.utils.storage
-
-/**
- * Server configuration data
- */
-data class ServerConfigData(
-    val serverUrl: String,
-    val httpsEnabled: Boolean
-)
-
-/**
- * Server configuration storage
- */
-object ServerConfigStorage {
-    private val storage = NamespacedStorage("server_config")
-    
-    private const val SERVER_URL_KEY = "server_url"
-    private const val HTTPS_ENABLED_KEY = "https_enabled"
-    
-    suspend fun getServerUrl() = storage.getString(SERVER_URL_KEY).ifEmpty { null }
-    
-    suspend fun setServerUrl(url: String) = storage.putString(SERVER_URL_KEY, url)
-    
-    suspend fun getHttpsEnabled() =
-        if (storage.contains(HTTPS_ENABLED_KEY))
-            storage.getBoolean(HTTPS_ENABLED_KEY, true)
-        else null
-    
-    suspend fun setHttpsEnabled(enabled: Boolean) {
-        storage.putBoolean(HTTPS_ENABLED_KEY, enabled)
-    }
-    
-    suspend fun hasConfiguration() = getServerUrl() != null && getHttpsEnabled() != null
-    
-    suspend fun getConfig(): ServerConfigData {
-        var url = getServerUrl()
-        var https = getHttpsEnabled()
-
-        if (url == null || https == null) {
-            url = "fromchat.ru"
-            https = true
-            saveConfig(ServerConfigData(url, https))
-        }
-
-        return ServerConfigData(url, https)
-    }
-    
-    suspend fun saveConfig(config: ServerConfigData) {
-        setServerUrl(config.serverUrl)
-        setHttpsEnabled(config.httpsEnabled)
-    }
-}

utils/shared/src/commonMain/kotlin/com/pr0gramm3r101/utils/storage/Storage.kt

@@ -1,59 +0,0 @@
-package com.pr0gramm3r101.utils.storage
-
-import com.pr0gramm3r101.utils.settings.AsyncSettings
-import com.pr0gramm3r101.utils.settings.asyncSettings
-
-/**
- * Generic key-value storage using AsyncSettings
- */
-class Storage(private val settings: AsyncSettings = asyncSettings) {
-    suspend fun putString(key: String, value: String) = settings.putString(key, value)
-    suspend fun getString(key: String, default: String = ""): String = settings.getString(key, default)
-    
-    suspend fun putInt(key: String, value: Int) = settings.putInt(key, value)
-    suspend fun getInt(key: String, default: Int = 0): Int = settings.getInt(key, default)
-    
-    suspend fun putLong(key: String, value: Long) = settings.putLong(key, value)
-    suspend fun getLong(key: String, default: Long = 0L): Long = settings.getLong(key, default)
-    
-    suspend fun putFloat(key: String, value: Float) = settings.putFloat(key, value)
-    suspend fun getFloat(key: String, default: Float = 0f): Float = settings.getFloat(key, default)
-    
-    suspend fun putBoolean(key: String, value: Boolean) = settings.putBoolean(key, value)
-    suspend fun getBoolean(key: String, default: Boolean = false): Boolean = settings.getBoolean(key, default)
-    
-    suspend fun putStringSet(key: String, value: Set<String>) = settings.putStringSet(key, value)
-    suspend fun getStringSet(key: String, default: Set<String> = emptySet()): Set<String> = settings.getStringSet(key, default)
-    
-    suspend fun putStringList(key: String, value: List<String>) = settings.putStringList(key, value)
-    suspend fun getStringList(key: String, default: List<String> = emptyList()): List<String> = settings.getStringList(key, default)
-    
-    suspend fun remove(key: String) = settings.remove(key)
-    suspend fun contains(key: String): Boolean = settings.contains(key)
-    suspend fun clear() = settings.clear()
-}
-
-/**
- * Namespaced storage for specific features
- */
-class NamespacedStorage(private val prefix: String, private val storage: Storage = Storage()) {
-    private fun key(name: String) = "$prefix:$name"
-    
-    suspend fun putString(name: String, value: String) = storage.putString(key(name), value)
-    suspend fun getString(name: String, default: String = ""): String = storage.getString(key(name), default)
-    
-    suspend fun putInt(name: String, value: Int) = storage.putInt(key(name), value)
-    suspend fun getInt(name: String, default: Int = 0): Int = storage.getInt(key(name), default)
-    
-    suspend fun putLong(name: String, value: Long) = storage.putLong(key(name), value)
-    suspend fun getLong(name: String, default: Long = 0L): Long = storage.getLong(key(name), default)
-    
-    suspend fun putFloat(name: String, value: Float) = storage.putFloat(key(name), value)
-    suspend fun getFloat(name: String, default: Float = 0f): Float = storage.getFloat(key(name), default)
-    
-    suspend fun putBoolean(name: String, value: Boolean) = storage.putBoolean(key(name), value)
-    suspend fun getBoolean(name: String, default: Boolean = false): Boolean = storage.getBoolean(key(name), default)
-    
-    suspend fun remove(name: String) = storage.remove(key(name))
-    suspend fun contains(name: String): Boolean = storage.contains(key(name))
-}

utils/shared/src/iosMain/kotlin/com/pr0gramm3r101/utils/settings/AsyncSettings.ios.kt

@@ -1,99 +0,0 @@
-package com.pr0gramm3r101.utils.settings
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import platform.Foundation.NSBundle
-import platform.Foundation.NSUserDefaults
-
-class IosAsyncSettings : AsyncSettings {
-    private val defaults: NSUserDefaults = NSUserDefaults.standardUserDefaults
-    
-    override suspend fun putString(key: String, value: String): Unit = withContext(Dispatchers.Default) {
-        defaults.setObject(value, key)
-        defaults.synchronize()
-    }
-    
-    override suspend fun getString(key: String, default: String): String = withContext(Dispatchers.Default) {
-        defaults.stringForKey(key) ?: default
-    }
-    
-    override suspend fun putInt(key: String, value: Int): Unit = withContext(Dispatchers.Default) {
-        defaults.setInteger(value.toLong(), key)
-        defaults.synchronize()
-    }
-    
-    override suspend fun getInt(key: String, default: Int): Int = withContext(Dispatchers.Default) {
-        defaults.integerForKey(key).toInt()
-    }
-    
-    override suspend fun putLong(key: String, value: Long): Unit = withContext(Dispatchers.Default) {
-        defaults.setObject(value, key)
-        defaults.synchronize()
-    }
-    
-    override suspend fun getLong(key: String, default: Long): Long = withContext(Dispatchers.Default) {
-        (defaults.objectForKey(key) as? platform.Foundation.NSNumber)?.longValue ?: default
-    }
-    
-    override suspend fun putFloat(key: String, value: Float): Unit = withContext(Dispatchers.Default) {
-        defaults.setFloat(value, key)
-        defaults.synchronize()
-    }
-    
-    override suspend fun getFloat(key: String, default: Float): Float = withContext(Dispatchers.Default) {
-        defaults.floatForKey(key)
-    }
-    
-    override suspend fun putBoolean(key: String, value: Boolean): Unit = withContext(Dispatchers.Default) {
-        defaults.setBool(value, key)
-        defaults.synchronize()
-    }
-    
-    override suspend fun getBoolean(key: String, default: Boolean): Boolean = withContext(Dispatchers.Default) {
-        if (defaults.objectForKey(key) != null) {
-            defaults.boolForKey(key)
-        } else {
-            default
-        }
-    }
-    
-    override suspend fun putStringSet(key: String, value: Set<String>): Unit = withContext(Dispatchers.Default) {
-        defaults.setObject(value.toList(), key)
-        defaults.synchronize()
-    }
-    
-    override suspend fun getStringSet(key: String, default: Set<String>): Set<String> = withContext(Dispatchers.Default) {
-        val list = defaults.objectForKey(key) as? List<*> ?: return@withContext default
-        list.filterIsInstance<String>().toSet()
-    }
-    
-    override suspend fun putStringList(key: String, value: List<String>): Unit = withContext(Dispatchers.Default) {
-        defaults.setObject(value, key)
-        defaults.synchronize()
-    }
-    
-    override suspend fun getStringList(key: String, default: List<String>): List<String> = withContext(Dispatchers.Default) {
-        val list = defaults.objectForKey(key) as? List<*> ?: return@withContext default
-        list.filterIsInstance<String>()
-    }
-    
-    override suspend fun remove(key: String): Unit = withContext(Dispatchers.Default) {
-        defaults.removeObjectForKey(key)
-        defaults.synchronize()
-    }
-    
-    override suspend fun contains(key: String): Boolean = withContext(Dispatchers.Default) {
-        defaults.objectForKey(key) != null
-    }
-    
-    override suspend fun clear(): Unit = withContext(Dispatchers.Default) {
-        val bundleId = NSBundle.mainBundle.bundleIdentifier ?: ""
-        val domain = defaults.persistentDomainForName(bundleId)
-        domain?.keys?.forEach { key ->
-            defaults.removeObjectForKey(key as String)
-        }
-        defaults.synchronize()
-    }
-}
-
-actual val asyncSettings: AsyncSettings = IosAsyncSettings()

utils/shared/src/iosMain/kotlin/com/pr0gramm3r101/utils/settings/IosSettings.kt

@@ -1,5 +1,7 @@
 package com.pr0gramm3r101.utils.settings
 
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import platform.Foundation.NSUserDefaults
 
 // TODO fix
@@ -42,4 +44,8 @@ class IosSettings : Settings {
     }
 
     override suspend fun remove(key: String) = defaults.removeObjectForKey(key)
+
+    override suspend fun contains(key: String): Boolean = withContext(Dispatchers.Default) {
+        defaults.objectForKey(key) != null
+    }
 } 

utils/shared/src/iosMain/kotlin/com/pr0gramm3r101/utils/settings/SettingsFactory.ios.kt

@@ -1,3 +1,5 @@
 package com.pr0gramm3r101.utils.settings
 
 actual val settings: Settings get() = IosSettings()
+actual val secureSettings: Settings
+    get() = TODO("Not yet implemented")