Skip to content

Commit 72a1ae5

Browse files
DaveDeveloper117DaveDeveloper117
committed
feat: color ui and screenshot add
1 parent 37451cd commit 72a1ae5

File tree

6 files changed

+47
-49
lines changed

6 files changed

+47
-49
lines changed

‎app/src/main/java/com/davedevab/composetutorial/ui/main/MainActivity.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.material3.MaterialTheme
88
import androidx.compose.material3.Surface
99
import androidx.compose.ui.Modifier
10-
import com.davedevab.composetutorial.ComposeTutorialTheme
10+
import com.davedevab.composetutorial.ui.theme.ComposeTutorialTheme
1111
import com.davedevab.composetutorial.ui.home.HomeScreen
12-
import com.davedevab.composetutorial.ui.home.HomeViewModel
1312

1413
import dagger.hilt.android.AndroidEntryPoint
15-
import javax.inject.Inject
1614

1715
@AndroidEntryPoint
1816
class MainActivity : ComponentActivity() {

‎app/src/main/java/com/davedevab/composetutorial/ui/theme/Color.kt‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
package com.davedevab.composetutorial
1+
package com.davedevab.composetutorial.ui.theme
22
import androidx.compose.ui.graphics.Color
33

4-
val md_theme_light_primary = Color(0xFF9A461F)
4+
val md_theme_light_primary = Color(0xFF9A4059)
55
val md_theme_light_onPrimary = Color(0xFFFFFFFF)
6-
val md_theme_light_primaryContainer = Color(0xFFFFDBCE)
7-
val md_theme_light_onPrimaryContainer = Color(0xFF370E00)
8-
val md_theme_light_secondary = Color(0xFF356A21)
6+
val md_theme_light_primaryContainer = Color(0xFFFFD9DF)
7+
val md_theme_light_onPrimaryContainer = Color(0xFF3F0018)
8+
val md_theme_light_secondary = Color(0xFF9C4048)
99
val md_theme_light_onSecondary = Color(0xFFFFFFFF)
10-
val md_theme_light_secondaryContainer = Color(0xFFB5F399)
11-
val md_theme_light_onSecondaryContainer = Color(0xFF052100)
12-
val md_theme_light_tertiary = Color(0xFF556500)
10+
val md_theme_light_secondaryContainer = Color(0xFFFFDADA)
11+
val md_theme_light_onSecondaryContainer = Color(0xFF40000C)
12+
val md_theme_light_tertiary = Color(0xFF9C432E)
1313
val md_theme_light_onTertiary = Color(0xFFFFFFFF)
14-
val md_theme_light_tertiaryContainer = Color(0xFFD8ED7C)
15-
val md_theme_light_onTertiaryContainer = Color(0xFF181E00)
14+
val md_theme_light_tertiaryContainer = Color(0xFFFFDAD2)
15+
val md_theme_light_onTertiaryContainer = Color(0xFF3D0700)
1616
val md_theme_light_error = Color(0xFFBA1A1A)
1717
val md_theme_light_errorContainer = Color(0xFFFFDAD6)
1818
val md_theme_light_onError = Color(0xFFFFFFFF)
1919
val md_theme_light_onErrorContainer = Color(0xFF410002)
2020
val md_theme_light_background = Color(0xFFFFFBFF)
21-
val md_theme_light_onBackground = Color(0xFF1C1D00)
21+
val md_theme_light_onBackground = Color(0xFF201A1B)
2222
val md_theme_light_surface = Color(0xFFFFFBFF)
23-
val md_theme_light_onSurface = Color(0xFF1C1D00)
24-
val md_theme_light_surfaceVariant = Color(0xFFF5DED6)
25-
val md_theme_light_onSurfaceVariant = Color(0xFF53433E)
26-
val md_theme_light_outline = Color(0xFF85736D)
27-
val md_theme_light_inverseOnSurface = Color(0xFFF5F77E)
28-
val md_theme_light_inverseSurface = Color(0xFF313300)
29-
val md_theme_light_inversePrimary = Color(0xFFFFB598)
23+
val md_theme_light_onSurface = Color(0xFF201A1B)
24+
val md_theme_light_surfaceVariant = Color(0xFFF3DDE0)
25+
val md_theme_light_onSurfaceVariant = Color(0xFF524346)
26+
val md_theme_light_outline = Color(0xFF847375)
27+
val md_theme_light_inverseOnSurface = Color(0xFFFAEEEF)
28+
val md_theme_light_inverseSurface = Color(0xFF352F30)
29+
val md_theme_light_inversePrimary = Color(0xFFFFB1C1)
3030
val md_theme_light_shadow = Color(0xFF000000)
31-
val md_theme_light_surfaceTint = Color(0xFF9A461F)
32-
val md_theme_light_outlineVariant = Color(0xFFD8C2BA)
31+
val md_theme_light_surfaceTint = Color(0xFF9A4059)
32+
val md_theme_light_outlineVariant = Color(0xFFD6C2C4)
3333
val md_theme_light_scrim = Color(0xFF000000)
3434

35-
val md_theme_dark_primary = Color(0xFFFFB598)
36-
val md_theme_dark_onPrimary = Color(0xFF591D00)
37-
val md_theme_dark_primaryContainer = Color(0xFF7B2F08)
38-
val md_theme_dark_onPrimaryContainer = Color(0xFFFFDBCE)
39-
val md_theme_dark_secondary = Color(0xFF9AD680)
40-
val md_theme_dark_onSecondary = Color(0xFF0C3900)
41-
val md_theme_dark_secondaryContainer = Color(0xFF1D5209)
42-
val md_theme_dark_onSecondaryContainer = Color(0xFFB5F399)
43-
val md_theme_dark_tertiary = Color(0xFFBCD063)
44-
val md_theme_dark_onTertiary = Color(0xFF2B3400)
45-
val md_theme_dark_tertiaryContainer = Color(0xFF404C00)
46-
val md_theme_dark_onTertiaryContainer = Color(0xFFD8ED7C)
35+
val md_theme_dark_primary = Color(0xFFFFB1C1)
36+
val md_theme_dark_onPrimary = Color(0xFF5F112C)
37+
val md_theme_dark_primaryContainer = Color(0xFF7C2942)
38+
val md_theme_dark_onPrimaryContainer = Color(0xFFFFD9DF)
39+
val md_theme_dark_secondary = Color(0xFFFFB3B5)
40+
val md_theme_dark_onSecondary = Color(0xFF5F121E)
41+
val md_theme_dark_secondaryContainer = Color(0xFF7D2932)
42+
val md_theme_dark_onSecondaryContainer = Color(0xFFFFDADA)
43+
val md_theme_dark_tertiary = Color(0xFFFFB4A2)
44+
val md_theme_dark_onTertiary = Color(0xFF5E1605)
45+
val md_theme_dark_tertiaryContainer = Color(0xFF7D2C19)
46+
val md_theme_dark_onTertiaryContainer = Color(0xFFFFDAD2)
4747
val md_theme_dark_error = Color(0xFFFFB4AB)
4848
val md_theme_dark_errorContainer = Color(0xFF93000A)
4949
val md_theme_dark_onError = Color(0xFF690005)
5050
val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
51-
val md_theme_dark_background = Color(0xFF1C1D00)
52-
val md_theme_dark_onBackground = Color(0xFFE6E971)
53-
val md_theme_dark_surface = Color(0xFF1C1D00)
54-
val md_theme_dark_onSurface = Color(0xFFE6E971)
55-
val md_theme_dark_surfaceVariant = Color(0xFF53433E)
56-
val md_theme_dark_onSurfaceVariant = Color(0xFFD8C2BA)
57-
val md_theme_dark_outline = Color(0xFFA08D86)
58-
val md_theme_dark_inverseOnSurface = Color(0xFF1C1D00)
59-
val md_theme_dark_inverseSurface = Color(0xFFE6E971)
60-
val md_theme_dark_inversePrimary = Color(0xFF9A461F)
51+
val md_theme_dark_background = Color(0xFF201A1B)
52+
val md_theme_dark_onBackground = Color(0xFFECE0E0)
53+
val md_theme_dark_surface = Color(0xFF201A1B)
54+
val md_theme_dark_onSurface = Color(0xFFECE0E0)
55+
val md_theme_dark_surfaceVariant = Color(0xFF524346)
56+
val md_theme_dark_onSurfaceVariant = Color(0xFFD6C2C4)
57+
val md_theme_dark_outline = Color(0xFF9E8C8F)
58+
val md_theme_dark_inverseOnSurface = Color(0xFF201A1B)
59+
val md_theme_dark_inverseSurface = Color(0xFFECE0E0)
60+
val md_theme_dark_inversePrimary = Color(0xFF9A4059)
6161
val md_theme_dark_shadow = Color(0xFF000000)
62-
val md_theme_dark_surfaceTint = Color(0xFFFFB598)
63-
val md_theme_dark_outlineVariant = Color(0xFF53433E)
62+
val md_theme_dark_surfaceTint = Color(0xFFFFB1C1)
63+
val md_theme_dark_outlineVariant = Color(0xFF524346)
6464
val md_theme_dark_scrim = Color(0xFF000000)
6565

6666

67-
val seed = Color(0xFFF19C79)
67+
val seed = Color(0xFFB5838D)

‎app/src/main/java/com/davedevab/composetutorial/ui/theme/Theme.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.davedevab.composetutorial
1+
package com.davedevab.composetutorial.ui.theme
22

33
import androidx.compose.foundation.isSystemInDarkTheme
44
import androidx.compose.material3.MaterialTheme

‎assets/home.png‎

-3.41 MB
Binary file not shown.

‎assets/home_dark.png‎

2.73 MB
Loading

‎assets/home_light.png‎

2.73 MB
Loading

0 commit comments

Comments
 (0)