Skip to content

Commit e240010

Browse files
committed
chore:remove duplicate material-3 dependency and correct colors.xml
1 parent 48935b9 commit e240010

4 files changed

Lines changed: 25 additions & 4 deletions

File tree

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ dependencies {
7272
implementation(libs.compose.material)
7373
implementation(libs.compose.material.icons.extended)
7474
implementation(libs.compose.ui.tooling.preview)
75-
implementation(libs.compose.material3)
75+
7676
implementation(libs.androidx.material3)
7777
debugImplementation(libs.compose.ui.tooling)
7878
androidTestImplementation(platform(libs.compose.bom))

app/src/main/res/values/colors.xml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,23 @@
1-
<?xml version='1.0' encoding='utf-8'?>
2-
<resources><color name="ic_launcher_background_black">#000000</color><color name="ic_launcher_background_red">#F44336</color><color name="ic_launcher_background_pink">#E91E63</color><color name="ic_launcher_background_purple">#9C27B0</color><color name="ic_launcher_background_deep_purple">#673AB7</color><color name="ic_launcher_background_indigo">#3F51B5</color><color name="ic_launcher_background_blue">#2196F3</color><color name="ic_launcher_background_light_blue">#03A9F4</color><color name="ic_launcher_background_cyan">#00BCD4</color><color name="ic_launcher_background_teal">#009688</color><color name="ic_launcher_background_green">#4CAF50</color><color name="ic_launcher_background_light_green">#8BC34A</color><color name="ic_launcher_background_lime">#CDDC39</color><color name="ic_launcher_background_yellow">#FFEB3B</color><color name="ic_launcher_background_amber">#FFC107</color><color name="ic_launcher_background_orange">#FF9800</color><color name="ic_launcher_background_deep_orange">#FF5722</color><color name="ic_launcher_background_brown">#795548</color><color name="ic_launcher_background_grey">#9E9E9E</color><color name="ic_launcher_background_blue_grey">#607D8B</color></resources>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="ic_launcher_background_black">#000000</color>
4+
<color name="ic_launcher_background_red">#F44336</color>
5+
<color name="ic_launcher_background_pink">#E91E63</color>
6+
<color name="ic_launcher_background_purple">#9C27B0</color>
7+
<color name="ic_launcher_background_deep_purple">#673AB7</color>
8+
<color name="ic_launcher_background_indigo">#3F51B5</color>
9+
<color name="ic_launcher_background_blue">#2196F3</color>
10+
<color name="ic_launcher_background_light_blue">#03A9F4</color>
11+
<color name="ic_launcher_background_cyan">#00BCD4</color>
12+
<color name="ic_launcher_background_teal">#009688</color>
13+
<color name="ic_launcher_background_green">#4CAF50</color>
14+
<color name="ic_launcher_background_light_green">#8BC34A</color>
15+
<color name="ic_launcher_background_lime">#CDDC39</color>
16+
<color name="ic_launcher_background_yellow">#FFEB3B</color>
17+
<color name="ic_launcher_background_amber">#FFC107</color>
18+
<color name="ic_launcher_background_orange">#FF9800</color>
19+
<color name="ic_launcher_background_deep_orange">#FF5722</color>
20+
<color name="ic_launcher_background_brown">#795548</color>
21+
<color name="ic_launcher_background_grey">#9E9E9E</color>
22+
<color name="ic_launcher_background_blue_grey">#607D8B</color>
23+
</resources>

app/src/main/res/values/colors_formatted.xml

Whitespace-only changes.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ compose-ui = { module = "androidx.compose.ui:ui" }
2929
compose-material = { module = "androidx.compose.material:material" }
3030
compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
3131
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
32-
compose-material3 = { module = "androidx.compose.material3:material3" }
32+
3333
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
3434
compose-test-junit = { module = "androidx.compose.ui:ui-test-junit4" }
3535
material-kolor = { module = "com.materialkolor:material-kolor", version.ref = "material-kolor" }

0 commit comments

Comments
 (0)