Remove duplicate AsyncSettings implementation, clean up

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

@@ -35,9 +35,4 @@ data class ReactionUser(
 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) }
-        set(value) = runIO { settings.putBoolean("materialYou", value) }
+        get() = runBlocking { settings.getBoolean(MATERIAL_YOU_KEY, true) }
+        set(value) = runIO { settings.putBoolean(MATERIAL_YOU_KEY, value) }
 
     var theme: Theme
-        get() = runBlocking { Theme.entries[settings.getInt("theme", Theme.AsSystem.ordinal)] }
-        set(value) = runIO { settings.putInt("theme", value.ordinal) }
+        get() = runBlocking { Theme.entries[settings.getInt(THEME_KEY, Theme.AsSystem.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() {
-        _serverConfig.value = ServerConfigStorage.getConfig()
-
-        // Set default values and prevent corruption
-        ServerConfigStorage.getConfig()
+    fun initialize() {
+        _serverConfig.value = Settings.serverConfig
     }
     
     /**
      * Update server configuration
      */
-    suspend fun updateServerConfig(config: ServerConfigData) {
-        ServerConfigStorage.saveConfig(config)
+    fun updateServerConfig(config: ServerConfigData) {
+        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/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/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() }