From 8bb77adee12bbd0b585b6afb38a4a6acca0c3791 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 26 Sep 2021 19:51:55 +0200 Subject: [PATCH] Don't import android.R --- .../ui/theme/colors/SystemColorScheme.kt | 131 +++++++++--------- 1 file changed, 65 insertions(+), 66 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/colors/SystemColorScheme.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/colors/SystemColorScheme.kt index 05ca72cd..914d7a5d 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/theme/colors/SystemColorScheme.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/colors/SystemColorScheme.kt @@ -1,6 +1,5 @@ package de.mm20.launcher2.ui.theme.colors -import android.R import android.content.Context import android.os.Build import androidx.annotation.RequiresApi @@ -9,82 +8,82 @@ import androidx.compose.ui.graphics.Color @RequiresApi(api = Build.VERSION_CODES.S) class SystemColorScheme(context: Context) : ColorScheme() { override val neutral1 = ColorSwatch( - shade0 = Color(context.getColor(R.color.system_neutral1_0)), - shade10 = Color(context.getColor(R.color.system_neutral1_10)), - shade50 = Color(context.getColor(R.color.system_neutral1_50)), - shade100 = Color(context.getColor(R.color.system_neutral1_100)), - shade200 = Color(context.getColor(R.color.system_neutral1_200)), - shade300 = Color(context.getColor(R.color.system_neutral1_300)), - shade400 = Color(context.getColor(R.color.system_neutral1_400)), - shade500 = Color(context.getColor(R.color.system_neutral1_500)), - shade600 = Color(context.getColor(R.color.system_neutral1_600)), - shade700 = Color(context.getColor(R.color.system_neutral1_700)), - shade800 = Color(context.getColor(R.color.system_neutral1_800)), - shade900 = Color(context.getColor(R.color.system_neutral1_900)), - shade1000 = Color(context.getColor(R.color.system_neutral1_1000)), + shade0 = Color(context.getColor(android.R.color.system_neutral1_0)), + shade10 = Color(context.getColor(android.R.color.system_neutral1_10)), + shade50 = Color(context.getColor(android.R.color.system_neutral1_50)), + shade100 = Color(context.getColor(android.R.color.system_neutral1_100)), + shade200 = Color(context.getColor(android.R.color.system_neutral1_200)), + shade300 = Color(context.getColor(android.R.color.system_neutral1_300)), + shade400 = Color(context.getColor(android.R.color.system_neutral1_400)), + shade500 = Color(context.getColor(android.R.color.system_neutral1_500)), + shade600 = Color(context.getColor(android.R.color.system_neutral1_600)), + shade700 = Color(context.getColor(android.R.color.system_neutral1_700)), + shade800 = Color(context.getColor(android.R.color.system_neutral1_800)), + shade900 = Color(context.getColor(android.R.color.system_neutral1_900)), + shade1000 = Color(context.getColor(android.R.color.system_neutral1_1000)), ) override val neutral2 = ColorSwatch( - shade0 = Color(context.getColor(R.color.system_neutral2_0)), - shade10 = Color(context.getColor(R.color.system_neutral2_10)), - shade50 = Color(context.getColor(R.color.system_neutral2_50)), - shade100 = Color(context.getColor(R.color.system_neutral2_100)), - shade200 = Color(context.getColor(R.color.system_neutral2_200)), - shade300 = Color(context.getColor(R.color.system_neutral2_300)), - shade400 = Color(context.getColor(R.color.system_neutral2_400)), - shade500 = Color(context.getColor(R.color.system_neutral2_500)), - shade600 = Color(context.getColor(R.color.system_neutral2_600)), - shade700 = Color(context.getColor(R.color.system_neutral2_700)), - shade800 = Color(context.getColor(R.color.system_neutral2_800)), - shade900 = Color(context.getColor(R.color.system_neutral2_900)), - shade1000 = Color(context.getColor(R.color.system_neutral2_1000)), + shade0 = Color(context.getColor(android.R.color.system_neutral2_0)), + shade10 = Color(context.getColor(android.R.color.system_neutral2_10)), + shade50 = Color(context.getColor(android.R.color.system_neutral2_50)), + shade100 = Color(context.getColor(android.R.color.system_neutral2_100)), + shade200 = Color(context.getColor(android.R.color.system_neutral2_200)), + shade300 = Color(context.getColor(android.R.color.system_neutral2_300)), + shade400 = Color(context.getColor(android.R.color.system_neutral2_400)), + shade500 = Color(context.getColor(android.R.color.system_neutral2_500)), + shade600 = Color(context.getColor(android.R.color.system_neutral2_600)), + shade700 = Color(context.getColor(android.R.color.system_neutral2_700)), + shade800 = Color(context.getColor(android.R.color.system_neutral2_800)), + shade900 = Color(context.getColor(android.R.color.system_neutral2_900)), + shade1000 = Color(context.getColor(android.R.color.system_neutral2_1000)), ) override val accent1 = ColorSwatch( - shade0 = Color(context.getColor(R.color.system_accent1_0)), - shade10 = Color(context.getColor(R.color.system_accent1_10)), - shade50 = Color(context.getColor(R.color.system_accent1_50)), - shade100 = Color(context.getColor(R.color.system_accent1_100)), - shade200 = Color(context.getColor(R.color.system_accent1_200)), - shade300 = Color(context.getColor(R.color.system_accent1_300)), - shade400 = Color(context.getColor(R.color.system_accent1_400)), - shade500 = Color(context.getColor(R.color.system_accent1_500)), - shade600 = Color(context.getColor(R.color.system_accent1_600)), - shade700 = Color(context.getColor(R.color.system_accent1_700)), - shade800 = Color(context.getColor(R.color.system_accent1_800)), - shade900 = Color(context.getColor(R.color.system_accent1_900)), - shade1000 = Color(context.getColor(R.color.system_accent1_1000)), + shade0 = Color(context.getColor(android.R.color.system_accent1_0)), + shade10 = Color(context.getColor(android.R.color.system_accent1_10)), + shade50 = Color(context.getColor(android.R.color.system_accent1_50)), + shade100 = Color(context.getColor(android.R.color.system_accent1_100)), + shade200 = Color(context.getColor(android.R.color.system_accent1_200)), + shade300 = Color(context.getColor(android.R.color.system_accent1_300)), + shade400 = Color(context.getColor(android.R.color.system_accent1_400)), + shade500 = Color(context.getColor(android.R.color.system_accent1_500)), + shade600 = Color(context.getColor(android.R.color.system_accent1_600)), + shade700 = Color(context.getColor(android.R.color.system_accent1_700)), + shade800 = Color(context.getColor(android.R.color.system_accent1_800)), + shade900 = Color(context.getColor(android.R.color.system_accent1_900)), + shade1000 = Color(context.getColor(android.R.color.system_accent1_1000)), ) override val accent2 = ColorSwatch( - shade0 = Color(context.getColor(R.color.system_accent2_0)), - shade10 = Color(context.getColor(R.color.system_accent2_10)), - shade50 = Color(context.getColor(R.color.system_accent2_50)), - shade100 = Color(context.getColor(R.color.system_accent2_100)), - shade200 = Color(context.getColor(R.color.system_accent2_200)), - shade300 = Color(context.getColor(R.color.system_accent2_300)), - shade400 = Color(context.getColor(R.color.system_accent2_400)), - shade500 = Color(context.getColor(R.color.system_accent2_500)), - shade600 = Color(context.getColor(R.color.system_accent2_600)), - shade700 = Color(context.getColor(R.color.system_accent2_700)), - shade800 = Color(context.getColor(R.color.system_accent2_800)), - shade900 = Color(context.getColor(R.color.system_accent2_900)), - shade1000 = Color(context.getColor(R.color.system_accent2_1000)), + shade0 = Color(context.getColor(android.R.color.system_accent2_0)), + shade10 = Color(context.getColor(android.R.color.system_accent2_10)), + shade50 = Color(context.getColor(android.R.color.system_accent2_50)), + shade100 = Color(context.getColor(android.R.color.system_accent2_100)), + shade200 = Color(context.getColor(android.R.color.system_accent2_200)), + shade300 = Color(context.getColor(android.R.color.system_accent2_300)), + shade400 = Color(context.getColor(android.R.color.system_accent2_400)), + shade500 = Color(context.getColor(android.R.color.system_accent2_500)), + shade600 = Color(context.getColor(android.R.color.system_accent2_600)), + shade700 = Color(context.getColor(android.R.color.system_accent2_700)), + shade800 = Color(context.getColor(android.R.color.system_accent2_800)), + shade900 = Color(context.getColor(android.R.color.system_accent2_900)), + shade1000 = Color(context.getColor(android.R.color.system_accent2_1000)), ) override val accent3 = ColorSwatch( - shade0 = Color(context.getColor(R.color.system_accent3_0)), - shade10 = Color(context.getColor(R.color.system_accent3_10)), - shade50 = Color(context.getColor(R.color.system_accent3_50)), - shade100 = Color(context.getColor(R.color.system_accent3_100)), - shade200 = Color(context.getColor(R.color.system_accent3_200)), - shade300 = Color(context.getColor(R.color.system_accent3_300)), - shade400 = Color(context.getColor(R.color.system_accent3_400)), - shade500 = Color(context.getColor(R.color.system_accent3_500)), - shade600 = Color(context.getColor(R.color.system_accent3_600)), - shade700 = Color(context.getColor(R.color.system_accent3_700)), - shade800 = Color(context.getColor(R.color.system_accent3_800)), - shade900 = Color(context.getColor(R.color.system_accent3_900)), - shade1000 = Color(context.getColor(R.color.system_accent3_1000)), + shade0 = Color(context.getColor(android.R.color.system_accent3_0)), + shade10 = Color(context.getColor(android.R.color.system_accent3_10)), + shade50 = Color(context.getColor(android.R.color.system_accent3_50)), + shade100 = Color(context.getColor(android.R.color.system_accent3_100)), + shade200 = Color(context.getColor(android.R.color.system_accent3_200)), + shade300 = Color(context.getColor(android.R.color.system_accent3_300)), + shade400 = Color(context.getColor(android.R.color.system_accent3_400)), + shade500 = Color(context.getColor(android.R.color.system_accent3_500)), + shade600 = Color(context.getColor(android.R.color.system_accent3_600)), + shade700 = Color(context.getColor(android.R.color.system_accent3_700)), + shade800 = Color(context.getColor(android.R.color.system_accent3_800)), + shade900 = Color(context.getColor(android.R.color.system_accent3_900)), + shade1000 = Color(context.getColor(android.R.color.system_accent3_1000)), ) } \ No newline at end of file