From 083765b02059003dbe92a86630bf93fa3933b3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 15 Jul 2018 14:20:22 +0200
Subject: [PATCH] Adjust colors of grades in dark theme (#143)

---
 .../io/github/wulkanowy/utils/GradeUtils.java | 18 +++++++-------
 app/src/main/res/layout/grades_dialog.xml     |  2 ++
 app/src/main/res/layout/grades_subitem.xml    |  3 +++
 app/src/main/res/values/colors.xml            | 16 +++++++------
 .../wulkanowy/utils/GradeUtilsTest.java       | 24 +++++++++----------
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/utils/GradeUtils.java b/app/src/main/java/io/github/wulkanowy/utils/GradeUtils.java
index d274da97..7b6ba193 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeUtils.java
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeUtils.java
@@ -49,29 +49,29 @@ public final class GradeUtils {
     public static int getValueColor(String value) {
         Matcher m1 = validGradePattern.matcher(value);
         if (!m1.find()) {
-            return R.color.default_grade;
+            return R.color.grade_default;
         }
 
         Matcher m2 = simpleGradeValuePattern.matcher(m1.group());
         if (!m2.find()) {
-            return R.color.default_grade;
+            return R.color.grade_default;
         }
 
         switch (Integer.parseInt(m2.group())) {
             case 6:
-                return R.color.six_grade;
+                return R.color.grade_six;
             case 5:
-                return R.color.five_grade;
+                return R.color.grade_five;
             case 4:
-                return R.color.four_grade;
+                return R.color.grade_four;
             case 3:
-                return R.color.three_grade;
+                return R.color.grade_three;
             case 2:
-                return R.color.two_grade;
+                return R.color.grade_two;
             case 1:
-                return R.color.one_grade;
+                return R.color.grade_one;
             default:
-                return R.color.default_grade;
+                return R.color.grade_default;
         }
     }
 
diff --git a/app/src/main/res/layout/grades_dialog.xml b/app/src/main/res/layout/grades_dialog.xml
index c5cf073e..aceec78f 100644
--- a/app/src/main/res/layout/grades_dialog.xml
+++ b/app/src/main/res/layout/grades_dialog.xml
@@ -29,6 +29,8 @@
                 android:layout_gravity="end"
                 android:gravity="center"
                 android:text="@string/app_name"
+                android:textColor="@color/grade_text"
+                android:background="@color/grade_default"
                 android:textSize="30sp" />
 
             <TextView
diff --git a/app/src/main/res/layout/grades_subitem.xml b/app/src/main/res/layout/grades_subitem.xml
index 86ddddc7..ec46a6bc 100644
--- a/app/src/main/res/layout/grades_subitem.xml
+++ b/app/src/main/res/layout/grades_subitem.xml
@@ -30,6 +30,9 @@
             android:layout_centerVertical="true"
             android:gravity="center"
             android:maxLength="5"
+            android:text="@string/app_name"
+            android:textColor="@color/grade_text"
+            android:background="@color/grade_default"
             android:textSize="16sp" />
 
         <TextView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 68145e05..61685de6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,13 +4,15 @@
     <color name="colorPrimaryDark">#9a0007</color>
     <color name="colorPrimaryLight">#ff6659</color>
     <color name="colorBackgroundBottomNav">#f0f0f0</color>
-    <color name="six_grade">#92b53d</color>
-    <color name="five_grade">#66B266</color>
-    <color name="four_grade">#55BBDB</color>
-    <color name="three_grade">#FFE68C</color>
-    <color name="two_grade">#CE9AD2</color>
-    <color name="one_grade">#d32f2f</color>
-    <color name="default_grade">#cdcdcd</color>
+
+    <color name="grade_text">#ffffff</color>
+    <color name="grade_six">#91b43c</color>
+    <color name="grade_five">#2cbd92</color>
+    <color name="grade_four">#50b6d6</color>
+    <color name="grade_three">#d2ab24</color>
+    <color name="grade_two">#9071b3</color>
+    <color name="grade_one">#d65757</color>
+    <color name="grade_default">#3d5f9c</color>
 
     <color name="secondary_text">#4c4c4c</color>
     <color name="second_text_color">#333</color>
diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeUtilsTest.java b/app/src/test/java/io/github/wulkanowy/utils/GradeUtilsTest.java
index 4bf6de51..54b298f2 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeUtilsTest.java
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeUtilsTest.java
@@ -62,18 +62,18 @@ public class GradeUtilsTest {
 
     @Test
     public void getValueColorTest() {
-        assertEquals(R.color.six_grade, GradeUtils.getValueColor("-6"));
-        assertEquals(R.color.five_grade, GradeUtils.getValueColor("--5"));
-        assertEquals(R.color.four_grade, GradeUtils.getValueColor("=4"));
-        assertEquals(R.color.three_grade, GradeUtils.getValueColor("3-"));
-        assertEquals(R.color.two_grade, GradeUtils.getValueColor("2--"));
-        assertEquals(R.color.two_grade, GradeUtils.getValueColor("2="));
-        assertEquals(R.color.one_grade, GradeUtils.getValueColor("1+"));
-        assertEquals(R.color.one_grade, GradeUtils.getValueColor("+1"));
-        assertEquals(R.color.default_grade, GradeUtils.getValueColor("6 (.XI)"));
-        assertEquals(R.color.default_grade, GradeUtils.getValueColor("Np"));
-        assertEquals(R.color.default_grade, GradeUtils.getValueColor("7"));
-        assertEquals(R.color.default_grade, GradeUtils.getValueColor(""));
+        assertEquals(R.color.grade_six, GradeUtils.getValueColor("-6"));
+        assertEquals(R.color.grade_five, GradeUtils.getValueColor("--5"));
+        assertEquals(R.color.grade_four, GradeUtils.getValueColor("=4"));
+        assertEquals(R.color.grade_three, GradeUtils.getValueColor("3-"));
+        assertEquals(R.color.grade_two, GradeUtils.getValueColor("2--"));
+        assertEquals(R.color.grade_two, GradeUtils.getValueColor("2="));
+        assertEquals(R.color.grade_one, GradeUtils.getValueColor("1+"));
+        assertEquals(R.color.grade_one, GradeUtils.getValueColor("+1"));
+        assertEquals(R.color.grade_default, GradeUtils.getValueColor("6 (.XI)"));
+        assertEquals(R.color.grade_default, GradeUtils.getValueColor("Np"));
+        assertEquals(R.color.grade_default, GradeUtils.getValueColor("7"));
+        assertEquals(R.color.grade_default, GradeUtils.getValueColor(""));
     }
 
     @Test