diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt index 4557a7c1d..33458c7ce 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt @@ -41,7 +41,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import com.tonyodev.fetch2.R.string @@ -49,6 +48,9 @@ import org.kiwix.kiwixmobile.core.R import org.kiwix.kiwixmobile.core.extensions.loadBitmapFromMipmap import org.kiwix.kiwixmobile.core.ui.components.CrashCheckBox import org.kiwix.kiwixmobile.core.ui.components.KiwixButton +import org.kiwix.kiwixmobile.core.ui.theme.AlabasterWhite +import org.kiwix.kiwixmobile.core.ui.theme.ErrorActivityBackground +import org.kiwix.kiwixmobile.core.ui.theme.White import org.kiwix.kiwixmobile.core.utils.ComposeDimens.CRASH_IMAGE_SIZE import org.kiwix.kiwixmobile.core.utils.ComposeDimens.EIGHT_DP import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SEVENTEEN_DP @@ -67,7 +69,7 @@ fun ErrorActivityScreen( Column( modifier = Modifier .fillMaxSize() - .background(colorResource(id = R.color.error_activity_background)) + .background(ErrorActivityBackground) .systemBarsPadding() .imePadding() .padding(SIXTEEN_DP), @@ -76,7 +78,7 @@ fun ErrorActivityScreen( Text( text = stringResource(crashTitleStringId), style = MaterialTheme.typography.headlineSmall, - color = colorResource(id = R.color.alabaster_white), + color = AlabasterWhite, modifier = Modifier.padding(top = SIXTY_DP, start = EIGHT_DP, end = EIGHT_DP) ) @@ -92,7 +94,7 @@ fun ErrorActivityScreen( text = stringResource(messageStringId), style = MaterialTheme.typography.bodyMedium, textAlign = TextAlign.Center, - color = colorResource(id = R.color.white), + color = White, modifier = Modifier.padding(start = EIGHT_DP, top = EIGHT_DP, end = EIGHT_DP) ) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/CrashCheckBox.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/CrashCheckBox.kt index e7cfd0c7b..52906b598 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/CrashCheckBox.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/CrashCheckBox.kt @@ -29,9 +29,10 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource -import org.kiwix.kiwixmobile.core.R +import org.kiwix.kiwixmobile.core.ui.theme.DenimBlue200 +import org.kiwix.kiwixmobile.core.ui.theme.ErrorActivityBackground +import org.kiwix.kiwixmobile.core.ui.theme.White import org.kiwix.kiwixmobile.core.utils.ComposeDimens.CRASH_CHECKBOX_START_PADDING import org.kiwix.kiwixmobile.core.utils.ComposeDimens.CRASH_CHECKBOX_TOP_PADDING @@ -47,15 +48,15 @@ fun CrashCheckBox(checkBoxItem: Pair>) { checked = checkBoxItem.second.value, onCheckedChange = { checkBoxItem.second.value = it }, colors = CheckboxDefaults.colors( - checkedColor = colorResource(id = R.color.denim_blue200), - checkmarkColor = colorResource(id = R.color.error_activity_background), - uncheckedColor = colorResource(R.color.denim_blue200) + checkedColor = DenimBlue200, + checkmarkColor = ErrorActivityBackground, + uncheckedColor = DenimBlue200 ) ) Text( style = MaterialTheme.typography.bodyMedium, text = stringResource(id = checkBoxItem.first), - color = colorResource(id = R.color.white), + color = White, modifier = Modifier.padding(start = CRASH_CHECKBOX_TOP_PADDING) ) } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixButton.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixButton.kt index 2aa511a42..c9f5b4229 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixButton.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixButton.kt @@ -26,10 +26,9 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.stringResource -import org.kiwix.kiwixmobile.core.R +import org.kiwix.kiwixmobile.core.ui.theme.DenimBlue800 +import org.kiwix.kiwixmobile.core.ui.theme.White import org.kiwix.kiwixmobile.core.utils.ComposeDimens.BUTTON_DEFAULT_ELEVATION import org.kiwix.kiwixmobile.core.utils.ComposeDimens.BUTTON_DEFAULT_PADDING import org.kiwix.kiwixmobile.core.utils.ComposeDimens.BUTTON_PRESSED_ELEVATION @@ -46,8 +45,8 @@ fun KiwixButton( Button( onClick = { clickListener.invoke() }, colors = ButtonDefaults.buttonColors( - containerColor = colorResource(id = R.color.denim_blue800), - contentColor = Color.White + containerColor = DenimBlue800, + contentColor = White ), modifier = Modifier.padding(BUTTON_DEFAULT_PADDING), shape = MaterialTheme.shapes.extraSmall,