Fix persistent Android connection header

This commit is contained in:
Курнат Андрей
2026-07-15 12:10:59 +03:00
parent fceda2b24f
commit abd90c4e14
3 changed files with 7 additions and 11 deletions
+2 -2
View File
@@ -37,8 +37,8 @@ android {
applicationId = "com.seven.ikar.kotlin" applicationId = "com.seven.ikar.kotlin"
minSdk = 24 minSdk = 24
targetSdk = 36 targetSdk = 36
versionCode = 212 versionCode = 213
versionName = "3.99" versionName = "4.00"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
@@ -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.ChatType
import com.seven.ikar.kotlin.core.model.StoryDto import com.seven.ikar.kotlin.core.model.StoryDto
import com.seven.ikar.kotlin.core.network.ServerConfig 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.ChatListLayoutOption
import com.seven.ikar.kotlin.core.settings.ChatSettingsSnapshot import com.seven.ikar.kotlin.core.settings.ChatSettingsSnapshot
import com.seven.ikar.kotlin.core.settings.ChatSwipeLeftActionOption import com.seven.ikar.kotlin.core.settings.ChatSwipeLeftActionOption
@@ -126,7 +125,6 @@ fun ChatsScreen(
onFilterChanged: (ChatListFilter) -> Unit, onFilterChanged: (ChatListFilter) -> Unit,
onQueryChanged: (String) -> Unit onQueryChanged: (String) -> Unit
) { ) {
val isRealtimeConnected = state.realtimeStage == RealtimeConnectionStage.Connected
val previewMaxLines = if (chatSettings.chatListLayout == ChatListLayoutOption.ThreeLine) 2 else 1 val previewMaxLines = if (chatSettings.chatListLayout == ChatListLayoutOption.ThreeLine) 2 else 1
val chatListState = rememberLazyListState() val chatListState = rememberLazyListState()
var isStoriesHeaderVisible by remember { mutableStateOf(false) } var isStoriesHeaderVisible by remember { mutableStateOf(false) }
@@ -225,7 +223,6 @@ fun ChatsScreen(
) )
} else { } else {
ChatsBrandHeader( ChatsBrandHeader(
isRealtimeConnected = isRealtimeConnected,
stories = state.stories, stories = state.stories,
accessToken = state.session?.accessToken, accessToken = state.session?.accessToken,
currentUserId = state.session?.user?.id, currentUserId = state.session?.user?.id,
@@ -409,7 +406,6 @@ private fun ChatFilterTabs(
@Composable @Composable
private fun ChatsBrandHeader( private fun ChatsBrandHeader(
isRealtimeConnected: Boolean,
stories: List<StoryDto>, stories: List<StoryDto>,
accessToken: String?, accessToken: String?,
currentUserId: String?, currentUserId: String?,
@@ -427,14 +423,12 @@ private fun ChatsBrandHeader(
) )
Column(verticalArrangement = Arrangement.spacedBy(0.dp)) { Column(verticalArrangement = Arrangement.spacedBy(0.dp)) {
Text( Text(
text = if (isRealtimeConnected) "ИКАР" else "Соединение...", text = "ИКАР",
style = MaterialTheme.typography.titleLarge.copy( style = MaterialTheme.typography.titleLarge.copy(letterSpacing = 2.sp),
letterSpacing = if (isRealtimeConnected) 2.sp else 0.sp
),
color = TelegramBlue color = TelegramBlue
) )
Text( Text(
if (isRealtimeConnected) "Чаты" else "Повторное подключение", "Чаты",
style = MaterialTheme.typography.labelSmall, style = MaterialTheme.typography.labelSmall,
color = TelegramInkMuted color = TelegramInkMuted
) )
+2
View File
@@ -1,4 +1,6 @@
org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 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 org.gradle.java.installations.paths=C:\\Program Files\\Android\\Android Studio\\jbr
android.useAndroidX=true android.useAndroidX=true
android.nonTransitiveRClass=true android.nonTransitiveRClass=true