Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: EdricChan03/studybuddy-android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 23fc5fd9bdf39bac0e07c27ef692eca3be761bed
Choose a base ref
..
head repository: EdricChan03/studybuddy-android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 924d5e31499e1eaeb5c9b0193fc6c726a337d570
Choose a head ref
2 changes: 1 addition & 1 deletion ...n/com/edricchan/studybuddy/features/settings/general/ui/compat/GeneralSettingsFragment.kt
View file
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ import com.edricchan.studybuddy.ui.common.fragment.BaseFragment
import com.edricchan.studybuddy.ui.theming.DarkThemeOption
import com.edricchan.studybuddy.ui.theming.applyDarkTheme
import com.edricchan.studybuddy.ui.theming.applyDynamicTheme
import com.edricchan.studybuddy.ui.theming.common.dynamic.isDynamicColorAvailable
import com.edricchan.studybuddy.ui.theming.compose.StudyBuddyTheme
import com.edricchan.studybuddy.ui.theming.isDynamicColorAvailable
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
1 change: 0 additions & 1 deletion gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -68,7 +68,6 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose
androidxtra-browser-ktx = "io.github.edricchan03.androidx.browser:browser-ktx:0.2.0"

# Accompanist
accompanist-material3-themeAdapter = { module = "com.google.accompanist:accompanist-themeadapter-material3", version.ref = "accompanist" }
accompanist-drawablePainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" }

# Other Compose dependencies
2 changes: 0 additions & 2 deletions ui/theming/compose/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -33,8 +33,6 @@ dependencies {

implementation(libs.androidx.compose.material3)

implementation(libs.accompanist.material3.themeAdapter)

testImplementation(libs.kotlin.test)
testImplementation(libs.kotest.runner.junit5)
testImplementation(libs.kotest.assertion.core)
18 changes: 0 additions & 18 deletions ...pose/src/main/kotlin/com/edricchan/studybuddy/ui/theming/compose/StudyBuddyCompatTheme.kt
View file

This file was deleted.

274 changes: 213 additions & 61 deletions ...ing/compose/src/main/kotlin/com/edricchan/studybuddy/ui/theming/compose/theme/m3/Color.kt
View file
Original file line number Diff line number Diff line change
@@ -2,67 +2,219 @@ package com.edricchan.studybuddy.ui.theming.compose.theme.m3

import androidx.compose.ui.graphics.Color

val md_theme_light_primary = Color(0xFF6C39DC)
val md_theme_light_onPrimary = Color(0xFFFFFFFF)
val md_theme_light_primaryContainer = Color(0xFFE9DDFF)
val md_theme_light_onPrimaryContainer = Color(0xFF22005D)
val md_theme_light_secondary = Color(0xFF764B9C)
val md_theme_light_onSecondary = Color(0xFFFFFFFF)
val md_theme_light_secondaryContainer = Color(0xFFF1DAFF)
val md_theme_light_onSecondaryContainer = Color(0xFF2D004F)
val md_theme_light_tertiary = Color(0xFF984063)
val md_theme_light_onTertiary = Color(0xFFFFFFFF)
val md_theme_light_tertiaryContainer = Color(0xFFFFD9E3)
val md_theme_light_onTertiaryContainer = Color(0xFF3E001E)
val md_theme_light_error = Color(0xFFBA1A1A)
val md_theme_light_errorContainer = Color(0xFFFFDAD6)
val md_theme_light_onError = Color(0xFFFFFFFF)
val md_theme_light_onErrorContainer = Color(0xFF410002)
val md_theme_light_background = Color(0xFFFFFBFF)
val md_theme_light_onBackground = Color(0xFF1C1B1E)
val md_theme_light_surface = Color(0xFFFFFBFF)
val md_theme_light_onSurface = Color(0xFF1C1B1E)
val md_theme_light_surfaceVariant = Color(0xFFE7E0EB)
val md_theme_light_onSurfaceVariant = Color(0xFF49454E)
val md_theme_light_outline = Color(0xFF7A757F)
val md_theme_light_inverseOnSurface = Color(0xFFF4EFF4)
val md_theme_light_inverseSurface = Color(0xFF313033)
val md_theme_light_inversePrimary = Color(0xFFCFBCFF)
val md_theme_light_shadow = Color(0xFF000000)
val md_theme_light_surfaceTint = Color(0xFF6C39DC)
val md_theme_light_outlineVariant = Color(0xFFCAC4CF)
val md_theme_light_scrim = Color(0xFF000000)
// Generated from https://material-foundation.github.io/material-theme-builder/?primary=%2321F5C7&bodyFont=Baloo+2&displayFont=Albert+Sans&colorMatch=false
val primaryLight = Color(0xFF6D538B)
val onPrimaryLight = Color(0xFFFFFFFF)
val primaryContainerLight = Color(0xFFEFDBFF)
val onPrimaryContainerLight = Color(0xFF553B71)
val secondaryLight = Color(0xFF655A6F)
val onSecondaryLight = Color(0xFFFFFFFF)
val secondaryContainerLight = Color(0xFFECDDF6)
val onSecondaryContainerLight = Color(0xFF4D4357)
val tertiaryLight = Color(0xFF805159)
val onTertiaryLight = Color(0xFFFFFFFF)
val tertiaryContainerLight = Color(0xFFFFD9DD)
val onTertiaryContainerLight = Color(0xFF653B41)
val errorLight = Color(0xFFBA1A1A)
val onErrorLight = Color(0xFFFFFFFF)
val errorContainerLight = Color(0xFFFFDAD6)
val onErrorContainerLight = Color(0xFF93000A)
val backgroundLight = Color(0xFFFFF7FF)
val onBackgroundLight = Color(0xFF1D1A20)
val surfaceLight = Color(0xFFFFF7FF)
val onSurfaceLight = Color(0xFF1D1A20)
val surfaceVariantLight = Color(0xFFE9E0EB)
val onSurfaceVariantLight = Color(0xFF4A454E)
val outlineLight = Color(0xFF7B757F)
val outlineVariantLight = Color(0xFFCCC4CF)
val scrimLight = Color(0xFF000000)
val inverseSurfaceLight = Color(0xFF332F35)
val inverseOnSurfaceLight = Color(0xFFF6EEF6)
val inversePrimaryLight = Color(0xFFD9BAFA)
val surfaceDimLight = Color(0xFFDFD8E0)
val surfaceBrightLight = Color(0xFFFFF7FF)
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
val surfaceContainerLowLight = Color(0xFFF9F1F9)
val surfaceContainerLight = Color(0xFFF3EBF3)
val surfaceContainerHighLight = Color(0xFFEEE6EE)
val surfaceContainerHighestLight = Color(0xFFE8E0E8)

val md_theme_dark_primary = Color(0xFFCFBCFF)
val md_theme_dark_onPrimary = Color(0xFF3A0092)
val md_theme_dark_primaryContainer = Color(0xFF5311C4)
val md_theme_dark_onPrimaryContainer = Color(0xFFE9DDFF)
val md_theme_dark_secondary = Color(0xFFDFB7FF)
val md_theme_dark_onSecondary = Color(0xFF45196A)
val md_theme_dark_secondaryContainer = Color(0xFF5D3282)
val md_theme_dark_onSecondaryContainer = Color(0xFFF1DAFF)
val md_theme_dark_tertiary = Color(0xFFFFB0C9)
val md_theme_dark_onTertiary = Color(0xFF5E1134)
val md_theme_dark_tertiaryContainer = Color(0xFF7A294B)
val md_theme_dark_onTertiaryContainer = Color(0xFFFFD9E3)
val md_theme_dark_error = Color(0xFFFFB4AB)
val md_theme_dark_errorContainer = Color(0xFF93000A)
val md_theme_dark_onError = Color(0xFF690005)
val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
val md_theme_dark_background = Color(0xFF1C1B1E)
val md_theme_dark_onBackground = Color(0xFFE6E1E6)
val md_theme_dark_surface = Color(0xFF1C1B1E)
val md_theme_dark_onSurface = Color(0xFFE6E1E6)
val md_theme_dark_surfaceVariant = Color(0xFF49454E)
val md_theme_dark_onSurfaceVariant = Color(0xFFCAC4CF)
val md_theme_dark_outline = Color(0xFF948F99)
val md_theme_dark_inverseOnSurface = Color(0xFF1C1B1E)
val md_theme_dark_inverseSurface = Color(0xFFE6E1E6)
val md_theme_dark_inversePrimary = Color(0xFF6C39DC)
val md_theme_dark_shadow = Color(0xFF000000)
val md_theme_dark_surfaceTint = Color(0xFFCFBCFF)
val md_theme_dark_outlineVariant = Color(0xFF49454E)
val md_theme_dark_scrim = Color(0xFF000000)
val primaryLightMediumContrast = Color(0xFF432A5F)
val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
val primaryContainerLightMediumContrast = Color(0xFF7D619B)
val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val secondaryLightMediumContrast = Color(0xFF3C3245)
val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
val secondaryContainerLightMediumContrast = Color(0xFF74697E)
val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val tertiaryLightMediumContrast = Color(0xFF522A31)
val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
val tertiaryContainerLightMediumContrast = Color(0xFF906067)
val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val errorLightMediumContrast = Color(0xFF740006)
val onErrorLightMediumContrast = Color(0xFFFFFFFF)
val errorContainerLightMediumContrast = Color(0xFFCF2C27)
val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
val backgroundLightMediumContrast = Color(0xFFFFF7FF)
val onBackgroundLightMediumContrast = Color(0xFF1D1A20)
val surfaceLightMediumContrast = Color(0xFFFFF7FF)
val onSurfaceLightMediumContrast = Color(0xFF131015)
val surfaceVariantLightMediumContrast = Color(0xFFE9E0EB)
val onSurfaceVariantLightMediumContrast = Color(0xFF39343D)
val outlineLightMediumContrast = Color(0xFF56505A)
val outlineVariantLightMediumContrast = Color(0xFF716B74)
val scrimLightMediumContrast = Color(0xFF000000)
val inverseSurfaceLightMediumContrast = Color(0xFF332F35)
val inverseOnSurfaceLightMediumContrast = Color(0xFFF6EEF6)
val inversePrimaryLightMediumContrast = Color(0xFFD9BAFA)
val surfaceDimLightMediumContrast = Color(0xFFCBC4CC)
val surfaceBrightLightMediumContrast = Color(0xFFFFF7FF)
val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
val surfaceContainerLowLightMediumContrast = Color(0xFFF9F1F9)
val surfaceContainerLightMediumContrast = Color(0xFFEEE6EE)
val surfaceContainerHighLightMediumContrast = Color(0xFFE2DAE2)
val surfaceContainerHighestLightMediumContrast = Color(0xFFD7CFD7)

val primaryLightHighContrast = Color(0xFF392055)
val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
val primaryContainerLightHighContrast = Color(0xFF573D74)
val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF)
val secondaryLightHighContrast = Color(0xFF32283B)
val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
val secondaryContainerLightHighContrast = Color(0xFF4F4559)
val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
val tertiaryLightHighContrast = Color(0xFF462127)
val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
val tertiaryContainerLightHighContrast = Color(0xFF683D44)
val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF)
val errorLightHighContrast = Color(0xFF600004)
val onErrorLightHighContrast = Color(0xFFFFFFFF)
val errorContainerLightHighContrast = Color(0xFF98000A)
val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
val backgroundLightHighContrast = Color(0xFFFFF7FF)
val onBackgroundLightHighContrast = Color(0xFF1D1A20)
val surfaceLightHighContrast = Color(0xFFFFF7FF)
val onSurfaceLightHighContrast = Color(0xFF000000)
val surfaceVariantLightHighContrast = Color(0xFFE9E0EB)
val onSurfaceVariantLightHighContrast = Color(0xFF000000)
val outlineLightHighContrast = Color(0xFF2F2A33)
val outlineVariantLightHighContrast = Color(0xFF4D4750)
val scrimLightHighContrast = Color(0xFF000000)
val inverseSurfaceLightHighContrast = Color(0xFF332F35)
val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
val inversePrimaryLightHighContrast = Color(0xFFD9BAFA)
val surfaceDimLightHighContrast = Color(0xFFBDB7BE)
val surfaceBrightLightHighContrast = Color(0xFFFFF7FF)
val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
val surfaceContainerLowLightHighContrast = Color(0xFFF6EEF6)
val surfaceContainerLightHighContrast = Color(0xFFE8E0E8)
val surfaceContainerHighLightHighContrast = Color(0xFFD9D2DA)
val surfaceContainerHighestLightHighContrast = Color(0xFFCBC4CC)

val seed = Color(0xFF8D5FFF)
val primaryDark = Color(0xFFD9BAFA)
val onPrimaryDark = Color(0xFF3D2459)
val primaryContainerDark = Color(0xFF553B71)
val onPrimaryContainerDark = Color(0xFFEFDBFF)
val secondaryDark = Color(0xFFD0C1DA)
val onSecondaryDark = Color(0xFF362D3F)
val secondaryContainerDark = Color(0xFF4D4357)
val onSecondaryContainerDark = Color(0xFFECDDF6)
val tertiaryDark = Color(0xFFF3B7BF)
val onTertiaryDark = Color(0xFF4B252C)
val tertiaryContainerDark = Color(0xFF653B41)
val onTertiaryContainerDark = Color(0xFFFFD9DD)
val errorDark = Color(0xFFFFB4AB)
val onErrorDark = Color(0xFF690005)
val errorContainerDark = Color(0xFF93000A)
val onErrorContainerDark = Color(0xFFFFDAD6)
val backgroundDark = Color(0xFF151218)
val onBackgroundDark = Color(0xFFE8E0E8)
val surfaceDark = Color(0xFF151218)
val onSurfaceDark = Color(0xFFE8E0E8)
val surfaceVariantDark = Color(0xFF4A454E)
val onSurfaceVariantDark = Color(0xFFCCC4CF)
val outlineDark = Color(0xFF958E98)
val outlineVariantDark = Color(0xFF4A454E)
val scrimDark = Color(0xFF000000)
val inverseSurfaceDark = Color(0xFFE8E0E8)
val inverseOnSurfaceDark = Color(0xFF332F35)
val inversePrimaryDark = Color(0xFF6D538B)
val surfaceDimDark = Color(0xFF151218)
val surfaceBrightDark = Color(0xFF3C383E)
val surfaceContainerLowestDark = Color(0xFF100D12)
val surfaceContainerLowDark = Color(0xFF1D1A20)
val surfaceContainerDark = Color(0xFF221E24)
val surfaceContainerHighDark = Color(0xFF2C292E)
val surfaceContainerHighestDark = Color(0xFF373339)

val primaryDarkMediumContrast = Color(0xFFEBD4FF)
val onPrimaryDarkMediumContrast = Color(0xFF32194E)
val primaryContainerDarkMediumContrast = Color(0xFFA285C1)
val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
val secondaryDarkMediumContrast = Color(0xFFE6D7F0)
val onSecondaryDarkMediumContrast = Color(0xFF2B2234)
val secondaryContainerDarkMediumContrast = Color(0xFF998CA3)
val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
val tertiaryDarkMediumContrast = Color(0xFFFFD1D6)
val onTertiaryDarkMediumContrast = Color(0xFF3E1A21)
val tertiaryContainerDarkMediumContrast = Color(0xFFB8838A)
val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
val errorDarkMediumContrast = Color(0xFFFFD2CC)
val onErrorDarkMediumContrast = Color(0xFF540003)
val errorContainerDarkMediumContrast = Color(0xFFFF5449)
val onErrorContainerDarkMediumContrast = Color(0xFF000000)
val backgroundDarkMediumContrast = Color(0xFF151218)
val onBackgroundDarkMediumContrast = Color(0xFFE8E0E8)
val surfaceDarkMediumContrast = Color(0xFF151218)
val onSurfaceDarkMediumContrast = Color(0xFFFFFFFF)
val surfaceVariantDarkMediumContrast = Color(0xFF4A454E)
val onSurfaceVariantDarkMediumContrast = Color(0xFFE2D9E5)
val outlineDarkMediumContrast = Color(0xFFB7AFBA)
val outlineVariantDarkMediumContrast = Color(0xFF958E98)
val scrimDarkMediumContrast = Color(0xFF000000)
val inverseSurfaceDarkMediumContrast = Color(0xFFE8E0E8)
val inverseOnSurfaceDarkMediumContrast = Color(0xFF2C292F)
val inversePrimaryDarkMediumContrast = Color(0xFF563C73)
val surfaceDimDarkMediumContrast = Color(0xFF151218)
val surfaceBrightDarkMediumContrast = Color(0xFF474349)
val surfaceContainerLowestDarkMediumContrast = Color(0xFF09070B)
val surfaceContainerLowDarkMediumContrast = Color(0xFF201C22)
val surfaceContainerDarkMediumContrast = Color(0xFF2A272C)
val surfaceContainerHighDarkMediumContrast = Color(0xFF353137)
val surfaceContainerHighestDarkMediumContrast = Color(0xFF403C42)

val primaryDarkHighContrast = Color(0xFFF8ECFF)
val onPrimaryDarkHighContrast = Color(0xFF000000)
val primaryContainerDarkHighContrast = Color(0xFFD5B6F6)
val onPrimaryContainerDarkHighContrast = Color(0xFF15002C)
val secondaryDarkHighContrast = Color(0xFFF8ECFF)
val onSecondaryDarkHighContrast = Color(0xFF000000)
val secondaryContainerDarkHighContrast = Color(0xFFCCBDD6)
val onSecondaryContainerDarkHighContrast = Color(0xFF100819)
val tertiaryDarkHighContrast = Color(0xFFFFEBED)
val onTertiaryDarkHighContrast = Color(0xFF000000)
val tertiaryContainerDarkHighContrast = Color(0xFFEEB3BB)
val onTertiaryContainerDarkHighContrast = Color(0xFF1D0308)
val errorDarkHighContrast = Color(0xFFFFECE9)
val onErrorDarkHighContrast = Color(0xFF000000)
val errorContainerDarkHighContrast = Color(0xFFFFAEA4)
val onErrorContainerDarkHighContrast = Color(0xFF220001)
val backgroundDarkHighContrast = Color(0xFF151218)
val onBackgroundDarkHighContrast = Color(0xFFE8E0E8)
val surfaceDarkHighContrast = Color(0xFF151218)
val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
val surfaceVariantDarkHighContrast = Color(0xFF4A454E)
val onSurfaceVariantDarkHighContrast = Color(0xFFFFFFFF)
val outlineDarkHighContrast = Color(0xFFF6EDF8)
val outlineVariantDarkHighContrast = Color(0xFFC8C0CB)
val scrimDarkHighContrast = Color(0xFF000000)
val inverseSurfaceDarkHighContrast = Color(0xFFE8E0E8)
val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
val inversePrimaryDarkHighContrast = Color(0xFF563C73)
val surfaceDimDarkHighContrast = Color(0xFF151218)
val surfaceBrightDarkHighContrast = Color(0xFF534E55)
val surfaceContainerLowestDarkHighContrast = Color(0xFF000000)
val surfaceContainerLowDarkHighContrast = Color(0xFF221E24)
val surfaceContainerDarkHighContrast = Color(0xFF332F35)
val surfaceContainerHighDarkHighContrast = Color(0xFF3E3A40)
val surfaceContainerHighestDarkHighContrast = Color(0xFF49454C)
Loading