From 5703e731353f1b2a6e664d01b9a5d7460e49175e Mon Sep 17 00:00:00 2001 From: Christopher Beckmann Date: Tue, 6 Oct 2020 13:05:32 +0200 Subject: [PATCH] Fixed compatibility issues with API Level <21 --- .../ui/GameActivity.java | 3 +- .../ui/MainActivity.java | 21 +- .../ui/TutorialActivity.java | 6 + .../view/CreateSudokuSpecialButtonLayout.java | 8 +- .../ui/view/SudokuSpecialButtonLayout.java | 6 +- .../ic_trophy_award_black_48dp.xml | 0 .../ic_trophy_black_48dp.xml | 0 .../numpad_highlighted_four.xml | 11 + .../ic_trophy_award_black_48dp.png | Bin 0 -> 1481 bytes .../drawable-night/ic_trophy_black_48dp.png | Bin 0 -> 1350 bytes .../numpad_highlighted_four.xml | 11 + .../button_inactive.xml} | 0 .../button_standalone.xml} | 0 .../ic_trophy_award_black_48dp.xml | 10 + .../res/drawable-v21/ic_trophy_black_48dp.xml | 10 + .../drawable-v21/mnenomic_numpad_button.xml | 5 + .../res/drawable-v21/numpad_highlighted.xml | 11 + .../drawable-v21/numpad_highlighted_four.xml | 11 + .../drawable-v21/numpad_highlighted_three.xml | 11 + .../drawable-xhdpi/ic_star_accent_48dp.png | Bin 0 -> 2416 bytes .../res/drawable-xhdpi/ic_star_grey_48dp.png | Bin 0 -> 1965 bytes app/src/main/res/drawable/button_inactive.xml | 11 + .../main/res/drawable/button_standalone.xml | 11 + .../main/res/drawable/ic_star_grey_36dp.xml | 10 - .../drawable/ic_trophy_award_black_48dp.png | Bin 0 -> 2133 bytes .../res/drawable/ic_trophy_black_48dp.png | Bin 0 -> 1901 bytes .../res/drawable/mnenomic_numpad_button.xml | 2 +- .../main/res/drawable/numpad_highlighted.xml | 6 +- .../res/drawable/numpad_highlighted_four.xml | 6 +- .../res/drawable/numpad_highlighted_three.xml | 6 +- app/src/main/res/drawable/ratingbar.xml | 35 +-- .../main/res/layout-land/activity_about.xml | 3 +- .../res/layout-land/activity_daily_sudoku.xml | 2 +- .../res/layout-land/activity_main_menu.xml | 6 +- .../main/res/layout-land/fragment_stats.xml | 6 +- .../res/layout-small/activity_main_menu.xml | 272 ------------------ .../res/layout-xlarge-land/activity_about.xml | 3 +- .../res/layout-xlarge-land/fragment_stats.xml | 6 +- .../main/res/layout-xlarge/activity_about.xml | 3 +- .../res/layout-xlarge/activity_main_menu.xml | 6 +- .../main/res/layout-xlarge/fragment_stats.xml | 6 +- .../res/layout-xlarge/win_screen_layout.xml | 9 +- app/src/main/res/layout/activity_about.xml | 3 +- .../main/res/layout/activity_daily_sudoku.xml | 6 +- .../main/res/layout/activity_main_menu.xml | 17 +- app/src/main/res/layout/activity_tutorial.xml | 1 - .../main/res/layout/fragment_main_menu.xml | 6 +- app/src/main/res/layout/fragment_stats.xml | 3 +- app/src/main/res/layout/tutorial_slide1.xml | 9 +- app/src/main/res/layout/tutorial_slide2.xml | 7 +- app/src/main/res/layout/win_screen_layout.xml | 9 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 53 files changed, 202 insertions(+), 398 deletions(-) rename app/src/main/res/{drawable => drawable-night-v21}/ic_trophy_award_black_48dp.xml (100%) rename app/src/main/res/{drawable => drawable-night-v21}/ic_trophy_black_48dp.xml (100%) create mode 100644 app/src/main/res/drawable-night-v21/numpad_highlighted_four.xml create mode 100644 app/src/main/res/drawable-night/ic_trophy_award_black_48dp.png create mode 100644 app/src/main/res/drawable-night/ic_trophy_black_48dp.png create mode 100644 app/src/main/res/drawable-night/numpad_highlighted_four.xml rename app/src/main/res/{drawable/inactive_button.xml => drawable-v21/button_inactive.xml} (100%) rename app/src/main/res/{drawable/standalone_button.xml => drawable-v21/button_standalone.xml} (100%) create mode 100644 app/src/main/res/drawable-v21/ic_trophy_award_black_48dp.xml create mode 100644 app/src/main/res/drawable-v21/ic_trophy_black_48dp.xml create mode 100644 app/src/main/res/drawable-v21/mnenomic_numpad_button.xml create mode 100644 app/src/main/res/drawable-v21/numpad_highlighted.xml create mode 100644 app/src/main/res/drawable-v21/numpad_highlighted_four.xml create mode 100644 app/src/main/res/drawable-v21/numpad_highlighted_three.xml create mode 100644 app/src/main/res/drawable-xhdpi/ic_star_accent_48dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_star_grey_48dp.png create mode 100644 app/src/main/res/drawable/button_inactive.xml create mode 100644 app/src/main/res/drawable/button_standalone.xml delete mode 100644 app/src/main/res/drawable/ic_star_grey_36dp.xml create mode 100644 app/src/main/res/drawable/ic_trophy_award_black_48dp.png create mode 100644 app/src/main/res/drawable/ic_trophy_black_48dp.png delete mode 100644 app/src/main/res/layout-small/activity_main_menu.xml diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/GameActivity.java index 31a5f0d..6c1d319 100644 --- 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 class GameActivity extends BaseActivity implements NavigationView.OnNavig 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 index be2b943..08b1078 100644 --- 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 class MainActivity extends BaseActivity implements NavigationView.OnNavig 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 class MainActivity extends BaseActivity implements NavigationView.OnNavig } }); - 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 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig List 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 index 609d750..5313c8e 100644 --- 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.ViewGroup; 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 class TutorialActivity extends AppCompatActivity { 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/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java index 0a92c1e..299cca3 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CreateSudokuSpecialButtonLayout.java @@ -24,7 +24,6 @@ import android.app.FragmentManager; 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.View; 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 class CreateSudokuSpecialButtonLayout extends LinearLayout implements IHi 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 index b676b89..bf01a21 100644 --- 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.app.FragmentManager; 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 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.listener.IHintDialogFragmentListener; import java.util.LinkedList; @@ -183,11 +181,11 @@ public class SudokuSpecialButtonLayout extends LinearLayout implements IHighligh 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/app/src/main/res/drawable/ic_trophy_award_black_48dp.xml b/app/src/main/res/drawable-night-v21/ic_trophy_award_black_48dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_trophy_award_black_48dp.xml rename to app/src/main/res/drawable-night-v21/ic_trophy_award_black_48dp.xml diff --git a/app/src/main/res/drawable/ic_trophy_black_48dp.xml b/app/src/main/res/drawable-night-v21/ic_trophy_black_48dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_trophy_black_48dp.xml rename to app/src/main/res/drawable-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 new file mode 100644 index 0000000..87ce8d9 --- /dev/null +++ b/app/src/main/res/drawable-night-v21/numpad_highlighted_four.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000000000000000000000000000000000000..92d66b730cf6a920d73d38bd17f732d76dd0ccfb GIT binary patch literal 1481 zcmaJ=Yfuwc6uu%0kw^`V*B6fDk%Nm0YEvL~Wy8QcD;kF@f* z&_Qa%X1M`3Fj~s)C~jb>iiT2?t-)zik>cDOn9Zw^fQ#ZRkayL%J!)PfUer}1JA90Z z;Ua`{YQ&F{sx*{CEzMF;F2yA_JPU_egp|n0R45eNp$sQ*43}YqOhPEs88S7F!=)ug z(O9xdZPXPl#X_D&Z09&ejbUD|SL)4>(rh(Gs8p)3hD;_w2#KfO%~^Pf+mpVmprbrC z*1>QN+6}{s7AsxLX~ZbgMr>Tn-HX}oeoXFTyZZzvG8tQkA=bF(E5nWzlDqL7xI~(U}(20OEmR2l)i9Y;!bB8y6EWJ=GPDJ{kZGew(;HegMXiCj77Z2ItAha&*pvcIN(!Y zYdmP2@+Sd)GnB`IuAn~=@X4?TnG^m^fKP(*IM6le-w60kum_n_{tbZN0OcZZC+JTA z{Ce1f%!%P-aC&R!8zZshSBhio_TcrX8~4BLFX){g%@uaccyrEn%zHZuj?ed{o;Wry z>5qA?|H$1CjXgCMn)V+W45e+K?7ErOUDO@&Nj^IoO8YaWG30aGYeH$$7fNo%^tL=b zpZ=Qlt^1!CzSlmiG+T3;zUh|vZggUq*FQ`d^8NhM)}y}5DNkPVT^?&6^j&FB9rRt@ zlXfvTj`>z70Q-U}5orFwJagM90N~&pH`nz0?D_HL0l}_7!=b4T-hXcWS1*&%%Fktj zw$b{`UTf=YGxG-yPt6#lg{;dEX+Y&iU8)C=oBnsv4aj?bD!2bw36 zhG(c(qEybIGm73V?>~riX2ocWYTuys#;#nGcwsp1Sa#qpwtr#j$IeNA vYF{kaz5mmc2qkc7p`)6QxB%darnOIi^7vZS+1AEj_=CQ%RClUi-+_Msioggw literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..46f2e9287853506e8d674b601eeaf6784337cb94 GIT binary patch literal 1350 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!WZB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L$o& z6x?nx!Kqgt=oo!av?4__ObD2EKuma|1#;lYJ~a=R){B6NT7TsXOJIgz3-AeX{SOAA zHD7apB1|Pge!>44o^ChrVqjpL~JF|Co$4MPvOqb zBXepcFaF^HWi1G3Fgft!*_|s!pI=xWkZn21ex7L)=jHyn>^+nI`5ajB!k@LL>0iu& z8~5k)NZkI-_=%M{;pO|@vwwk_|Ff>KE3g!R8AOOq;C`?LSTKBGSE%}GFDS6~mpo^O z-{1ZJRrUt{KbrsQ_m}uyrY$e`$C$pj^gnUhLf3!KV>{V?8XuNOUCCh0!pLxeK|uZM zeqjOjugqUqj#&Q9XFX#0_p)*B@-O?v1=_#p>-?R2@qe0w%*FjCVwFz+Z{2#z__w=w z?$^Jks}~>r$=ST}=wHt6^;`dHPTt!3GjjIs)Ss1$54!$bx%xQk*NL{b_w2TNcVq57 ziF*DAhYD{OBl(7pIj3^^N4IY~${%%kce*&7TsxtA?azN(>XU-6)nB@s@$l)E*Iy%k yA7XqUEbL&p;BR^uNOMCu^D2IXDF?p%6ii?!S{ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/inactive_button.xml b/app/src/main/res/drawable-v21/button_inactive.xml similarity index 100% rename from app/src/main/res/drawable/inactive_button.xml rename to app/src/main/res/drawable-v21/button_inactive.xml diff --git a/app/src/main/res/drawable/standalone_button.xml b/app/src/main/res/drawable-v21/button_standalone.xml similarity index 100% rename from app/src/main/res/drawable/standalone_button.xml rename to app/src/main/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 new file mode 100644 index 0000000..8dfe2b4 --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_trophy_award_black_48dp.xml @@ -0,0 +1,10 @@ + + + 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 new file mode 100644 index 0000000..844b657 --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_trophy_black_48dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-v21/mnenomic_numpad_button.xml b/app/src/main/res/drawable-v21/mnenomic_numpad_button.xml new file mode 100644 index 0000000..af4c22e --- /dev/null +++ b/app/src/main/res/drawable-v21/mnenomic_numpad_button.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable-v21/numpad_highlighted.xml b/app/src/main/res/drawable-v21/numpad_highlighted.xml new file mode 100644 index 0000000..2c00338 --- /dev/null +++ b/app/src/main/res/drawable-v21/numpad_highlighted.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/numpad_highlighted_four.xml b/app/src/main/res/drawable-v21/numpad_highlighted_four.xml new file mode 100644 index 0000000..87ce8d9 --- /dev/null +++ b/app/src/main/res/drawable-v21/numpad_highlighted_four.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/numpad_highlighted_three.xml b/app/src/main/res/drawable-v21/numpad_highlighted_three.xml new file mode 100644 index 0000000..05aa808 --- /dev/null +++ b/app/src/main/res/drawable-v21/numpad_highlighted_three.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000000000000000000000000000000000000..d8bbfa1e9c962cfc5adada4321cab8b92084555e GIT binary patch literal 2416 zcmdT`c~}$I9!&^>yNHO=_StDrT2!(j1fr2GK~RGTsFVtiKt>IiOiTs|izq5C#TA!V z5v_Ft6saX_vPjq$0V4vk6A&;0Vc!x0yori^e>~p*?|$FR+U2D#VRpH;swfa&hAD|7%3Wb#3j4GZ!C0Y?t=Am{=zSwTli z!7V5h24K6n!|sfo6kmvgW2!MYA%};sQK&6eLLSrCAA|uP@F1H@#r9|BU;#FZirr_% zATW4#;32j{FduXcc5?F#_V=}9VXd|TTZ9xufCIuzK*%}F6;Om!>?d6cGFNZovA`z? z>`%phPRgC(4A?<@5HQ0LOneFE1i+k#Bbsg^lgS$a5`jp-6G(U>$%IIzn35<20`O&E zk!XC@0g4OF{!1)mMa3S1VIBpK4-5>%1)Aa@{y{v^($Z3`K_ZzT2opgN7iJ1gxB|mj z1sW*u<+FJ(8{z_LMWzoF08_C@rk_jT@V?4&1z*~PGz>3f^6*3)L0!@;kiq!hP!8uS zS^&F%f9LyOg#~UwJP_{!3ZMYKFLH1P4Ar4{6gxi1gdx5g1Rb93qVpjLh6INo9$@Ec z2JB;VSx}(h6Pm%GIC2Frlj{pQ(x_O3k7Ki06jK{pvIWv(0@;>MB+_kdY|ZI(vY90r z*|s&`M4IK&Am0EE$c1OQtiQPyb8^*2;P8;hG?33e3bO3^5C`~FFoivLE@pG;ec`g^ z&c%FAE*?n+uRhlQIOf?c#5?NgSJNVkueJxdh}ZdusYS{iVJMWw_s%=r=o)a+?`7?( zsp+ZdX-q(pW`O8m!kguxX*!{)!j#%o$J2)=CNJeSPfkrU?v!2-H(6ZG^LtiR)iqe! z-oNQ`u6$IfP)&Uto>&={p54&1C@5vksf^wC$~p(fZAHJRyPU^&t!Q# zs_>1MFymeqw#uW6rIu0o&Ap?9i{iUwZI^SKe|}ieJE|aF5*M_}?W2p0&LM@4tUH@c zyH#|vu=Pe^t88e(Br<2;gYtiz${3%V@=vTf|FV(ySM?J~=brnoB6FHvHuk*f8oVfO znje^azx@5i$Q)6POpsJPrc^=C-#)JFAYBsc9!uL1QxcY5S0wFw-8op-J-j41<=c}P z>wkTjTr0D_Sy<6A5R&#zFDz|fTp2(>I+%6O$2H4JTgINjeALei))&FF5d2 zl2rY{`25SXcON|;SH_gI{dg`Le^CrRl`Iq{e}6jj-N)gw_I_AYqf|}hwaD{Z&s0K>hI@<~ibZr6bM8 zP1w*|4~AfgIw)!Gj_`K+_U4d)oD8qgZhqhA5vCIR?=VhUwAOB@b4^#znV_JfBGY=! zrWlNm_2P*cl<1b}0O=0idvla)`AV6FP`pAS*L0{lqB)l9=Em17iVe396C3`vU^qOUbeau9eQOFrLbQr)|n{u8WT?~ zJ#PJoxwP8W8YXGq)z&C>$3*DpX&Yb`2E7-WZ;2^n-V6p^gLk z>J@_K-g9VuBWsTrifG!B`@4MK^Px83C$PgJVxs-E|Ud#&*djxeu^+^fJvt172UprHt1=(JV# z+DGjlpu^KopRrO(D3@Nfx^MSjXd4j~+jNb~0t}8#55rT^m7u)mro=qP_DMr5UlN#X z=crf1S^bt&>ff5Tb^or~7{gb`V>KE_9&L|O*&BrId9zF7yURZH{F9o_+t8~WPW&hY zp54|gF|fu|utc&A-^j3-v3udW^Kh5vu}*i&^!3vnJl3DND&FhjZLI6gSoqKo-5yL0 z$8?uW+K?7nm_!+SVVD16-fV}?3wYuac)QWlPcQU(zOmkbkwrz)w|5uGwSHYzDG|%> zS^4c6oaClz%Qqa-5l4zMA0#XPxqo;QZ{^*KD6Up=KyL1~KMQA+cAC8A@!`i#S5r4M z@@vUHrqqFY%e2CDS?0u*_CmpUJbn9;(BbK^@+gTbtJ$MJ?x>%&Ri;tGjWeEg9hEmn z_WMcC#$Mn=Cf}|ilT3M5W(3dW(_uf3^ymt^QK~0-+q~PP9Z@@00%q D;wH9s literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..55661b2b8dbae90d01304bd62904762d2ce0d64e GIT binary patch literal 1965 zcmb_bX;2eq7+wKE(M|=_@c_GBohltkHb6jPQZNUQN^A_#Qd*UeERd39*JOb}aUf0| zTdbXGtw-z8*0G`>!EguyB|t$CRFs0;ARwm^1c4xdbfaSXqx4t5+2cE&=XuZXYyOUa zx9r#00|4+AH;^qL{$ZAPku~wH_djeoSdDW+@L)6oj}s{oV4DODM?kJz6p08BktBY9 z6+#C9Yfvf-!9#dKG%+eCi7XhBT8?Vf2V9<*~qIh_EdwXvN-C+t$hTX{&cQ=YR&BL7r!{F-y5!RHF z2%3QH|JoL@Vn9(ij?u{ExVSh{oCgV2Mv^H$K0X!=cXu}e;iigL;3Bn~LbZNQfsLrd zN-2g*Q3YsG6osQPI0GU)eHDTndn2n*y-pL6FtS>NktrnD64D%y$NO)nT>b{F!Uf3R z{{E}5N*IqJWC5Z=W0Yc|a1rY*rZ5^yiHLAiDMV4(To(CJD2}S4Pz+=RQ^Aj=3JDsg zdWq)oXk3K~7b(ODm(73(K1nK-(7c#FOy)K=1@>lgC=?Ep2~#**U@Dc$@no?m9v*XC zHY$#hBMN+uEBTx2J}=kO2y%?D%tn;bSVZElMCIVifN9csePQ{}tM{5Knco+9UM`t% zhHNS8Kgv9}Mf8qk`le}##hbQA6hyBpiKdS7g?=V3goz&{uYOko0*wuY-~(ROVjCe85tS<{ryu@Q#Ca; z)z#GxA3ih~3?`E)Jw5&E)vHgRJ}oLL>gwvcdGqGu$B(P3s+yXb%F4=~Jb99pmG%7j zbFEg}($dn=(NSMtuh;7G>(st z=jG)U78Z7QcaM#YWoKs(3=G`6cklZ3>v!+o&CShy^yty(=xAMC-QeJ0d3pJrJ9lp1 zzTMf`+0f9?+uK`QT>R|WvyzgM*4Ea7f`Xo&p3KZlv)Swf#TF8I5aNOz!Nl_a9zgJ< z@;(4q6>!a1d3MFIxR@tcv8I_C=AhTolQQL zWp%v7rT_b!D3zW6ke-2pfij1_rAC9_IdbiBLo)rbee1G-RJul1v-l64vu4@;#pl*z zy|%_YplSDSzoz{`6&4+rA`X7)&_%I9IfG>H^^(Y*ACaV8)U724SGL>QoG`NF-(9`1 zk89)dpuh0^nm^ZdeW+jXrKFT1X`A}$pkuK~P-}46v~%y&#gyso4T*`P)7iXz#~$?^ z>p*3*K~kmJM8=0`fy2{Nrwdkwy6Qfftt@}~L+ciOpSdpiL`t=Tm-)bw-A5cbpUs9_ zh4RV{pEi}jto+?gV@csdcIi1}ZI+jFZu7?Srmf9eQqmM7Cl_lE{0?MnT + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_standalone.xml b/app/src/main/res/drawable/button_standalone.xml new file mode 100644 index 0000000..8f125d3 --- /dev/null +++ b/app/src/main/res/drawable/button_standalone.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_star_grey_36dp.xml b/app/src/main/res/drawable/ic_star_grey_36dp.xml deleted file mode 100644 index 456adf1..0000000 --- a/app/src/main/res/drawable/ic_star_grey_36dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - 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 new file mode 100644 index 0000000000000000000000000000000000000000..e85ed535b4836a112c49b45b78a513c4a87cad52 GIT binary patch literal 2133 zcmb`IeLNFt8^<@3mza>Sw&;Y^!=xfSb&R|&WoOOd0K9+Nrf zJPu)=uxw^KEm7XiyhLWK;SrX}OWw9Q+HOgmiZeN*MVf^s78D1!?~p{ZsXAH!;nnKQ%vFIFPOXu*_ALACm5$ zL5PU8Ft_oE4L(QBpoX;l{Q2yWT>%8MOsFeM)8ig`SA7)WJDhAUz0FR+{w~YrX6;yU zangyHo)+oJlhRet9tU&t>3=y%3r=#9dXv=5kw5)q54HUI7iZ#9S9sLcbmsAk_O{Uk+}zucc< zi2*7r$-6qD?Pb0vw5v6+Jn0Px#r}u>*LBw%9~HVJ+G{c?*B!5+9f`j-*^$34E_?45^#aP(DYsMRnHG-PT^a z+URZuhKE;aRk5}~tv$P89CB<@TPeuJWkwzR<7OBX55(V*#|qvI9p-SH)*M4BZSLoS zXdf^L>e|TUDk?qC?2WE^n6(xoIvZButi#n`&|Qf6$1Asnv4d=oOw$n}6zNJ-(U$Wg zBeP99AVfAg$ZZKEf{1Bnu=PZJ$796f;6XLf9`0>1&Aa+)4M4rz=#NVhb!STjvax6| zK=kWpkCUf{0A88oyEPwI{K8Pn*CAHCJDj=ORgz!tX}8O(3%DS@R=GK4LNTzFit#*_ z83@S@pTmj%&Ce+%P$r%df#bPCC}ko!wrCa(CM82J@U`1#<{a^;<-Ij4klg;kq@Za3 z0f2EXtETX`vHWV_aajDtJs@fs?R?=DK`DEw-z@ z5|~(+TzIH6h*cjq$mv;mg#jTRIP+&|ogEAfntIcVL58ZKEc{9I6@K*|vd(?OxfdM(<&bxkQNDIYatg#@knaqhgKTvEH`Tb1Gq zR9Y}MCjQPkKuJl&mtUPXfg5p;_Z$oE&FB+d6a!UPJ~KdO2|3PR05y z!8(2T-BvwkXo_$8bU5?t(WXImmu-fh%@ z;}+^^X=xf zup;rz9`=#L47g5k|CcB6?haMSCfDT|wpfAK-~MCN`Xxfa`$)DQ8Oy}gTix$~xj>Q+O4>~ARRzB(3XZ&e znljvv8n<3sCFSbRE`=sNpM(MSbp!qR{~tUlgBn*};977qxa(P_*j^`vOm%@QauWqD zXYmuR?m2Tdwzp>Af43SKL5+c{-@Jv@16gt|_06$`rj^5q(zx>ckGopV$+S(yBDlRgb}18E5W26`i*2>OiXd}Z1c`w_{hq-t|sk_f`{1X#ys)(M#X9xV?6Cy&`{fRHhj_?e-v-W%=d1E z=*(BNwE2;`;yoSox`Cj_i;@}-(1;Uq1m%}e@b+2xm&pFRNT L;p<*|HZ1*5@uv`& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_trophy_black_48dp.png b/app/src/main/res/drawable/ic_trophy_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7d1620fd5f7c86a55ba404e71af582e627724ebc GIT binary patch literal 1901 zcmd6odsxz08pnS>P*4#aBL_v1vYN4UM%TnlAhlGyY-YN7N#$W|$`nCMLl#R=OEW`l zWK1Dl!)xWGc7)0+v$)fYQ;jqwW@3!3iJ2gYqIp|p{+mDdzkQ$cJ)h@&pL3pb{y69T zmPAI7kro&W005AoA%RgwN`IFb%s5Alr^AhaC5Mv(jWou}p&pJA=9wY!Sw@EZq2Qlr z2YxRyGXqkLl>VV#q}dC`t;?Z-0e@qS%_+lMkDc54NY_bXU4E^TM10&pJOF40XiPQO_O^91_8T30j z&!Hkd?1;!v+TtJGW<15A0z0TJuK>C-T?dnEVI9qh`jbr4dHfp^R)d$FP^vLcL8o%c zAV7?m+#k~OTkUEC+5@@}MTDE#OOdBKuOH7SWL%lM zwB@#EmKZW`H6NVl&VTH{ubHKX{yQiM`W_w=m>rnv2r}UPw{^*QKl2R>7R1MPcihnqo+g(%hK#);b#}jgqQj(M>4g07J zYu6DX9^P5lHZ@U)l|GV}Vua+&n|Ho#cPg2f!T)vD%wxB!3n%EjBGoq{x@>|hLO+Xj zg=U!yT=zH(Po*y3tObBxY#%pJFmo;(WVy1z60cupV>&?KY0G%gJ!kfI9s$w@*|%X4iw1^_5Lia+G=;)AB>`T@ywG&Mf)(-AX|rtvIt)0HI`ncJ{rvlKIP4K@KvLzq}no!_Ki= zZC-_}ZR3f(gSEsLI!~R=JOch^pTm}L!aM}L+y?Y6`3_bMg)nFZHh4QPe?2suX?4btE0~40HPrzFJNC!$OSs|IPcjBdpt}{5foRQFr zPed?nrku~hJFZim`RAZXgrMdk}U#V!SpEa-D zUHr(oT-ZPZfexd7c$>SyG008CA8V;IZFc|LhpxV1Po-Z{#Fv(P)YuKAAAN+BDy4Mk z7ku2i{u}J|T6kXlTI6Cezj##BbbeQqpc`R)n>49m@Pf_8Dg)`zjSofP5xtPdHk(^7 z@1=Dlyh_imd|oG(dKazu@Hx4}A@6sI9G8dos=xoR(mIGzj`eXzL~TvPyq)Zd)sZ|R z=5)TMfymm!X3<{!#1J-aitE0j{Ac7r2nDB1M85h~x_z?vT-3SNSHUy5r>0DlUt?v5 zQYi`JEbP?D_P4V=yI*3ern)Y?TgYfR_;Z8sfXReqYZDg%F9 z&ttu%!`C7__&J9>!%0vl(AX*~{_HwN6MELVW*##~LMS~5u|_ilLW3d#I}TC{{tI?J BP - + diff --git a/app/src/main/res/drawable/numpad_highlighted.xml b/app/src/main/res/drawable/numpad_highlighted.xml index 2c00338..7af2c1a 100644 --- a/app/src/main/res/drawable/numpad_highlighted.xml +++ b/app/src/main/res/drawable/numpad_highlighted.xml @@ -2,10 +2,10 @@ + android:endColor="@color/lightblue" + android:startColor="@color/lightblue" /> + android:color="@color/colorPrimaryDark" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/numpad_highlighted_four.xml b/app/src/main/res/drawable/numpad_highlighted_four.xml index 87ce8d9..8b8e766 100644 --- a/app/src/main/res/drawable/numpad_highlighted_four.xml +++ b/app/src/main/res/drawable/numpad_highlighted_four.xml @@ -2,10 +2,10 @@ + android:endColor="@color/lightblue" + android:startColor="@color/lightblue" /> + android:color="@color/black" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/numpad_highlighted_three.xml b/app/src/main/res/drawable/numpad_highlighted_three.xml index 05aa808..fe0f0cf 100644 --- a/app/src/main/res/drawable/numpad_highlighted_three.xml +++ b/app/src/main/res/drawable/numpad_highlighted_three.xml @@ -2,10 +2,10 @@ + android:endColor="@color/lightblue" + android:startColor="@color/lightblue" /> + android:color="@color/yellow" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ratingbar.xml b/app/src/main/res/drawable/ratingbar.xml index b634ced..a461706 100644 --- a/app/src/main/res/drawable/ratingbar.xml +++ b/app/src/main/res/drawable/ratingbar.xml @@ -1,27 +1,12 @@ - - - - - - - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_about.xml b/app/src/main/res/layout-land/activity_about.xml index b36a20c..818a033 100644 --- a/app/src/main/res/layout-land/activity_about.xml +++ b/app/src/main/res/layout-land/activity_about.xml @@ -1,5 +1,6 @@ + app:srcCompat="@drawable/secuso_logo_blau_blau" /> - + android:background="@drawable/button_standalone"/>