kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-09 15:27:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Using colors from our compose Color file instead of XML-based color file since the XML-based file will be removed in future.

Browse Source
This commit is contained in:
MohitMaliFtechiz 2025-03-06 15:01:47 +05:30 committed by MohitMaliFtechiz
parent d3f8c254e2
commit 60a9f7a3b8
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt
View File

@ -41,7 +41,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import com.tonyodev.fetch2.R.string 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.extensions.loadBitmapFromMipmap
import org.kiwix.kiwixmobile.core.ui.components.CrashCheckBox import org.kiwix.kiwixmobile.core.ui.components.CrashCheckBox
import org.kiwix.kiwixmobile.core.ui.components.KiwixButton 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.CRASH_IMAGE_SIZE
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.EIGHT_DP import org.kiwix.kiwixmobile.core.utils.ComposeDimens.EIGHT_DP
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SEVENTEEN_DP import org.kiwix.kiwixmobile.core.utils.ComposeDimens.SEVENTEEN_DP
@ -67,7 +69,7 @@ fun ErrorActivityScreen(
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.background(colorResource(id = R.color.error_activity_background)) .background(ErrorActivityBackground)
.systemBarsPadding() .systemBarsPadding()
.imePadding() .imePadding()
.padding(SIXTEEN_DP), .padding(SIXTEEN_DP),
@ -76,7 +78,7 @@ fun ErrorActivityScreen(
Text( Text(
text = stringResource(crashTitleStringId), text = stringResource(crashTitleStringId),
style = MaterialTheme.typography.headlineSmall, 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) modifier = Modifier.padding(top = SIXTY_DP, start = EIGHT_DP, end = EIGHT_DP)
) )
@ -92,7 +94,7 @@ fun ErrorActivityScreen(
text = stringResource(messageStringId), text = stringResource(messageStringId),
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
color = colorResource(id = R.color.white), color = White,
modifier = Modifier.padding(start = EIGHT_DP, top = EIGHT_DP, end = EIGHT_DP) modifier = Modifier.padding(start = EIGHT_DP, top = EIGHT_DP, end = EIGHT_DP)
) )

13
core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/CrashCheckBox.kt
View File

@ -29,9 +29,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState import androidx.compose.runtime.MutableState
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource 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_START_PADDING
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.CRASH_CHECKBOX_TOP_PADDING import org.kiwix.kiwixmobile.core.utils.ComposeDimens.CRASH_CHECKBOX_TOP_PADDING
@ -47,15 +48,15 @@ fun CrashCheckBox(checkBoxItem: Pair<Int, MutableState<Boolean>>) {
checked = checkBoxItem.second.value, checked = checkBoxItem.second.value,
onCheckedChange = { checkBoxItem.second.value = it }, onCheckedChange = { checkBoxItem.second.value = it },
colors = CheckboxDefaults.colors( colors = CheckboxDefaults.colors(
checkedColor = colorResource(id = R.color.denim_blue200), checkedColor = DenimBlue200,
checkmarkColor = colorResource(id = R.color.error_activity_background), checkmarkColor = ErrorActivityBackground,
uncheckedColor = colorResource(R.color.denim_blue200) uncheckedColor = DenimBlue200
) )
) )
Text( Text(
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
text = stringResource(id = checkBoxItem.first), text = stringResource(id = checkBoxItem.first),
color = colorResource(id = R.color.white), color = White,
modifier = Modifier.padding(start = CRASH_CHECKBOX_TOP_PADDING) modifier = Modifier.padding(start = CRASH_CHECKBOX_TOP_PADDING)
) )
} }

9
core/src/main/java/org/kiwix/kiwixmobile/core/ui/components/KiwixButton.kt
View File

@ -26,10 +26,9 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource 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_ELEVATION
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.BUTTON_DEFAULT_PADDING import org.kiwix.kiwixmobile.core.utils.ComposeDimens.BUTTON_DEFAULT_PADDING
import org.kiwix.kiwixmobile.core.utils.ComposeDimens.BUTTON_PRESSED_ELEVATION import org.kiwix.kiwixmobile.core.utils.ComposeDimens.BUTTON_PRESSED_ELEVATION
@ -46,8 +45,8 @@ fun KiwixButton(
Button( Button(
onClick = { clickListener.invoke() }, onClick = { clickListener.invoke() },
colors = ButtonDefaults.buttonColors( colors = ButtonDefaults.buttonColors(
containerColor = colorResource(id = R.color.denim_blue800), containerColor = DenimBlue800,
contentColor = Color.White contentColor = White
), ),
modifier = Modifier.padding(BUTTON_DEFAULT_PADDING), modifier = Modifier.padding(BUTTON_DEFAULT_PADDING),
shape = MaterialTheme.shapes.extraSmall, shape = MaterialTheme.shapes.extraSmall,