From 740a2f37c6f169c551ff8032fb00a7cc24d1c1e4 Mon Sep 17 00:00:00 2001
From: Schoumi <anthony@mob-dev.fr>
Date: Mon, 29 Jun 2020 17:25:06 +0200
Subject: [PATCH] Make some minor revert on color scheme and some change name

---
 .../eu/exodus_privacy/exodusprivacy/ReportViewModel.java  | 4 ++--
 .../exodusprivacy/adapters/ApplicationListAdapter.java    | 8 ++++----
 app/src/main/res/drawable/square_light_red.xml            | 6 ++++++
 app/src/main/res/drawable/square_light_yellow.xml         | 6 ++++++
 app/src/main/res/layout/report.xml                        | 3 ++-
 app/src/main/res/values/colors.xml                        | 8 +++++---
 6 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable/square_light_red.xml
 create mode 100644 app/src/main/res/drawable/square_light_yellow.xml

diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/ReportViewModel.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/ReportViewModel.java
index 9c3ebb0..bda1de0 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/ReportViewModel.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/ReportViewModel.java
@@ -161,9 +161,9 @@ public class ReportViewModel extends BaseObservable {
         if (number == 0)
             return R.drawable.square_green;
         else if(number < 5)
-            return R.drawable.square_yellow;
+            return R.drawable.square_light_yellow;
         else
-            return R.drawable.square_red;
+            return R.drawable.square_light_red;
     }
 
 
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/adapters/ApplicationListAdapter.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/adapters/ApplicationListAdapter.java
index e2de6aa..d58c994 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/adapters/ApplicationListAdapter.java
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/adapters/ApplicationListAdapter.java
@@ -151,9 +151,9 @@ public class ApplicationListAdapter extends RecyclerView.Adapter {
             if(size == 0)
                 appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_green);
             else if (size < 5)
-                appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_yellow);
+                appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_light_yellow);
             else
-                appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_red);
+                appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_light_red);
 
             Report report = viewModel.report;
             if(report != null) {
@@ -164,9 +164,9 @@ public class ApplicationListAdapter extends RecyclerView.Adapter {
                 if(size == 0)
                     appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_green);
                 else if (size < 5)
-                    appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_yellow);
+                    appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_light_yellow);
                 else
-                    appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_red);
+                    appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_light_red);
 
                 if(versionName != null && !report.version.equals(viewModel.versionName)) {
                     String string = context.getString(R.string.tested,versionName, report.version);
diff --git a/app/src/main/res/drawable/square_light_red.xml b/app/src/main/res/drawable/square_light_red.xml
new file mode 100644
index 0000000..0ec94f0
--- /dev/null
+++ b/app/src/main/res/drawable/square_light_red.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorLightRed"/>
+    <corners android:radius="5dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>
diff --git a/app/src/main/res/drawable/square_light_yellow.xml b/app/src/main/res/drawable/square_light_yellow.xml
new file mode 100644
index 0000000..9d20e63
--- /dev/null
+++ b/app/src/main/res/drawable/square_light_yellow.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorLightYellow"/>
+    <corners android:radius="5dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>
diff --git a/app/src/main/res/layout/report.xml b/app/src/main/res/layout/report.xml
index a1019f9..5a1c1d5 100644
--- a/app/src/main/res/layout/report.xml
+++ b/app/src/main/res/layout/report.xml
@@ -39,7 +39,8 @@
                 app:layout_constraintStart_toStartOf="parent"
                 android:textSize="30sp"
                 android:textColor="@color/colorPurple"
-                android:textStyle="bold"/>
+                android:textStyle="bold"
+                android:textAlignment="center"/>
 
             <View
                 android:id="@+id/dummy"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 25d6de1..b1fe880 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#212529</color>
-    <color name="colorPrimaryDark">#212529</color>
-    <color name="colorAccent">#212529</color>
+    <color name="colorPrimary">#684971</color>
+    <color name="colorPrimaryDark">#3d2b43</color>
+    <color name="colorAccent">#684971</color>
     <color name="colorGreen">#6fc384</color>
     <color name="colorRed">#e46772</color>
     <color name="colorYellow">#ffdb66</color>
+    <color name="colorLightRed">#e46772</color>
+    <color name="colorLightYellow">#ffdb66</color>
     <color name="colorPurple">#684971</color>
     <color name="textColorDark">#343A40</color>
     <color name="textColorDarkLight">#6C757D</color>