Color improvements

This commit is contained in:
Juha Heinanen
2025-04-11 20:29:14 +03:00
parent 7f3b4e3d57
commit f593291b61
5 changed files with 16 additions and 4 deletions

View File

@ -34,6 +34,7 @@ data class CustomColors(
val alertText: Color = Color.Unspecified,
val codec: Color = Color.Unspecified,
val background: Color = Color.Unspecified,
val cardBackground: Color = Color.Unspecified,
val textFieldBackground: Color = Color.Unspecified,
val popupBackground: Color = Color.Unspecified,
val alert: Color = Color.Unspecified,
@ -69,6 +70,7 @@ val light_alert_text = light_black
val light_codec = light_black
val light_background = light_light
val light_textfield_background = light_gray_light
val light_card_background = light_gray_light
val light_popup_background = light_secondary_dark
val light_alert = light_primary
val light_actionbar = light_background
@ -93,7 +95,7 @@ val dark_traffic_green = Color(0xFF2E7D32)
val dark_traffic_yellow = Color(0xFFF9A825)
val dark_traffic_red = Color(0xFFC62828)
val dark_light = dark_gray_light
val dark_dark = Color(0xFF383838)
val dark_dark = Color(0xFF121212)
val dark_spinner_text = dark_dark
val dark_spinner_dropdown = dark_gray
val dark_spinner_divider = dark_gray_dark
@ -102,6 +104,7 @@ val dark_alert_text = dark_gray_light
val dark_codec = dark_secondary_dark
val dark_background = dark_dark
val dark_textfield_background = dark_gray
val dark_card_background = dark_gray_dark
val dark_popup_background = dark_secondary_dark
val dark_alert = dark_primary_light
val dark_actionbar = dark_gray_dark
@ -135,6 +138,7 @@ val LightCustomColors = CustomColors(
alertText = light_alert_text,
codec = light_codec,
background = light_background,
cardBackground = light_card_background,
textFieldBackground = light_textfield_background,
popupBackground = light_popup_background,
alert = light_alert,
@ -170,6 +174,7 @@ val DarkCustomColors = CustomColors(
alertText = dark_alert_text,
codec = dark_codec,
background = dark_background,
cardBackground = dark_card_background,
textFieldBackground = dark_textfield_background,
popupBackground = dark_popup_background,
alert = dark_alert,

View File

@ -32,6 +32,7 @@ import androidx.compose.material3.AlertDialogDefaults
import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Checkbox
import androidx.compose.material3.CheckboxDefaults
import androidx.compose.material3.DropdownMenu
@ -335,9 +336,13 @@ object CustomElements {
},
content = {
Card(
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 0.dp),
shape = RoundedCornerShape(16.dp),
colors = CardDefaults.cardColors(
containerColor = LocalCustomColors.current.cardBackground
)
) {
Column(modifier = Modifier.padding(16.dp)) {
androidx.compose.material3.Text(

View File

@ -28,6 +28,7 @@
<color name="colorItemText">@color/colorGrayLight</color>
<color name="colorAlertText">@color/colorGrayLight</color>
<color name="colorCodec">@color/colorSecondaryDark</color>
<color name="colorCardBackground">@color/colorGrayDark</color>
<color name="colorPopupBackground">@color/colorSecondaryDark</color>
<color name="colorAlert">@color/colorPrimaryLight</color>
</resources>

View File

@ -28,6 +28,7 @@
<color name="colorItemText">@color/colorBlack</color>
<color name="colorAlertText">@color/colorBlack</color>
<color name="colorCodec">@color/colorBlack</color>
<color name="colorCardBackground">@color/colorGrayLight</color>
<color name="colorPopupBackground">@color/colorSecondaryDark</color>
<color name="colorAlert">@color/colorPrimary</color>
</resources>

View File

@ -6,8 +6,8 @@
<item name="buttonBarPositiveButtonStyle">@style/Alert.Button.Positive</item>
<item name="buttonBarNegativeButtonStyle">@style/Alert.Button.Positive</item>
<item name="buttonBarNeutralButtonStyle">@style/Alert.Button.Neutral</item>
<item name="android:windowBackground">@color/colorBackground</item>
<item name="android:background">@color/colorBackground</item>
<item name="android:windowBackground">@color/colorCardBackground</item>
<item name="android:background">@color/colorCardBackground</item>
<item name="android:textSize">14sp</item>
</style>