joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #66 from SecUSo/pull/64

Browse source 
Fixes #53
This commit is contained in:
Christopher Beckmann 2020-11-03 16:30:11 +01:00 committed by GitHub
commit 1b9d4828f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 58 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
if(gameController.getValueCount(i_btn.getValue()) == gameController.getSize()) {
i_btn.setBackgroundResource(R.drawable.numpad_highlighted_three);
boolean numCompleted = (gameController.getValueCount(i_btn.getValue()) == gameController.getSize());
boolean numSelected = (gameController.getSelectedValue() == i_btn.getValue());
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()) {
// highlight button to indicate that the value is selected
i_btn.setBackgroundResource(R.drawable.numpad_highlighted);
}
i_btn.setBackgroundResource(backgroundResId);
}
}

11
app/src/main/res/drawable-v21/numpad_selected_complete.xml Normal file
View file

@ -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>

5
app/src/main/res/drawable-v21/numpad_unselected_complete.xml Normal file
View file

@ -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>

BIN
app/src/main/res/drawable/numfull.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

11
app/src/main/res/drawable/numpad_selected_complete.xml Normal file
View file

@ -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>

5
app/src/main/res/drawable/numpad_unselected_complete.xml Normal file
View file

@ -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>

2
app/src/main/res/values-night/styles.xml
View file

@ -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>

2
app/src/main/res/values/attrs.xml
View file

@ -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"/>

2
app/src/main/res/values/styles.xml
View file

@ -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>