Move launcher icons and colors to kmp

app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.kt

@@ -76,10 +76,10 @@ class Astrid2TaskProvider : ContentProvider() {
  @ColorRes
  private fun getPriorityResId(priority: Int): Int {
  return when {
- priority <= 0 -> R.color.red_500
- priority == 1 -> R.color.amber_500
- priority == 2 -> R.color.blue_500
- else -> R.color.grey_500
+ priority <= 0 -> org.tasks.kmp.R.color.red_500
+ priority == 1 -> org.tasks.kmp.R.color.amber_500
+ priority == 2 -> org.tasks.kmp.R.color.blue_500
+ else -> org.tasks.kmp.R.color.grey_500
  }
  }
 

app/src/main/java/com/todoroo/astrid/service/Upgrader.kt

@@ -6,7 +6,6 @@ import androidx.annotation.ColorRes
 import com.google.common.collect.ImmutableListMultimap
 import com.google.common.collect.ListMultimap
 import com.google.common.collect.Multimaps
-import org.tasks.filters.GtasksFilter
 import com.todoroo.astrid.dao.TaskDao
 import dagger.Lazy
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -34,6 +33,7 @@ import org.tasks.data.entity.CaldavTask
 import org.tasks.data.entity.Filter
 import org.tasks.data.entity.Tag
 import org.tasks.data.entity.TagData
+import org.tasks.filters.GtasksFilter
 import org.tasks.preferences.DefaultFilterProvider
 import org.tasks.preferences.Preferences
 import org.tasks.time.DateTimeUtils2.currentTimeMillis
@@ -381,26 +381,26 @@ class Upgrader @Inject constructor(
  @ColorRes
  fun getLegacyColor(index: Int, def: Int): Int {
  return when (index) {
- 0 -> R.color.blue_grey_500
- 1 -> R.color.grey_900
- 2 -> R.color.red_500
- 3 -> R.color.pink_500
- 4 -> R.color.purple_500
- 5 -> R.color.deep_purple_500
- 6 -> R.color.indigo_500
- 7 -> R.color.blue_500
- 8 -> R.color.light_blue_500
- 9 -> R.color.cyan_500
- 10 -> R.color.teal_500
- 11 -> R.color.green_500
- 12 -> R.color.light_green_500
- 13 -> R.color.lime_500
- 14 -> R.color.yellow_500
- 15 -> R.color.amber_500
- 16 -> R.color.orange_500
- 17 -> R.color.deep_orange_500
- 18 -> R.color.brown_500
- 19 -> R.color.grey_500
+ 0 -> org.tasks.kmp.R.color.blue_grey_500
+ 1 -> org.tasks.kmp.R.color.grey_900
+ 2 -> org.tasks.kmp.R.color.red_500
+ 3 -> org.tasks.kmp.R.color.pink_500
+ 4 -> org.tasks.kmp.R.color.purple_500
+ 5 -> org.tasks.kmp.R.color.deep_purple_500
+ 6 -> org.tasks.kmp.R.color.indigo_500
+ 7 -> org.tasks.kmp.R.color.blue_500
+ 8 -> org.tasks.kmp.R.color.light_blue_500
+ 9 -> org.tasks.kmp.R.color.cyan_500
+ 10 -> org.tasks.kmp.R.color.teal_500
+ 11 -> org.tasks.kmp.R.color.green_500
+ 12 -> org.tasks.kmp.R.color.light_green_500
+ 13 -> org.tasks.kmp.R.color.lime_500
+ 14 -> org.tasks.kmp.R.color.yellow_500
+ 15 -> org.tasks.kmp.R.color.amber_500
+ 16 -> org.tasks.kmp.R.color.orange_500
+ 17 -> org.tasks.kmp.R.color.deep_orange_500
+ 18 -> org.tasks.kmp.R.color.brown_500
+ 19 -> org.tasks.kmp.R.color.grey_500
  20 -> R.color.white_100
  else -> def
  }

app/src/main/java/org/tasks/compose/edit/AlarmRow.kt

@@ -76,12 +76,12 @@ fun AlarmRow(
  Spacer(modifier = Modifier.height(20.dp))
  Text(
  text = stringResource(id = R.string.enable_reminders),
- color = colorResource(id = R.color.red_500),
+ color = colorResource(id = org.tasks.kmp.R.color.red_500),
  )
  Text(
  text = stringResource(id = R.string.enable_reminders_description),
  style = MaterialTheme.typography.bodySmall,
- color = colorResource(id = R.color.red_500),
+ color = colorResource(id = org.tasks.kmp.R.color.red_500),
  )
  Spacer(modifier = Modifier.height(20.dp))
  }

app/src/main/java/org/tasks/preferences/fragments/MainSettingsFragment.kt

@@ -259,7 +259,7 @@ class MainSettingsFragment : InjectingPreferenceFragment() {
  ?.mutate()
  pref.tint = context?.getColor(when {
  hasError -> R.color.overdue
- hasWarning -> R.color.orange_500
+ hasWarning -> org.tasks.kmp.R.color.orange_500
  else -> R.color.icon_tint_with_alpha
  })
  }

app/src/main/java/org/tasks/themes/ThemeColor.java

@@ -26,26 +26,26 @@ public class ThemeColor implements Pickable {
 
  public static final int[] ICONS =
  new int[] {
- R.mipmap.ic_launcher_blue_grey,
- R.mipmap.ic_launcher_dark_grey,
- R.mipmap.ic_launcher_red,
- R.mipmap.ic_launcher_pink,
- R.mipmap.ic_launcher_purple,
- R.mipmap.ic_launcher_deep_purple,
- R.mipmap.ic_launcher_indigo,
- R.mipmap.ic_launcher_blue,
- R.mipmap.ic_launcher_light_blue,
- R.mipmap.ic_launcher_cyan,
- R.mipmap.ic_launcher_teal,
- R.mipmap.ic_launcher_green,
- R.mipmap.ic_launcher_light_green,
- R.mipmap.ic_launcher_lime,
- R.mipmap.ic_launcher_yellow,
- R.mipmap.ic_launcher_amber,
- R.mipmap.ic_launcher_orange,
- R.mipmap.ic_launcher_deep_orange,
- R.mipmap.ic_launcher_brown,
- R.mipmap.ic_launcher_grey
+ org.tasks.kmp.R.mipmap.ic_launcher_blue_grey,
+ org.tasks.kmp.R.mipmap.ic_launcher_dark_grey,
+ org.tasks.kmp.R.mipmap.ic_launcher_red,
+ org.tasks.kmp.R.mipmap.ic_launcher_pink,
+ org.tasks.kmp.R.mipmap.ic_launcher_purple,
+ org.tasks.kmp.R.mipmap.ic_launcher_deep_purple,
+ org.tasks.kmp.R.mipmap.ic_launcher_indigo,
+ org.tasks.kmp.R.mipmap.ic_launcher_blue,
+ org.tasks.kmp.R.mipmap.ic_launcher_light_blue,
+ org.tasks.kmp.R.mipmap.ic_launcher_cyan,
+ org.tasks.kmp.R.mipmap.ic_launcher_teal,
+ org.tasks.kmp.R.mipmap.ic_launcher_green,
+ org.tasks.kmp.R.mipmap.ic_launcher_light_green,
+ org.tasks.kmp.R.mipmap.ic_launcher_lime,
+ org.tasks.kmp.R.mipmap.ic_launcher_yellow,
+ org.tasks.kmp.R.mipmap.ic_launcher_amber,
+ org.tasks.kmp.R.mipmap.ic_launcher_orange,
+ org.tasks.kmp.R.mipmap.ic_launcher_deep_orange,
+ org.tasks.kmp.R.mipmap.ic_launcher_brown,
+ org.tasks.kmp.R.mipmap.ic_launcher_grey
  };
 
  public static final String[] LAUNCHERS =
@@ -74,72 +74,72 @@ public class ThemeColor implements Pickable {
 
  public static final int[] COLORS =
  new int[] {
- R.color.grey_900,
- R.color.tomato,
- R.color.red_500,
- R.color.deep_orange_500,
- R.color.tangerine,
- R.color.pumpkin,
- R.color.orange_500,
- R.color.mango,
- R.color.banana,
- R.color.amber_500,
- R.color.citron,
- R.color.yellow_500,
- R.color.lime_500,
- R.color.avocado,
- R.color.light_green_500,
- R.color.pistachio,
- R.color.green_500,
- R.color.basil,
- R.color.teal_500,
- R.color.sage,
- R.color.cyan_500,
- R.color.light_blue_500,
- R.color.peacock,
- R.color.blue_500,
- R.color.cobalt,
- R.color.indigo_500,
- R.color.lavender,
- R.color.wisteria,
- R.color.amethyst,
- R.color.deep_purple_500,
- R.color.grape,
- R.color.purple_500,
- R.color.radicchio,
- R.color.pink_500,
- R.color.cherry_blossom,
- R.color.flamingo,
- R.color.brown_500,
- R.color.graphite,
- R.color.birch,
- R.color.grey_500,
- R.color.blue_grey_500,
- R.color.white_100,
+  org.tasks.kmp.R.color.grey_900,
+  org.tasks.kmp.R.color.tomato,
+  org.tasks.kmp.R.color.red_500,
+  org.tasks.kmp.R.color.deep_orange_500,
+  org.tasks.kmp.R.color.tangerine,
+  org.tasks.kmp.R.color.pumpkin,
+  org.tasks.kmp.R.color.orange_500,
+  org.tasks.kmp.R.color.mango,
+  org.tasks.kmp.R.color.banana,
+  org.tasks.kmp.R.color.amber_500,
+  org.tasks.kmp.R.color.citron,
+  org.tasks.kmp.R.color.yellow_500,
+  org.tasks.kmp.R.color.lime_500,
+  org.tasks.kmp.R.color.avocado,
+  org.tasks.kmp.R.color.light_green_500,
+  org.tasks.kmp.R.color.pistachio,
+  org.tasks.kmp.R.color.green_500,
+  org.tasks.kmp.R.color.basil,
+  org.tasks.kmp.R.color.teal_500,
+  org.tasks.kmp.R.color.sage,
+  org.tasks.kmp.R.color.cyan_500,
+  org.tasks.kmp.R.color.light_blue_500,
+  org.tasks.kmp.R.color.peacock,
+  org.tasks.kmp.R.color.blue_500,
+  org.tasks.kmp.R.color.cobalt,
+  org.tasks.kmp.R.color.indigo_500,
+  org.tasks.kmp.R.color.lavender,
+  org.tasks.kmp.R.color.wisteria,
+  org.tasks.kmp.R.color.amethyst,
+  org.tasks.kmp.R.color.deep_purple_500,
+  org.tasks.kmp.R.color.grape,
+  org.tasks.kmp.R.color.purple_500,
+  org.tasks.kmp.R.color.radicchio,
+  org.tasks.kmp.R.color.pink_500,
+  org.tasks.kmp.R.color.cherry_blossom,
+  org.tasks.kmp.R.color.flamingo,
+  org.tasks.kmp.R.color.brown_500,
+  org.tasks.kmp.R.color.graphite,
+  org.tasks.kmp.R.color.birch,
+  org.tasks.kmp.R.color.grey_500,
+  org.tasks.kmp.R.color.blue_grey_500,
+  R.color.white_100,
  };
 
  public static final int[] LAUNCHER_COLORS =
  new int[] {
- R.color.blue_grey_500,
- R.color.grey_900,
- R.color.red_500,
- R.color.pink_500,
- R.color.purple_500,
- R.color.deep_purple_500,
- R.color.indigo_500,
- R.color.blue_500,
- R.color.light_blue_500,
- R.color.cyan_500,
- R.color.teal_500,
- R.color.green_500,
- R.color.light_green_500,
- R.color.lime_500,
- R.color.yellow_500,
- R.color.amber_500,
- R.color.orange_500,
- R.color.deep_orange_500,
- R.color.brown_500,
- R.color.grey_500
+ org.tasks.kmp.R.color.blue_grey_500,
+ org.tasks.kmp.R.color.grey_900,
+ org.tasks.kmp.R.color.red_500,
+ org.tasks.kmp.R.color.pink_500,
+ org.tasks.kmp.R.color.purple_500,
+ org.tasks.kmp.R.color.deep_purple_500,
+ org.tasks.kmp.R.color.indigo_500,
+ org.tasks.kmp.R.color.blue_500,
+ org.tasks.kmp.R.color.light_blue_500,
+ org.tasks.kmp.R.color.cyan_500,
+ org.tasks.kmp.R.color.teal_500,
+ org.tasks.kmp.R.color.green_500,
+ org.tasks.kmp.R.color.light_green_500,
+ org.tasks.kmp.R.color.lime_500,
+ org.tasks.kmp.R.color.yellow_500,
+ org.tasks.kmp.R.color.amber_500,
+ org.tasks.kmp.R.color.orange_500,
+ org.tasks.kmp.R.color.deep_orange_500,
+ org.tasks.kmp.R.color.brown_500,
+ org.tasks.kmp.R.color.grey_500
  };
 
  public static final Parcelable.Creator<ThemeColor> CREATOR =

app/src/main/java/org/tasks/widget/WidgetPreferences.kt

@@ -153,7 +153,7 @@ class WidgetPreferences(
  return color
  }
  val index = getInt(R.string.p_widget_color, -1)
- color = context.getColor(getLegacyColor(index, R.color.blue_500))
+ color = context.getColor(getLegacyColor(index, org.tasks.kmp.R.color.blue_500))
  setInt(R.string.p_widget_color_v2, color)
  return color
  }

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

@@ -5,103 +5,6 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <resources>
- <color name="tomato">#d50000</color>
- <color name="tangerine">#f4511e</color>
- <color name="pumpkin">#ef6c00</color>
- <color name="mango">#f09300</color>
- <color name="banana">#f6bf26</color>
- <color name="citron">#e4c441</color>
- <color name="avocado">#c0ca33</color>
- <color name="pistachio">#7cb342</color>
- <color name="basil">#0b8043</color>
- <color name="sage">#33b679</color>
- <color name="peacock">#039be5</color>
- <color name="cobalt">#4285f4</color>
- <color name="lavender">#7986cb</color>
- <color name="wisteria">#b39ddb</color>
- <color name="amethyst">#9e69af</color>
- <color name="grape">#8e24aa</color>
- <color name="radicchio">#ad1457</color>
- <color name="cherry_blossom">#d81b60</color>
- <color name="flamingo">#e67c73</color>
- <color name="graphite">#616161</color>
- <color name="birch">#a79b8e</color>
-
- <color name="red_500">#f44336</color>
- <color name="red_a400">#ff1744</color>
- <color name="red_a100">#FF8A80</color>
-
- <color name="pink_500">#e91e63</color>
- <color name="pink_a400">#f50057</color>
- <color name="pink_a100">#FF80AB</color>
-
- <color name="purple_500">#9c27b0</color>
- <color name="purple_a400">#d500f9</color>
- <color name="purple_a100">#EA80FC</color>
-
- <color name="deep_purple_500">#673ab7</color>
- <color name="deep_purple_a400">#651fff</color>
- <color name="deep_purple_a100">#B388FF</color>
-
- <color name="indigo_500">#3f51b5</color>
- <color name="indigo_a400">#3d5afe</color>
- <color name="indigo_a100">#8C9EFF</color>
-
- <color name="blue_500">#2196f3</color>
- <color name="blue_a400">#2979ff</color>
- <color name="blue_a100">#82B1FF</color>
-
- <color name="light_blue_500">#03a9f4</color>
- <color name="light_blue_a400">#00b0ff</color>
- <color name="light_blue_a100">#80D8FF</color>
-
- <color name="cyan_500">#00bcd4</color>
- <color name="cyan_a400">#00e5ff</color>
- <color name="cyan_a100">#84FFFF</color>
-
- <color name="teal_500">#009688</color>
- <color name="teal_a400">#1de9b6</color>
- <color name="teal_a100">#A7FFEB</color>
-
- <color name="green_500">#4caf50</color>
- <color name="green_a400">#00e676</color>
- <color name="green_a100">#B9F6CA</color>
-
- <color name="light_green_500">#8bc34a</color>
- <color name="light_green_a400">#76ff03</color>
- <color name="light_green_a100">#CCFF90</color>
-
- <color name="lime_500">#cddc39</color>
- <color name="lime_a400">#c6ff00</color>
- <color name="lime_a100">#F4FF81</color>
-
- <color name="yellow_500">#ffeb3b</color>
- <color name="yellow_a400">#ffea00</color>
- <color name="yellow_a100">#FFFF8D</color>
-
- <color name="amber_500">#ffc107</color>
- <color name="amber_a400">#ffc400</color>
- <color name="amber_a100">#FFE57F</color>
-
- <color name="orange_500">#ff9800</color>
- <color name="orange_a400">#ff9100</color>
- <color name="orange_a100">#FFD180</color>
-
- <color name="deep_orange_500">#ff5722</color>
- <color name="deep_orange_a400">#ff3d00</color>
- <color name="deep_orange_a100">#FF9E80</color>
-
- <color name="brown_500">#795548</color>
-
- <color name="grey_300">#e0e0e0</color>
- <color name="grey_500">#9e9e9e</color>
- <color name="grey_800">#424242</color>
- <color name="grey_900">#212121</color>
-
- <color name="blue_grey_100">#CFD8DC</color>
- <color name="blue_grey_400">#78909c</color>
- <color name="blue_grey_500">#607d8b</color>
-
  <color name="black_100">#ff000000</color>
  <color name="black_87">#de000000</color>
  <color name="black_60">#99000000</color>