refactor: color adjustment in dark theme

PetJournal · Nov 11, 2024 · 2c952b2 · 2c952b2
1 parent d963802
commit 2c952b2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/petJournal/app/src/main/java/com/soujunior/petjournal/ui/components/DateInputText.kt b/petJournal/app/src/main/java/com/soujunior/petjournal/ui/components/DateInputText.kt
@@ -2,6 +2,7 @@ package com.soujunior.petjournal.ui.components
 
 import android.util.Log
 import androidx.compose.foundation.border
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -163,7 +164,7 @@ fun DateInputText(
             } else {
                 Text(
                     "*Campo Obrigatório.",
-                    color = MaterialTheme.colorScheme.outline,
+                    color = if (isSystemInDarkTheme()) Color.White else MaterialTheme.colorScheme.outline,
                     modifier = Modifier.padding(10.sdp),
                     fontSize = 12.ssp
                 )

diff --git a/...etjournal/ui/screens_app/screens_pets/petBirthDateScreen/components/CastrationSelector.kt b/...etjournal/ui/screens_app/screens_pets/petBirthDateScreen/components/CastrationSelector.kt
@@ -1,5 +1,6 @@
 package com.soujunior.petjournal.ui.screens_app.screens_pets.petBirthDateScreen.components
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -132,7 +133,7 @@ private fun CastrationButtons(
                 text = stringResource(id = R.string.required_field),
                 modifier = Modifier.padding(start = 2.sdp, top = 10.sdp),
                 fontSize = 12.ssp,
-                color = MaterialTheme.colorScheme.outline,
+                color = if (isSystemInDarkTheme()) Color.White else MaterialTheme.colorScheme.outline,
                 textAlign = TextAlign.Start
             )
         }

diff --git a/.../soujunior/petjournal/ui/screens_app/screens_pets/petBirthDateScreen/components/Header.kt b/.../soujunior/petjournal/ui/screens_app/screens_pets/petBirthDateScreen/components/Header.kt
@@ -1,5 +1,6 @@
 package com.soujunior.petjournal.ui.screens_app.screens_pets.petBirthDateScreen.components
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -8,6 +9,7 @@ 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.stringResource
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
@@ -55,7 +57,7 @@ fun Header(
             text = text,
             style = MaterialTheme.typography.headlineMedium,
             textAlign = TextAlign.Start,
-            color = ColorCustom.gray_200,
+            color = if(isSystemInDarkTheme()) Color.White else ColorCustom.gray_200,
             fontSize = 12.ssp,
             fontWeight = FontWeight(400)
         )

diff --git a/...junior/petjournal/ui/screens_app/screens_pets/petNameAndGenderScreen/components/Screen.kt b/...junior/petjournal/ui/screens_app/screens_pets/petNameAndGenderScreen/components/Screen.kt
@@ -204,7 +204,7 @@ fun Screen(idPetInformation: String?, navController: NavController) {
                                                 text = stringResource(R.string.text_continue),
                                                 buttonColor = if (isDarkMode)  ButtonDefaults.buttonColors(MaterialTheme.colorScheme.onSecondary)
                                                 else ButtonDefaults.buttonColors(MaterialTheme.colorScheme.primary),
-                                                textColor = if (isDarkMode) MaterialTheme.colorScheme.primary else Color.White,
+                                                textColor = if (isDarkMode) MaterialTheme.colorScheme.surface else Color.White,
                                             )
                                         }
                                     }