From 448d8fa8ff30420235d377eb76ca89539ed0c2d0 Mon Sep 17 00:00:00 2001 From: Placeholder6 <86405576+Placeholder6@users.noreply.github.com> Date: Thu, 18 Dec 2025 23:09:02 +0600 Subject: [PATCH 1/2] update locales --- .../myedu/ui/screens/DocumentsScreens.kt | 41 ++++++++++++------- .../oshsu/myedu/ui/screens/ProfileScreen.kt | 18 +++++--- app/src/main/res/values-ky/strings.xml | 10 +++++ app/src/main/res/values-ru/strings.xml | 10 +++++ app/src/main/res/values/strings.xml | 10 +++++ 5 files changed, 69 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/kg/oshsu/myedu/ui/screens/DocumentsScreens.kt b/app/src/main/java/kg/oshsu/myedu/ui/screens/DocumentsScreens.kt index 04043ffd..59931e98 100644 --- a/app/src/main/java/kg/oshsu/myedu/ui/screens/DocumentsScreens.kt +++ b/app/src/main/java/kg/oshsu/myedu/ui/screens/DocumentsScreens.kt @@ -54,13 +54,20 @@ fun ReferenceView( val profile = vm.profileData val mov = profile?.studentMovement + // Get current language for data localization + val currentLang = vm.language + DisposableEffect(Unit) { onDispose { vm.resetDocumentState() } } val activeSemester = profile?.active_semester ?: 1 val course = (activeSemester + 1) / 2 - val facultyName = mov?.faculty?.let { it.name_en ?: it.name_ru } ?: mov?.speciality?.faculty?.let { it.name_en ?: it.name_ru } ?: "-" + + val facultyName = mov?.faculty?.getName(currentLang) + ?: mov?.speciality?.faculty?.getName(currentLang) + ?: "-" + val datePattern = stringResource(R.string.config_date_format) val progressAnim = remember { Animatable(0f) } @@ -163,11 +170,11 @@ fun ReferenceView( ) { Icon(Icons.Default.PictureAsPdf, null) Spacer(Modifier.width(8.dp)) - Text("Open PDF") + Text(stringResource(R.string.open_pdf)) } Spacer(Modifier.height(4.dp)) Text( - text = "Saved to Downloads as ${vm.savedPdfName}", + text = stringResource(R.string.saved_to_downloads, vm.savedPdfName ?: ""), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.outline, textAlign = TextAlign.Center @@ -175,20 +182,22 @@ fun ReferenceView( } PdfUiState.ERROR -> { Text( - text = vm.pdfStatusMessage ?: "Unknown Error", + text = vm.pdfStatusMessage ?: stringResource(R.string.error_unknown), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.error, textAlign = TextAlign.Center, modifier = Modifier.padding(bottom = 12.dp) ) Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + // FIX: Pre-fetch string resource outside the lambda + val noErrorMsg = stringResource(R.string.no_error_msg) OutlinedButton( - onClick = { clipboardManager.setText(AnnotatedString(vm.pdfStatusMessage ?: "No Error Msg")) }, + onClick = { clipboardManager.setText(AnnotatedString(vm.pdfStatusMessage ?: noErrorMsg)) }, modifier = Modifier.weight(1f) ) { Icon(Icons.Default.ContentCopy, null) Spacer(Modifier.width(8.dp)) - Text("Copy Logs") + Text(stringResource(R.string.copy_logs)) } Button( onClick = { vm.resetDocumentState() }, @@ -196,7 +205,7 @@ fun ReferenceView( ) { Icon(Icons.Default.Refresh, null) Spacer(Modifier.width(8.dp)) - Text("Retry") + Text(stringResource(R.string.retry)) } } } @@ -227,9 +236,9 @@ fun ReferenceView( RefDetailRow(stringResource(R.string.student_id), "${user?.id}") RefDetailRow(stringResource(R.string.faculty), facultyName) - RefDetailRow(stringResource(R.string.speciality), mov?.speciality?.name_en ?: "-") + RefDetailRow(stringResource(R.string.speciality), mov?.speciality?.getName(currentLang) ?: "-") RefDetailRow(stringResource(R.string.year_of_study), "$course ($activeSemester ${stringResource(R.string.semester)})") - RefDetailRow(stringResource(R.string.edu_form), mov?.edu_form?.name_en ?: "-") + RefDetailRow(stringResource(R.string.edu_form), mov?.edu_form?.getName(currentLang) ?: "-") val contractLabel = stringResource(R.string.contract) val budgetLabel = stringResource(R.string.budget) @@ -353,19 +362,21 @@ fun TranscriptView( } PdfUiState.SUCCESS -> { Button(onClick = { vm.openPdf(context, vm.savedPdfUri!!) }, modifier = Modifier.fillMaxWidth()) { - Icon(Icons.Default.PictureAsPdf, null); Spacer(Modifier.width(8.dp)); Text("Open PDF") + Icon(Icons.Default.PictureAsPdf, null); Spacer(Modifier.width(8.dp)); Text(stringResource(R.string.open_pdf)) } Spacer(Modifier.height(4.dp)) - Text(text = "Saved to Downloads as ${vm.savedPdfName}", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.outline, textAlign = TextAlign.Center) + Text(text = stringResource(R.string.saved_to_downloads, vm.savedPdfName ?: ""), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.outline, textAlign = TextAlign.Center) } PdfUiState.ERROR -> { - Text(text = vm.pdfStatusMessage ?: "Error", style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.error, textAlign = TextAlign.Center, modifier = Modifier.padding(bottom = 12.dp)) + Text(text = vm.pdfStatusMessage ?: stringResource(R.string.error_unknown), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.error, textAlign = TextAlign.Center, modifier = Modifier.padding(bottom = 12.dp)) Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { - OutlinedButton(onClick = { clipboardManager.setText(AnnotatedString(vm.pdfStatusMessage ?: "")) }, modifier = Modifier.weight(1f)) { - Icon(Icons.Default.ContentCopy, null); Spacer(Modifier.width(8.dp)); Text("Copy Logs") + // FIX: Pre-fetch string resource outside the lambda + val noErrorMsg = stringResource(R.string.no_error_msg) + OutlinedButton(onClick = { clipboardManager.setText(AnnotatedString(vm.pdfStatusMessage ?: noErrorMsg)) }, modifier = Modifier.weight(1f)) { + Icon(Icons.Default.ContentCopy, null); Spacer(Modifier.width(8.dp)); Text(stringResource(R.string.copy_logs)) } Button(onClick = { vm.resetDocumentState() }, modifier = Modifier.weight(1f)) { - Icon(Icons.Default.Refresh, null); Spacer(Modifier.width(8.dp)); Text("Retry") + Icon(Icons.Default.Refresh, null); Spacer(Modifier.width(8.dp)); Text(stringResource(R.string.retry)) } } } diff --git a/app/src/main/java/kg/oshsu/myedu/ui/screens/ProfileScreen.kt b/app/src/main/java/kg/oshsu/myedu/ui/screens/ProfileScreen.kt index 3b8de82d..3e2c6ba1 100644 --- a/app/src/main/java/kg/oshsu/myedu/ui/screens/ProfileScreen.kt +++ b/app/src/main/java/kg/oshsu/myedu/ui/screens/ProfileScreen.kt @@ -71,9 +71,17 @@ fun ProfileScreen( val displayPhoto = vm.uiPhoto val context = LocalContext.current + // Get current language from ViewModel to select correct strings from API objects + val currentLang = vm.language + var showSettingsDialog by remember { mutableStateOf(false) } - val facultyName = profile?.studentMovement?.faculty?.let { it.name_en ?: it.name_ru } ?: profile?.studentMovement?.speciality?.faculty?.let { it.name_en ?: it.name_ru } ?: "-" + // Updated logic to use getName(currentLang) + val facultyName = profile?.studentMovement?.faculty?.getName(currentLang) + ?: profile?.studentMovement?.speciality?.faculty?.getName(currentLang) + ?: "-" + + val specialityName = profile?.studentMovement?.speciality?.getName(currentLang) ?: "-" val state = rememberPullToRefreshState() @@ -197,7 +205,7 @@ fun ProfileScreen( Icon(Icons.Default.Edit, contentDescription = null, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(8.dp)) Text( - "Edit Profile", + stringResource(R.string.edit_profile), // Updated to resource style = MaterialTheme.typography.labelLarge, modifier = Modifier.sharedBounds( sharedContentState = rememberSharedContentState(key = "text_edit_profile"), @@ -345,7 +353,7 @@ fun ProfileScreen( SectionTitle(stringResource(R.string.academic), Icons.Outlined.School) DetailCard(Icons.Outlined.School, stringResource(R.string.faculty), facultyName) - DetailCard(Icons.Outlined.Book, stringResource(R.string.speciality), profile?.studentMovement?.speciality?.name_en ?: "-") + DetailCard(Icons.Outlined.Book, stringResource(R.string.speciality), specialityName) Spacer(Modifier.height(32.dp)) @@ -388,12 +396,12 @@ fun ProfileScreen( sdf.format(vm.lastRefreshTime) } Text( - text = "Last updated: $formattedTime", + text = stringResource(R.string.last_updated, formattedTime), // Updated to resource style = MaterialTheme.typography.labelSmall ) } Text( - text = "Session: Active", + text = stringResource(R.string.session_active), // Updated to resource style = MaterialTheme.typography.labelSmall ) } diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml index 80c214da..30827ac9 100644 --- a/app/src/main/res/values-ky/strings.xml +++ b/app/src/main/res/values-ky/strings.xml @@ -98,6 +98,9 @@ Паспорт Телефон Чыгуу + Профильди оңдоо + Акыркы жаңыртуу: %s + Сессия: Активдүү dd.MM.yyyy Орнотуулар Көрүнүш @@ -145,6 +148,13 @@ PDF даярдалууда... PDF (ru) PDF (en) + PDF ачуу + Жүктөлмөлөргө сакталды: %s + Логдорду көчүрүү + Кайталоо + Белгисиз ката + Ката билдирүүсү жок + ИЛИМ ЖАНА БИЛИМ БЕРҮҮ МИНИСТРЛИГИ\nОШ МАМЛЕКЕТТИК УНИВЕРСИТЕТИ Бул маалымкат тастыктайт: ОКУУ ЖАЙДАН МААЛЫМКАТ diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 31cd9c6d..bf20f8ae 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -98,6 +98,9 @@ Паспорт Телефон Выйти + Редактировать профиль + Обновлено: %s + Сессия: Активна dd.MM.yyyy Настройки Оформление @@ -145,6 +148,13 @@ Создание PDF... PDF (ru) PDF (en) + Открыть PDF + Сохранено в Загрузки: %s + Копировать логи + Повторить + Неизвестная ошибка + Нет сообщения об ошибке + МИНИСТЕРСТВО НАУКИ И ОБРАЗОВАНИЯ\nОШСКИЙ ГОСУДАРСТВЕННЫЙ УНИВЕРСИТЕТ Настоящая справка подтверждает, что СПРАВКА С МЕСТА УЧЕБЫ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bc6f1126..6957f45c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,6 +98,9 @@ Passport Phone Log Out + Edit Profile + Last updated: %s + Session: Active dd.MM.yyyy Settings Appearance @@ -145,6 +148,13 @@ Generating PDF... PDF (ru) PDF (en) + Open PDF + Saved to Downloads as %s + Copy Logs + Retry + Unknown Error + No Error Message + MINISTRY OF SCIENCE AND EDUCATION\nOSH STATE UNIVERSITY This reference is given to CERTIFICATE OF STUDY From 1f6b5e3fd94ce5463cd933e362f171f83a84b7a1 Mon Sep 17 00:00:00 2001 From: Placeholder6 <86405576+Placeholder6@users.noreply.github.com> Date: Thu, 18 Dec 2025 23:29:13 +0600 Subject: [PATCH 2/2] fix warnings --- .../kg/oshsu/myedu/BackgroundSyncWorker.kt | 2 +- .../main/java/kg/oshsu/myedu/LocaleHelper.kt | 2 +- .../main/java/kg/oshsu/myedu/MainViewModel.kt | 8 ++--- .../myedu/ui/screens/DocumentsScreens.kt | 32 +++++++++++++++---- .../myedu/ui/screens/OnboardingScreen.kt | 4 +-- .../myedu/ui/screens/PersonalInfoScreen.kt | 10 +++--- .../oshsu/myedu/ui/screens/SettingsScreen.kt | 2 +- 7 files changed, 39 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/kg/oshsu/myedu/BackgroundSyncWorker.kt b/app/src/main/java/kg/oshsu/myedu/BackgroundSyncWorker.kt index a521b6af..34d26ea1 100644 --- a/app/src/main/java/kg/oshsu/myedu/BackgroundSyncWorker.kt +++ b/app/src/main/java/kg/oshsu/myedu/BackgroundSyncWorker.kt @@ -130,7 +130,7 @@ class BackgroundSyncWorker(appContext: Context, workerParams: WorkerParameters) private fun getLocalizedContext(context: Context, prefs: PrefsManager): Context { // Updated to use "app_language" key from your PrefsManager val lang = prefs.getAppLanguage() - val locale = Locale(lang) + val locale = Locale.forLanguageTag(lang) // Replaced deprecated constructor Locale.setDefault(locale) val config = Configuration(context.resources.configuration) config.setLocale(locale) diff --git a/app/src/main/java/kg/oshsu/myedu/LocaleHelper.kt b/app/src/main/java/kg/oshsu/myedu/LocaleHelper.kt index 88e0ae50..9d590b82 100644 --- a/app/src/main/java/kg/oshsu/myedu/LocaleHelper.kt +++ b/app/src/main/java/kg/oshsu/myedu/LocaleHelper.kt @@ -6,7 +6,7 @@ import java.util.Locale object LocaleHelper { fun setLocale(context: Context, languageCode: String): ContextWrapper { - val locale = Locale(languageCode) + val locale = Locale.forLanguageTag(languageCode) // Replaced deprecated constructor Locale.setDefault(locale) val config = context.resources.configuration config.setLocale(locale) diff --git a/app/src/main/java/kg/oshsu/myedu/MainViewModel.kt b/app/src/main/java/kg/oshsu/myedu/MainViewModel.kt index cb2ae282..5e652154 100644 --- a/app/src/main/java/kg/oshsu/myedu/MainViewModel.kt +++ b/app/src/main/java/kg/oshsu/myedu/MainViewModel.kt @@ -515,10 +515,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { try { val news = NetworkClient.api.getNews(); withContext(Dispatchers.Main) { newsList = news; prefs?.saveList("news_list", news) } } catch (_: Exception) {} try { val pay = NetworkClient.api.getPayStatus(); withContext(Dispatchers.Main) { payStatus = pay; prefs?.saveData("pay_status", pay) } } catch (_: Exception) {} - if (profile != null) { - loadScheduleNetwork(profile) - fetchSessionSuspend(profile) - } + loadScheduleNetwork(profile) + fetchSessionSuspend(profile) } private suspend fun loadScheduleNetwork(profile: StudentInfoResponse) { @@ -876,4 +874,4 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { data class Quadruple(val info: String, val transcript: String, val linkId: Long, val qr: String) data class QuintuplePlusOne(val info: String, val license: String, val univ: String, val linkId: Long, val qr: String, val key: String) -} +} \ No newline at end of file diff --git a/app/src/main/java/kg/oshsu/myedu/ui/screens/DocumentsScreens.kt b/app/src/main/java/kg/oshsu/myedu/ui/screens/DocumentsScreens.kt index 59931e98..77b19cd8 100644 --- a/app/src/main/java/kg/oshsu/myedu/ui/screens/DocumentsScreens.kt +++ b/app/src/main/java/kg/oshsu/myedu/ui/screens/DocumentsScreens.kt @@ -1,5 +1,6 @@ package kg.oshsu.myedu.ui.screens +import android.content.ClipData import androidx.compose.animation.* import androidx.compose.animation.core.* import androidx.compose.foundation.BorderStroke @@ -16,10 +17,10 @@ import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.platform.ClipEntry +import androidx.compose.ui.platform.LocalClipboard import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -32,6 +33,7 @@ import kg.oshsu.myedu.TranscriptSubject import kg.oshsu.myedu.MarkList import kg.oshsu.myedu.ExamRule import kotlinx.coroutines.delay +import kotlinx.coroutines.launch import java.text.SimpleDateFormat import java.util.Date import java.util.Locale @@ -49,14 +51,15 @@ fun ReferenceView( animatedVisibilityScope: AnimatedVisibilityScope ) { val context = LocalContext.current - val clipboardManager = LocalClipboardManager.current + val clipboard = LocalClipboard.current // Updated to LocalClipboard + val scope = rememberCoroutineScope() // Needed for suspend clipboard calls val user = vm.userData val profile = vm.profileData val mov = profile?.studentMovement // Get current language for data localization val currentLang = vm.language - + DisposableEffect(Unit) { onDispose { vm.resetDocumentState() } } @@ -191,8 +194,15 @@ fun ReferenceView( Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { // FIX: Pre-fetch string resource outside the lambda val noErrorMsg = stringResource(R.string.no_error_msg) + val errorMessage = vm.pdfStatusMessage ?: noErrorMsg + OutlinedButton( - onClick = { clipboardManager.setText(AnnotatedString(vm.pdfStatusMessage ?: noErrorMsg)) }, + onClick = { + scope.launch { + val clipData = ClipData.newPlainText("Error Logs", errorMessage) + clipboard.setClipEntry(ClipEntry(clipData)) + } + }, modifier = Modifier.weight(1f) ) { Icon(Icons.Default.ContentCopy, null) @@ -272,7 +282,8 @@ fun TranscriptView( animatedVisibilityScope: AnimatedVisibilityScope ) { val context = LocalContext.current - val clipboardManager = LocalClipboardManager.current + val clipboard = LocalClipboard.current // Updated + val scope = rememberCoroutineScope() // Added val isTransitionComplete = remember { mutableStateOf(false) } LaunchedEffect(Unit) { @@ -372,7 +383,14 @@ fun TranscriptView( Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { // FIX: Pre-fetch string resource outside the lambda val noErrorMsg = stringResource(R.string.no_error_msg) - OutlinedButton(onClick = { clipboardManager.setText(AnnotatedString(vm.pdfStatusMessage ?: noErrorMsg)) }, modifier = Modifier.weight(1f)) { + val errorMessage = vm.pdfStatusMessage ?: noErrorMsg + + OutlinedButton(onClick = { + scope.launch { + val clipData = ClipData.newPlainText("Error Logs", errorMessage) + clipboard.setClipEntry(ClipEntry(clipData)) + } + }, modifier = Modifier.weight(1f)) { Icon(Icons.Default.ContentCopy, null); Spacer(Modifier.width(8.dp)); Text(stringResource(R.string.copy_logs)) } Button(onClick = { vm.resetDocumentState() }, modifier = Modifier.weight(1f)) { diff --git a/app/src/main/java/kg/oshsu/myedu/ui/screens/OnboardingScreen.kt b/app/src/main/java/kg/oshsu/myedu/ui/screens/OnboardingScreen.kt index a3c4c5ea..fe82374b 100644 --- a/app/src/main/java/kg/oshsu/myedu/ui/screens/OnboardingScreen.kt +++ b/app/src/main/java/kg/oshsu/myedu/ui/screens/OnboardingScreen.kt @@ -22,6 +22,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.rounded.ArrowForward import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.DarkMode import androidx.compose.material.icons.filled.Edit @@ -29,7 +30,6 @@ import androidx.compose.material.icons.filled.LightMode import androidx.compose.material.icons.filled.Notifications import androidx.compose.material.icons.filled.Restore import androidx.compose.material.icons.filled.SettingsSystemDaydream -import androidx.compose.material.icons.rounded.ArrowForward import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment @@ -277,7 +277,7 @@ fun OnboardingScreen( ) { Text(stringResource(R.string.onboard_btn_finish), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold) Spacer(Modifier.width(8.dp)) - Icon(Icons.Rounded.ArrowForward, null) + Icon(Icons.AutoMirrored.Rounded.ArrowForward, null) // Updated Icon } Spacer(Modifier.height(32.dp)) diff --git a/app/src/main/java/kg/oshsu/myedu/ui/screens/PersonalInfoScreen.kt b/app/src/main/java/kg/oshsu/myedu/ui/screens/PersonalInfoScreen.kt index b5b5273a..49419628 100644 --- a/app/src/main/java/kg/oshsu/myedu/ui/screens/PersonalInfoScreen.kt +++ b/app/src/main/java/kg/oshsu/myedu/ui/screens/PersonalInfoScreen.kt @@ -12,6 +12,8 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowForward +import androidx.compose.material.icons.automirrored.filled.List import androidx.compose.material.icons.filled.* import androidx.compose.material.icons.outlined.* import androidx.compose.material3.* @@ -418,7 +420,7 @@ fun PersonalInfoScreen( SectionHeader(stringResource(R.string.personal_movement_finance), Icons.Outlined.History) ExpandableCard { Text(stringResource(R.string.personal_movement), style = MaterialTheme.typography.titleSmall, color = MaterialTheme.colorScheme.primary) - DataRow(Icons.Default.ArrowForward, stringResource(R.string.personal_type), movTypeObj?.getName(currentLang)) + DataRow(Icons.AutoMirrored.Filled.ArrowForward, stringResource(R.string.personal_type), movTypeObj?.getName(currentLang)) DataRow(Icons.Default.CheckCircle, stringResource(R.string.personal_is_student), movTypeObj?.is_student?.toString()) DataRow(Icons.Default.Description, stringResource(R.string.personal_desc), mov?.info_description) DataRow(Icons.Default.DateRange, stringResource(R.string.personal_period), periodName) @@ -441,9 +443,9 @@ fun PersonalInfoScreen( DataRow(Icons.Default.Book, stringResource(R.string.personal_library), libStatus) DataRow(Icons.Default.Money, stringResource(R.string.personal_debt_credits), profile?.access_debt_credit_count?.toString()) - DataRow(Icons.Default.List, stringResource(R.string.personal_lib_items), "${profile?.studentlibrary?.size ?: 0}") - DataRow(Icons.Default.List, stringResource(R.string.personal_debt_trans), "${profile?.student_debt_transcript?.size ?: 0}") - DataRow(Icons.Default.List, stringResource(R.string.personal_total_price), "${profile?.total_price?.size ?: 0}") + DataRow(Icons.AutoMirrored.Filled.List, stringResource(R.string.personal_lib_items), "${profile?.studentlibrary?.size ?: 0}") + DataRow(Icons.AutoMirrored.Filled.List, stringResource(R.string.personal_debt_trans), "${profile?.student_debt_transcript?.size ?: 0}") + DataRow(Icons.AutoMirrored.Filled.List, stringResource(R.string.personal_total_price), "${profile?.total_price?.size ?: 0}") } Spacer(Modifier.height(24.dp)) } diff --git a/app/src/main/java/kg/oshsu/myedu/ui/screens/SettingsScreen.kt b/app/src/main/java/kg/oshsu/myedu/ui/screens/SettingsScreen.kt index 13a910e6..e2d55c07 100644 --- a/app/src/main/java/kg/oshsu/myedu/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/kg/oshsu/myedu/ui/screens/SettingsScreen.kt @@ -68,7 +68,7 @@ fun SettingsScreen(vm: MainViewModel, onClose: () -> Unit) { } }, scrollBehavior = scrollBehavior, - colors = TopAppBarDefaults.largeTopAppBarColors( + colors = TopAppBarDefaults.topAppBarColors( // Updated to non-deprecated containerColor = MaterialTheme.colorScheme.background, scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer )