diff --git a/app/src/main/java/com/lifting/app/theme/Color.kt b/app/src/main/java/com/lifting/app/theme/Color.kt deleted file mode 100644 index c773ad3..0000000 --- a/app/src/main/java/com/lifting/app/theme/Color.kt +++ /dev/null @@ -1,90 +0,0 @@ -package com.lifting.app.theme - -import androidx.compose.ui.graphics.Color - - -val md_theme_light_primary = Color(0xFF4A6700) -val md_theme_light_onPrimary = Color(0xFFFFFFFF) -val md_theme_light_primaryContainer = Color(0xFFC5F26A) -val md_theme_light_onPrimaryContainer = Color(0xFF141F00) -val md_theme_light_secondary = Color(0xFF5A6148) -val md_theme_light_onSecondary = Color(0xFFFFFFFF) -val md_theme_light_secondaryContainer = Color(0xFFDEE6C5) -val md_theme_light_onSecondaryContainer = Color(0xFF171E09) -val md_theme_light_tertiary = Color(0xFF396660) -val md_theme_light_onTertiary = Color(0xFFFFFFFF) -val md_theme_light_tertiaryContainer = Color(0xFFBCECE4) -val md_theme_light_onTertiaryContainer = Color(0xFF00201D) -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(0xFFFEFCF4) -val md_theme_light_onBackground = Color(0xFF1B1C17) -val md_theme_light_surface = Color(0xFFFEFCF4) -val md_theme_light_onSurface = Color(0xFF1B1C17) -val md_theme_light_surfaceVariant = Color(0xFFE2E4D4) -val md_theme_light_onSurfaceVariant = Color(0xFF45483C) -val md_theme_light_outline = Color(0xFF76786B) -val md_theme_light_inverseOnSurface = Color(0xFFF2F1E9) -val md_theme_light_inverseSurface = Color(0xFF30312C) -val md_theme_light_inversePrimary = Color(0xFFAAD551) -val md_theme_light_shadow = Color(0xFF000000) -val md_theme_light_surfaceTint = Color(0xFF4A6700) -val md_theme_light_outlineVariant = Color(0xFFC6C8B9) -val md_theme_light_scrim = Color(0xFF000000) - -val md_theme_dark_primary = Color(0xFFAAD551) -val md_theme_dark_onPrimary = Color(0xFF253600) -val md_theme_dark_primaryContainer = Color(0xFF374E00) -val md_theme_dark_onPrimaryContainer = Color(0xFFC5F26A) -val md_theme_dark_secondary = Color(0xFFC2CAAB) -val md_theme_dark_onSecondary = Color(0xFF2C331D) -val md_theme_dark_secondaryContainer = Color(0xFF424A31) -val md_theme_dark_onSecondaryContainer = Color(0xFFDEE6C5) -val md_theme_dark_tertiary = Color(0xFFA0D0C8) -val md_theme_dark_onTertiary = Color(0xFF013732) -val md_theme_dark_tertiaryContainer = Color(0xFF204E49) -val md_theme_dark_onTertiaryContainer = Color(0xFFBCECE4) -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(0xFF1B1C17) -val md_theme_dark_onBackground = Color(0xFFE4E3DB) -val md_theme_dark_surface = Color(0xFF1B1C17) -val md_theme_dark_onSurface = Color(0xFFE4E3DB) -val md_theme_dark_surfaceVariant = Color(0xFF45483C) -val md_theme_dark_onSurfaceVariant = Color(0xFFC6C8B9) -val md_theme_dark_outline = Color(0xFF8F9284) -val md_theme_dark_inverseOnSurface = Color(0xFF1B1C17) -val md_theme_dark_inverseSurface = Color(0xFFE4E3DB) -val md_theme_dark_inversePrimary = Color(0xFF4A6700) -val md_theme_dark_shadow = Color(0xFF000000) -val md_theme_dark_surfaceTint = Color(0xFFAAD551) -val md_theme_dark_outlineVariant = Color(0xFF45483C) -val md_theme_dark_scrim = Color(0xFF000000) - - -val seed = Color(0xFFADD854) - -/*val Purple80 = Color(0xFFCAF76F) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) -val Black80 = Color(0xFF191919) -val White80 = Color(0xFFECECEC) - -val Purple40 = Color(0xFFCAF76F) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) -val Black40 = Color(0xFF191919) -val White40 = Color(0xFFECECEC) - -val white10 = Color(0xFFD9D9D9) -val white30 = Color(0xFFC6C6C6) -val grey10 = Color(0XFFA0A0A0) -val grey30 = Color(0xFF606060) -val grey50 = Color(0xFF404040) -val black20 = Color(0xFF202020)*/ - -val PremiumPrimaryColor = Color(0xFFFFD700) \ No newline at end of file diff --git a/app/src/main/java/com/lifting/app/theme/Theme.kt b/app/src/main/java/com/lifting/app/theme/Theme.kt deleted file mode 100644 index 9436191..0000000 --- a/app/src/main/java/com/lifting/app/theme/Theme.kt +++ /dev/null @@ -1,123 +0,0 @@ -package com.lifting.app.theme - -import android.app.Activity -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.lightColorScheme -import androidx.compose.runtime.Composable -import androidx.compose.runtime.SideEffect -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.toArgb -import androidx.compose.ui.platform.LocalView -import androidx.core.view.WindowCompat - -private val LightColors = lightColorScheme( - primary = md_theme_light_primary, - onPrimary = md_theme_light_onPrimary, - primaryContainer = md_theme_light_primaryContainer, - onPrimaryContainer = md_theme_light_onPrimaryContainer, - secondary = md_theme_light_secondary, - onSecondary = md_theme_light_onSecondary, - secondaryContainer = md_theme_light_secondaryContainer, - onSecondaryContainer = md_theme_light_onSecondaryContainer, - tertiary = md_theme_light_tertiary, - onTertiary = md_theme_light_onTertiary, - tertiaryContainer = md_theme_light_tertiaryContainer, - onTertiaryContainer = md_theme_light_onTertiaryContainer, - error = md_theme_light_error, - errorContainer = md_theme_light_errorContainer, - onError = md_theme_light_onError, - onErrorContainer = md_theme_light_onErrorContainer, - background = md_theme_light_background, - onBackground = md_theme_light_onBackground, - surface = md_theme_light_surface, - onSurface = md_theme_light_onSurface, - surfaceVariant = md_theme_light_surfaceVariant, - onSurfaceVariant = md_theme_light_onSurfaceVariant, - outline = md_theme_light_outline, - inverseOnSurface = md_theme_light_inverseOnSurface, - inverseSurface = md_theme_light_inverseSurface, - inversePrimary = md_theme_light_inversePrimary, - surfaceTint = md_theme_light_surfaceTint, - outlineVariant = md_theme_light_outlineVariant, - scrim = md_theme_light_scrim, -) - - -private val DarkColors = darkColorScheme( - primary = md_theme_dark_primary, - onPrimary = md_theme_dark_onPrimary, - primaryContainer = md_theme_dark_primaryContainer, - onPrimaryContainer = md_theme_dark_onPrimaryContainer, - secondary = md_theme_dark_secondary, - onSecondary = md_theme_dark_onSecondary, - secondaryContainer = md_theme_dark_secondaryContainer, - onSecondaryContainer = md_theme_dark_onSecondaryContainer, - tertiary = md_theme_dark_tertiary, - onTertiary = md_theme_dark_onTertiary, - tertiaryContainer = md_theme_dark_tertiaryContainer, - onTertiaryContainer = md_theme_dark_onTertiaryContainer, - error = md_theme_dark_error, - errorContainer = md_theme_dark_errorContainer, - onError = md_theme_dark_onError, - onErrorContainer = md_theme_dark_onErrorContainer, - background = md_theme_dark_background, - onBackground = md_theme_dark_onBackground, - surface = md_theme_dark_surface, - onSurface = md_theme_dark_onSurface, - surfaceVariant = md_theme_dark_surfaceVariant, - onSurfaceVariant = md_theme_dark_onSurfaceVariant, - outline = md_theme_dark_outline, - inverseOnSurface = md_theme_dark_inverseOnSurface, - inverseSurface = md_theme_dark_inverseSurface, - inversePrimary = md_theme_dark_inversePrimary, - surfaceTint = md_theme_dark_surfaceTint, - outlineVariant = md_theme_dark_outlineVariant, - scrim = md_theme_dark_scrim, -) - -/*val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80, - background = Black80, - onBackground = White80 -) - -val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40, - background = Black40, - onBackground = White40 -)*/ - -@Composable -fun FitnessAppTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - isPremiumUser:Boolean, - content: @Composable () -> Unit -) { - val colorScheme = if (!darkTheme) { - DarkColors - } else { - DarkColors - } - if (isPremiumUser) colorScheme.copy(primary = PremiumPrimaryColor) - //val colorScheme = if (isPremiumUser) LightColorScheme.copy(primary = PremiumPrimaryColor) else if (darkTheme) DarkColorScheme else LightColorScheme - val view = LocalView.current - if (!view.isInEditMode) { - SideEffect { - val window = (view.context as Activity).window - window.statusBarColor = Color.Black.toArgb() - WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme - } - } - - MaterialTheme( - colorScheme = colorScheme, - typography = Typography, - content = content - ) -} \ No newline at end of file diff --git a/app/src/main/java/com/lifting/app/theme/Type.kt b/app/src/main/java/com/lifting/app/theme/Type.kt deleted file mode 100644 index b67317b..0000000 --- a/app/src/main/java/com/lifting/app/theme/Type.kt +++ /dev/null @@ -1,69 +0,0 @@ -package com.lifting.app.theme - -import androidx.compose.material3.Typography -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp -import com.lifting.app.R - -val macPawFixel = FontFamily( - Font(R.font.fixeltext_regular), - Font(R.font.fixeltext_bold, FontWeight.Bold), - Font(R.font.fixeltext_medium, FontWeight.Medium) -) -// Set of Material typography styles to start with -val Typography = Typography( - headlineMedium = TextStyle( - fontFamily = macPawFixel, - fontWeight = FontWeight.Normal, - fontSize = 28.sp, - lineHeight = 28.sp - ), - headlineSmall = TextStyle( - fontFamily = macPawFixel, - fontWeight = FontWeight.Normal, - fontSize = 24.sp, - lineHeight = 24.sp - ), - bodyLarge = TextStyle( - fontFamily = macPawFixel, - fontWeight = FontWeight.Normal, - fontSize = 17.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp - ), - titleLarge = TextStyle( - fontFamily = macPawFixel, - fontWeight = FontWeight.Bold, - fontSize = 28.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp - ), - titleMedium = TextStyle( - fontFamily = macPawFixel, - fontWeight = FontWeight.Normal, - fontSize = 22.sp - ), - titleSmall = TextStyle( - fontFamily = macPawFixel, - fontWeight = FontWeight.Normal, - fontSize = 18.sp - ), - labelMedium = TextStyle( - fontFamily = macPawFixel, - fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ), - labelSmall = TextStyle( - fontFamily = macPawFixel, - fontWeight = FontWeight.Normal, - fontSize = 14.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ) - -) \ No newline at end of file diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index 4207621..f5ea45f 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -30,6 +30,14 @@ android { kotlinOptions { jvmTarget = "1.8" } + + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerExtensionVersion = Versions.kotlinCompilerExtensionVersion + } } dependencies { diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts index fa10b96..45dc644 100644 --- a/core/navigation/build.gradle.kts +++ b/core/navigation/build.gradle.kts @@ -42,6 +42,7 @@ android { } dependencies { + api(project(":core:designsystem")) Compose.list.forEach(::api) api(Compose.material) api(Compose.materialNavigation) diff --git a/core/navigation/src/main/java/com/lifting/app/core/navigation/bottom_nav/BottomNavigationBar.kt b/core/navigation/src/main/java/com/lifting/app/core/navigation/bottom_nav/BottomNavigationBar.kt index 7a9817b..e5a6753 100644 --- a/core/navigation/src/main/java/com/lifting/app/core/navigation/bottom_nav/BottomNavigationBar.kt +++ b/core/navigation/src/main/java/com/lifting/app/core/navigation/bottom_nav/BottomNavigationBar.kt @@ -2,7 +2,6 @@ package com.lifting.app.core.navigation.bottom_nav import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.NavigationBar import androidx.compose.material3.NavigationBarItem import androidx.compose.material3.Text @@ -12,6 +11,7 @@ import androidx.navigation.NavDestination.Companion.hierarchy import androidx.navigation.NavGraph.Companion.findStartDestination import androidx.navigation.NavHostController import androidx.navigation.compose.currentBackStackEntryAsState +import com.lifting.app.core.designsystem.LiftingTheme /** * Created by bedirhansaricayir on 13.07.2024 @@ -26,8 +26,8 @@ internal fun BottomNavigationBar( val currentDestination = navBackStackEntry?.destination NavigationBar( - containerColor = MaterialTheme.colorScheme.background, - contentColor = MaterialTheme.colorScheme.onBackground, + containerColor = LiftingTheme.colors.background, + contentColor = LiftingTheme.colors.onBackground, ) { BottomNavigationItem.entries.forEachIndexed { index, item -> val isSelected = currentDestination?.hierarchy?.any {