fix

# Conflicts:
#	app/src/main/java/com/example/ppb_kelompok2/MainActivity.kt

app/src/main/java/com/example/ppb_kelompok2/MainActivity.kt

@@ -412,7 +412,7 @@ fun JournalHistoryScreen(navController: NavController) {
         }
     }
 }
-
+//eeeuiuifs
 @Composable
 fun TrendGraph(journals: List<JournalEntry>) {
     if (journals.size < 2) {

app/src/main/java/com/example/ppb_kelompok2/ui/theme/Color.kt

@@ -2,10 +2,17 @@ package com.example.ppb_kelompok2.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
+// Pink Muda, Merah, dan Putih Theme
+val PinkMuda = Color(0xFFFFD1DC) // Pink sangat muda
+val MerahUtama = Color(0xFFFF5252) // Merah cerah
+val MerahTua = Color(0xFFD32F2F) // Merah gelap untuk teks/aksen
+val PutihMurni = Color(0xFFFFFFFF) // Putih
+val PinkAksen = Color(0xFFFFB6C1) // Pink untuk variasi
+
+// Tetap pertahankan default jika diperlukan (opsional)
 val Purple80 = Color(0xFFD0BCFF)
 val PurpleGrey80 = Color(0xFFCCC2DC)
 val Pink80 = Color(0xFFEFB8C8)
-
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
+val Pink40 = Color(0xFF7D5260)

app/src/main/java/com/example/ppb_kelompok2/ui/theme/Theme.kt

@@ -9,35 +9,36 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 
 private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
+    primary = MerahUtama,
+    secondary = PinkAksen,
+    tertiary = PinkMuda,
+    background = Color(0xFF1C1B1F),
+    surface = Color(0xFF1C1B1F),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.Black
 )
 
 private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
+    primary = MerahUtama,
+    secondary = MerahTua,
+    tertiary = PinkMuda,
+    background = PutihMurni,
+    surface = PutihMurni,
+    onPrimary = PutihMurni,
+    onSecondary = PutihMurni,
+    onTertiary = Color.Black,
+    surfaceVariant = PinkMuda
 )
 
 @Composable
 fun PPB_Kelompok2Theme(
     darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
+    dynamicColor: Boolean = false,
     content: @Composable () -> Unit
 ) {
     val colorScheme = when {
@@ -45,7 +46,6 @@ fun PPB_Kelompok2Theme(
             val context = LocalContext.current
             if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
         }
-
         darkTheme -> DarkColorScheme
         else -> LightColorScheme
     }
@@ -55,4 +55,4 @@ fun PPB_Kelompok2Theme(
         typography = Typography,
         content = content
     )
-}
+}

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.13.1"
+agp = "8.13.2"
 kotlin = "2.0.21"
 coreKtx = "1.10.1"
 junit = "4.13.2"