diff --git a/src/Ikar.AndroidKotlin/app/build.gradle.kts b/src/Ikar.AndroidKotlin/app/build.gradle.kts index 73a9c5d..e3bbba8 100644 --- a/src/Ikar.AndroidKotlin/app/build.gradle.kts +++ b/src/Ikar.AndroidKotlin/app/build.gradle.kts @@ -37,8 +37,8 @@ android { applicationId = "com.seven.ikar.kotlin" minSdk = 24 targetSdk = 36 - versionCode = 212 - versionName = "3.99" + versionCode = 213 + versionName = "4.00" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/src/Ikar.AndroidKotlin/app/src/main/java/com/seven/ikar/kotlin/feature/chats/ChatsScreen.kt b/src/Ikar.AndroidKotlin/app/src/main/java/com/seven/ikar/kotlin/feature/chats/ChatsScreen.kt index 28e9879..a511dbe 100644 --- a/src/Ikar.AndroidKotlin/app/src/main/java/com/seven/ikar/kotlin/feature/chats/ChatsScreen.kt +++ b/src/Ikar.AndroidKotlin/app/src/main/java/com/seven/ikar/kotlin/feature/chats/ChatsScreen.kt @@ -73,7 +73,6 @@ import com.seven.ikar.kotlin.core.model.ChatSummaryDto import com.seven.ikar.kotlin.core.model.ChatType import com.seven.ikar.kotlin.core.model.StoryDto import com.seven.ikar.kotlin.core.network.ServerConfig -import com.seven.ikar.kotlin.core.realtime.RealtimeConnectionStage import com.seven.ikar.kotlin.core.settings.ChatListLayoutOption import com.seven.ikar.kotlin.core.settings.ChatSettingsSnapshot import com.seven.ikar.kotlin.core.settings.ChatSwipeLeftActionOption @@ -126,7 +125,6 @@ fun ChatsScreen( onFilterChanged: (ChatListFilter) -> Unit, onQueryChanged: (String) -> Unit ) { - val isRealtimeConnected = state.realtimeStage == RealtimeConnectionStage.Connected val previewMaxLines = if (chatSettings.chatListLayout == ChatListLayoutOption.ThreeLine) 2 else 1 val chatListState = rememberLazyListState() var isStoriesHeaderVisible by remember { mutableStateOf(false) } @@ -225,7 +223,6 @@ fun ChatsScreen( ) } else { ChatsBrandHeader( - isRealtimeConnected = isRealtimeConnected, stories = state.stories, accessToken = state.session?.accessToken, currentUserId = state.session?.user?.id, @@ -409,7 +406,6 @@ private fun ChatFilterTabs( @Composable private fun ChatsBrandHeader( - isRealtimeConnected: Boolean, stories: List, accessToken: String?, currentUserId: String?, @@ -427,14 +423,12 @@ private fun ChatsBrandHeader( ) Column(verticalArrangement = Arrangement.spacedBy(0.dp)) { Text( - text = if (isRealtimeConnected) "ИКАР" else "Соединение...", - style = MaterialTheme.typography.titleLarge.copy( - letterSpacing = if (isRealtimeConnected) 2.sp else 0.sp - ), + text = "ИКАР", + style = MaterialTheme.typography.titleLarge.copy(letterSpacing = 2.sp), color = TelegramBlue ) Text( - if (isRealtimeConnected) "Чаты" else "Повторное подключение", + "Чаты", style = MaterialTheme.typography.labelSmall, color = TelegramInkMuted ) diff --git a/src/Ikar.AndroidKotlin/gradle.properties b/src/Ikar.AndroidKotlin/gradle.properties index 9a848c2..575ebbf 100644 --- a/src/Ikar.AndroidKotlin/gradle.properties +++ b/src/Ikar.AndroidKotlin/gradle.properties @@ -1,4 +1,6 @@ org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 +org.gradle.daemon=false +kotlin.compiler.execution.strategy=in-process org.gradle.java.installations.paths=C:\\Program Files\\Android\\Android Studio\\jbr android.useAndroidX=true android.nonTransitiveRClass=true