Fixed compatibility issues with API Level <21

SecUSo · Oct 6, 2020 · 5703e73 · 5703e73
1 parent 075da4a
commit 5703e73
Show file tree

Hide file tree

Showing 53 changed files with 202 additions and 398 deletions.
diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java
@@ -362,7 +362,8 @@ public void onClick(DialogInterface dialog, int id) {
         ratingBar.setMax(numberOfStarts);
         ratingBar.setNumStars(numberOfStarts);
         ratingBar.setRating(difficutyList.indexOf(gameController.getDifficulty()) + 1);
-        ((TextView)findViewById(R.id.difficultyText)).setText(getString(gameController.getDifficulty().getStringResID()));
+        TextView diffText = ((TextView)findViewById(R.id.difficultyText));
+        diffText.setText(getString(gameController.getDifficulty().getStringResID()));
 
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
@@ -161,6 +161,7 @@ public void onPageScrollStateChanged(int state) {
         difficultyBar.setNumStars(difficultyList.size());
         difficultyBar.setMax(difficultyList.size());
         CheckBox createGameBar = (CheckBox) findViewById(R.id.circleButton);
+        createGameBar.setButtonDrawable(R.drawable.create_game_src);
         difficultyBar.setOnRatingBarChangeListener(new RatingBar.OnRatingBarChangeListener() {
             @Override
             public void onRatingChanged(RatingBar ratingBar, float rating, boolean fromUser) {
@@ -177,16 +178,14 @@ public void onRatingChanged(RatingBar ratingBar, float rating, boolean fromUser)
             }
         });
 
-        createGameBar.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        createGameBar.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-
-                    difficultyBar.setRating(0);
-                    ((Button)findViewById(R.id.playButton)).setText(R.string.create_game);
-                }
-                createGameBar.setChecked(isChecked);
-            }});
+            public void onClick(View v) {
+                difficultyBar.setRating(0);
+                ((Button)findViewById(R.id.playButton)).setText(R.string.create_game);
+                createGameBar.setChecked(true);
+            }
+        });
 
         String retrievedDifficulty = settings.getString("lastChosenDifficulty", "Moderate");
         GameDifficulty lastChosenDifficulty = GameDifficulty.valueOf(
@@ -320,10 +319,10 @@ private void refreshContinueButton() {
         List<GameInfoContainer> gic = fm.loadGameStateInfo();
         if(gic.size() > 0 && !(gic.size() == 1 && gic.get(0).getID() == GameController.DAILY_SUDOKU_ID)) {
             continueButton.setEnabled(true);
-            continueButton.setBackgroundResource(R.drawable.standalone_button);
+            continueButton.setBackgroundResource(R.drawable.button_standalone);
         } else {
             continueButton.setEnabled(false);
-            continueButton.setBackgroundResource(R.drawable.inactive_button);
+            continueButton.setBackgroundResource(R.drawable.button_inactive);
         }
     }
 

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/TutorialActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/TutorialActivity.java
@@ -31,6 +31,7 @@
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -212,6 +213,11 @@ public Object instantiateItem(ViewGroup container, int position) {
             View view = layoutInflater.inflate(layouts[position], container, false);
             container.addView(view);
 
+            CheckBox createGameBar = (CheckBox) findViewById(R.id.circleButton);
+            if(createGameBar != null) {
+                createGameBar.setButtonDrawable(R.drawable.create_game_src);
+            }
+
             return view;
         }
 

diff --git a/...c/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java b/...c/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java
@@ -24,7 +24,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -33,16 +32,13 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.Toast;
 
 import androidx.core.content.ContextCompat;
 
 import org.secuso.privacyfriendlysudoku.controller.GameController;
 import org.secuso.privacyfriendlysudoku.game.listener.IHighlightChangedListener;
-import org.secuso.privacyfriendlysudoku.ui.GameActivity;
 import org.secuso.privacyfriendlysudoku.ui.MainActivity;
 import org.secuso.privacyfriendlysudoku.ui.listener.IFinalizeDialogFragmentListener;
-import org.secuso.privacyfriendlysudoku.ui.listener.IHintDialogFragmentListener;
 import org.secuso.privacyfriendlysudoku.ui.listener.IImportDialogFragmentListener;
 
 import java.util.LinkedList;
@@ -173,11 +169,11 @@ public void onHighlightChanged() {
             switch(fixedButtons[i].getType()) {
                 case Undo:
                     fixedButtons[i].setBackgroundResource(gameController.isUndoAvailable() ?
-                            R.drawable.numpad_highlighted_four : R.drawable.inactive_button);
+                            R.drawable.numpad_highlighted_four : R.drawable.button_inactive);
                     break;
                 case Do:
                     fixedButtons[i].setBackgroundResource(gameController.isRedoAvailable() ?
-                            R.drawable.numpad_highlighted_four : R.drawable.inactive_button);
+                            R.drawable.numpad_highlighted_four : R.drawable.button_inactive);
                     break;
                 default:
                     break;

diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuSpecialButtonLayout.java
@@ -24,7 +24,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -39,7 +38,6 @@
 
 import org.secuso.privacyfriendlysudoku.controller.GameController;
 import org.secuso.privacyfriendlysudoku.game.listener.IHighlightChangedListener;
-import org.secuso.privacyfriendlysudoku.ui.GameActivity;
 import org.secuso.privacyfriendlysudoku.ui.listener.IHintDialogFragmentListener;
 
 import java.util.LinkedList;
@@ -183,11 +181,11 @@ public void onHighlightChanged() {
             switch(fixedButtons[i].getType()) {
                 case Undo:
                     fixedButtons[i].setBackgroundResource(gameController.isUndoAvailable() ?
-                            R.drawable.numpad_highlighted_four : R.drawable.inactive_button);
+                            R.drawable.numpad_highlighted_four : R.drawable.button_inactive);
                     break;
                 case Do:
                     fixedButtons[i].setBackgroundResource(gameController.isRedoAvailable() ?
-                            R.drawable.numpad_highlighted_four : R.drawable.inactive_button);
+                            R.drawable.numpad_highlighted_four : R.drawable.button_inactive);
                     break;
                 case NoteToggle:
                     Drawable drawable = ContextCompat.getDrawable(context, fixedButtons[i].getType().getResID());

diff --git a/...s/drawable/ic_trophy_award_black_48dp.xml → ...-night-v21/ic_trophy_award_black_48dp.xml b/...s/drawable/ic_trophy_award_black_48dp.xml → ...-night-v21/ic_trophy_award_black_48dp.xml
diff --git a/...ain/res/drawable/ic_trophy_black_48dp.xml → ...awable-night-v21/ic_trophy_black_48dp.xml b/...ain/res/drawable/ic_trophy_black_48dp.xml → ...awable-night-v21/ic_trophy_black_48dp.xml
diff --git a/app/src/main/res/drawable-night-v21/numpad_highlighted_four.xml b/app/src/main/res/drawable-night-v21/numpad_highlighted_four.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/activeButtonColor"
+        android:startColor="?attr/activeButtonColor" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="?attr/standardVectorGraphic" />
+</shape>
diff --git a/app/src/main/res/drawable-night/ic_trophy_award_black_48dp.png b/app/src/main/res/drawable-night/ic_trophy_award_black_48dp.png
diff --git a/app/src/main/res/drawable-night/ic_trophy_black_48dp.png b/app/src/main/res/drawable-night/ic_trophy_black_48dp.png
diff --git a/app/src/main/res/drawable-night/numpad_highlighted_four.xml b/app/src/main/res/drawable-night/numpad_highlighted_four.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/lightblue"
+        android:startColor="@color/lightblue" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="@color/white" />
+</shape>
diff --git a/...src/main/res/drawable/inactive_button.xml → ...main/res/drawable-v21/button_inactive.xml b/...src/main/res/drawable/inactive_button.xml → ...main/res/drawable-v21/button_inactive.xml
diff --git a/...c/main/res/drawable/standalone_button.xml → ...in/res/drawable-v21/button_standalone.xml b/...c/main/res/drawable/standalone_button.xml → ...in/res/drawable-v21/button_standalone.xml
diff --git a/app/src/main/res/drawable-v21/ic_trophy_award_black_48dp.xml b/app/src/main/res/drawable-v21/ic_trophy_award_black_48dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+    <path
+        android:fillColor="?attr/standardVectorGraphic"
+        android:name="Color Fill 1"
+        android:pathData="m96 18 -15 38 -42 3 32 27 -11 41 36 -29 36 29 -11 -41 32 -27 -42 -3 -15 -38zm0 103 -8 7v25h-11l-3 1l-2 1l-2 1l-1 1l-1 1l-1 1l-1 2l-1 2l-1 4v10h64v-10l-1 -4l-1 -2l-1 -2l-1 -1l-1 -1l-1 -1l-2 -1l-2 -1l-3 -1h-11v-25l-8 -7z" />
+</vector>
diff --git a/app/src/main/res/drawable-v21/ic_trophy_black_48dp.xml b/app/src/main/res/drawable-v21/ic_trophy_black_48dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+    <path
+        android:fillColor="?attr/standardVectorGraphic"
+        android:name="Shape 1"
+        android:pathData="m48 32v56h-16v-56zm112 0v56h-16v-56zm-144 -16c0 0 0 1.52 0 4.13c0 15.29 0 67.88 0 67.88c0.06 0.25 0.13 0.25 0.13 0.25c0 7.53 8.9 13.72 14.75 15.45c0.1 0.03 0.2 0.06 0.3 0.09c0.11 0.03 0.22 0.06 0.32 0.08l0.5 0.12l18.22 0.02c0.01 0.07 0.02 0.14 0.03 0.21c2.48 19.1 19.25 29.53 37.76 31.8c0 4.69 0 15.96 0 16.91h-0c-12.93 2.24 -24 9.94 -24 23.06h64c-0 -13.22 -11.07 -20.9 -24 -23.09h-0v-16.92c0.05 -0.01 0.1 -0.01 0.14 -0.02c18.93 -2.45 35.9 -13.31 37.45 -32.03c0.01 -0.08 3.5 -0.1 7.48 -0.1c5.28 0 11.42 0.04 11.42 0.04c0.11 -0.03 0.21 -0.05 0.32 -0.08c5.84 -1.6 15.05 -7.88 15.05 -15.54l0.13 0.75c0 0 0 -63.25 0 -72c0 -0.65 0 -1 0 -1l-32.5 0.13c-0.11 0.03 -0.21 0.05 -0.32 0.08c-0.12 0.03 -0.25 0.07 -0.37 0.11c-5.85 1.76 -14.68 7.93 -14.68 15.43h-64.25c0 -7.66 -9.21 -13.94 -15.05 -15.54c-0.11 -0.03 -0.22 -0.06 -0.32 -0.08l-32.5 -0.13z" />
+</vector>
diff --git a/app/src/main/res/drawable-v21/mnenomic_numpad_button.xml b/app/src/main/res/drawable-v21/mnenomic_numpad_button.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/activeButtonColor" android:startColor="?attr/activeButtonColor" />
+        <corners android:radius="6dp" />
+    </shape>
diff --git a/app/src/main/res/drawable-v21/numpad_highlighted.xml b/app/src/main/res/drawable-v21/numpad_highlighted.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/activeButtonColor"
+        android:startColor="?attr/activeButtonColor" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="?attr/colorPrimaryDark" />
+</shape>
diff --git a/app/src/main/res/drawable-v21/numpad_highlighted_four.xml b/app/src/main/res/drawable-v21/numpad_highlighted_four.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/activeButtonColor"
+        android:startColor="?attr/activeButtonColor" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="?attr/standardVectorGraphic" />
+</shape>
diff --git a/app/src/main/res/drawable-v21/numpad_highlighted_three.xml b/app/src/main/res/drawable-v21/numpad_highlighted_three.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/activeButtonColor"
+        android:startColor="?attr/activeButtonColor" />
+    <corners android:radius="6dp" />
+    <stroke
+        android:width="10px"
+        android:color="?attr/highlightedButtonBorder" />
+</shape>
diff --git a/app/src/main/res/drawable-xhdpi/ic_star_accent_48dp.png b/app/src/main/res/drawable-xhdpi/ic_star_accent_48dp.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_star_grey_48dp.png b/app/src/main/res/drawable-xhdpi/ic_star_grey_48dp.png
diff --git a/app/src/main/res/drawable/button_inactive.xml b/app/src/main/res/drawable/button_inactive.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<!-- default -->
+<item>
+    <shape >
+        <solid
+            android:color="@color/middlegrey" />
+        <corners android:radius="6dp" />
+    </shape>
+</item>
+</selector>
diff --git a/app/src/main/res/drawable/button_standalone.xml b/app/src/main/res/drawable/button_standalone.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!-- default -->
+    <item>
+        <shape >
+            <solid
+                android:color="@color/colorPrimary" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/ic_star_grey_36dp.xml b/app/src/main/res/drawable/ic_star_grey_36dp.xml
diff --git a/app/src/main/res/drawable/ic_trophy_award_black_48dp.png b/app/src/main/res/drawable/ic_trophy_award_black_48dp.png
diff --git a/app/src/main/res/drawable/ic_trophy_black_48dp.png b/app/src/main/res/drawable/ic_trophy_black_48dp.png
diff --git a/app/src/main/res/drawable/mnenomic_numpad_button.xml b/app/src/main/res/drawable/mnenomic_numpad_button.xml
@@ -1,5 +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/activeButtonColor" android:startColor="?attr/activeButtonColor" />
+        <gradient android:endColor="@color/lightblue" android:startColor="@color/lightblue" />
         <corners android:radius="6dp" />
     </shape>
diff --git a/app/src/main/res/drawable/numpad_highlighted.xml b/app/src/main/res/drawable/numpad_highlighted.xml
@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:endColor="?attr/activeButtonColor"
-        android:startColor="?attr/activeButtonColor" />
+        android:endColor="@color/lightblue"
+        android:startColor="@color/lightblue" />
     <corners android:radius="6dp" />
     <stroke
         android:width="10px"
-        android:color="?attr/colorPrimaryDark" />
+        android:color="@color/colorPrimaryDark" />
 </shape>
diff --git a/app/src/main/res/drawable/numpad_highlighted_four.xml b/app/src/main/res/drawable/numpad_highlighted_four.xml
@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:endColor="?attr/activeButtonColor"
-        android:startColor="?attr/activeButtonColor" />
+        android:endColor="@color/lightblue"
+        android:startColor="@color/lightblue" />
     <corners android:radius="6dp" />
     <stroke
         android:width="10px"
-        android:color="?attr/standardVectorGraphic" />
+        android:color="@color/black" />
 </shape>
diff --git a/app/src/main/res/drawable/numpad_highlighted_three.xml b/app/src/main/res/drawable/numpad_highlighted_three.xml
@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:endColor="?attr/activeButtonColor"
-        android:startColor="?attr/activeButtonColor" />
+        android:endColor="@color/lightblue"
+        android:startColor="@color/lightblue" />
     <corners android:radius="6dp" />
     <stroke
         android:width="10px"
-        android:color="?attr/highlightedButtonBorder" />
+        android:color="@color/yellow" />
 </shape>
diff --git a/app/src/main/res/drawable/ratingbar.xml b/app/src/main/res/drawable/ratingbar.xml
@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background">
-        <bitmap
-            android:src="@drawable/ic_star_grey_36dp" />
-    </item>
-    <item android:id="@android:id/progress">
-        <bitmap
-            android:src="@drawable/ic_star_blue_36dp" />
-    </item>
-</layer-list>
-
+    <item
+        android:id="@android:id/background"
+        android:drawable="@drawable/ic_star_grey_48dp" />
+    <item
+        android:id="@android:id/secondaryProgress"
+        android:drawable="@drawable/ic_star_half_black_48dp" />
+    <item
+        android:id="@android:id/progress"
+        android:drawable="@drawable/ic_star_accent_48dp" />
+</layer-list>
diff --git a/app/src/main/res/layout-land/activity_about.xml b/app/src/main/res/layout-land/activity_about.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -116,7 +117,7 @@
             android:adjustViewBounds="true"
             android:paddingEnd="50dp"
             android:paddingStart="50dp"
-            android:src="@drawable/secuso_logo_blau_blau" />
+            app:srcCompat="@drawable/secuso_logo_blau_blau" />
 
         <TextView
             android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout-land/activity_daily_sudoku.xml b/app/src/main/res/layout-land/activity_daily_sudoku.xml
@@ -108,7 +108,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginLeft="16dp"
                 android:adjustViewBounds="true"
-                android:src="@drawable/icon_default_9x9"
+                app:srcCompat="@drawable/icon_default_9x9"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/view"
                 app:layout_constraintHorizontal_bias="0.0"