Merge pull request #66 from SecUSo/pull/64

Fixes #53

app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuKeyboardLayout.java

@@ -185,17 +185,29 @@ public class SudokuKeyboardLayout extends LinearLayout implements IHighlightChan
     @Override
     public void onHighlightChanged() {
         for(SudokuButton i_btn : buttons) {
-            i_btn.setBackgroundResource(R.drawable.mnenomic_numpad_button);
+            int backgroundResId = R.drawable.mnenomic_numpad_button;
 
-            // Highlight Yellow if we are done with that number
+            boolean numCompleted = (gameController.getValueCount(i_btn.getValue()) == gameController.getSize());
-            if(gameController.getValueCount(i_btn.getValue()) == gameController.getSize()) {
+            boolean numSelected = (gameController.getSelectedValue() == i_btn.getValue());
-                i_btn.setBackgroundResource(R.drawable.numpad_highlighted_three);
+
+            if(numCompleted) {
+                // Fill color           : darkyellow
+                // Border (if selected) : yellow
+                if(numSelected) {
+                    backgroundResId = R.drawable.numpad_selected_complete;
+                } else {
+                    backgroundResId = R.drawable.numpad_unselected_complete;
+                }
+            } else {
+                // Fill color           : lightblue
+                // Border (if selected) : colorPrimaryDark
+                if(numSelected) {
+                    backgroundResId = R.drawable.numpad_highlighted;
+                } // The else scenario is taken care of by the default initialized value
             }
 
-            if(gameController.getSelectedValue() == i_btn.getValue()) {
+            i_btn.setBackgroundResource(backgroundResId);
-                // highlight button to indicate that the value is selected
+
-                i_btn.setBackgroundResource(R.drawable.numpad_highlighted);
-            }
         }
     }
 

app/src/main/res/drawable-v21/numpad_selected_complete.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:endColor="?attr/completedButtonColor"
+        android:startColor="?attr/completedButtonColor" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="?attr/completedButtonBorder" />
+</shape>

app/src/main/res/drawable-v21/numpad_unselected_complete.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient android:endColor="?attr/completedButtonColor" android:startColor="?attr/completedButtonColor" />
+    <corners android:radius="6dp" />
+</shape>

app/src/main/res/drawable/numpad_selected_complete.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:endColor="@color/green"
+        android:startColor="@color/green" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="@color/yellow" />
+</shape>

app/src/main/res/drawable/numpad_unselected_complete.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient android:endColor="@color/darkyellow" android:startColor="@color/darkyellow" />
+    <corners android:radius="6dp" />
+</shape>

app/src/main/res/values-night/styles.xml

@@ -21,6 +21,8 @@
         <item name="activeButtonColor">@color/lightblue</item>
         <item name="inactiveButtonColor">@color/middlegrey</item>
         <item name="highlightedButtonBorder">@color/yellow</item>
+        <item name="completedButtonColor">@color/green</item>
+        <item name="completedButtonBorder">@color/yellow</item>
         <item name="android:itemBackground">@color/cardview_dark_background</item>
         <item name="backgroundTutorialSlide">@color/colorPrimaryDark</item>
         <item name="backgroundTutorialStars">@color/colorPrimaryDark</item>

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

@@ -15,6 +15,8 @@
         <attr name="activeButtonColor" format="color"/>
         <attr name="menuTextColor" format="color"/>
         <attr name="highlightedButtonBorder" format="color"/>
+        <attr name="completedButtonColor" format="color"/>
+        <attr name="completedButtonBorder" format="color"/>
         <attr name="backgroundTutorialSlide" format="color"/>
         <attr name="backgroundTutorialStars" format="color"/>
         <attr name="blueHighlight" format="color"/>

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

@@ -19,6 +19,8 @@
         <item name="activeButtonColor">@color/lightblue</item>
         <item name="inactiveButtonColor">@color/middlegrey</item>
         <item name="highlightedButtonBorder">@color/yellow</item>
+        <item name="completedButtonColor">@color/green</item>
+        <item name="completedButtonBorder">@color/yellow</item>
         <item name="actionBarTheme">@style/ToolbarStyle</item>
         <item name="backgroundTutorialSlide">@color/colorAccent</item>
         <item name="backgroundTutorialStars">@color/white</item>