From 3714a321d98c8d97920d7809b6a22f1ae5ec38a0 Mon Sep 17 00:00:00 2001 From: Gongxter Date: Mon, 7 Dec 2015 14:29:37 +0100 Subject: [PATCH] Blue TU Theme added and drawables with first attempt to add animation to drawable --- .../tu_darmstadt/sudoku/ui/MainActivity.java | 4 +- .../sudoku/ui/view/SudokuButton.java | 1 + .../sudoku/ui/view/SudokuButtonType.java | 31 ++++++++---- .../sudoku/ui/view/SudokuSpecialButton.java | 22 ++++++++ .../ui/view/SudokuSpecialButtonLayout.java | 47 ++++++++++++++---- .../drawable/ic_accessibility_black_48dp.png | Bin 0 -> 572 bytes .../res/drawable/ic_create_black_24dp.xml | 9 ++++ .../res/drawable/ic_create_black_48dp.png | Bin 0 -> 578 bytes .../res/drawable/ic_delete_black_24dp.xml | 9 ++++ .../res/drawable/ic_delete_black_48dp.png | Bin 0 -> 498 bytes .../ic_lightbulb_outline_black_48dp.png | Bin 0 -> 1656 bytes .../main/res/drawable/ic_redo_black_48dp.png | Bin 0 -> 1162 bytes .../ic_settings_backup_restore_black_48dp.png | Bin 0 -> 2308 bytes .../main/res/drawable/ic_undo_black_48dp.png | Bin 0 -> 1125 bytes .../main/res/layout/activity_main_menu.xml | 9 ++-- 15 files changed, 108 insertions(+), 24 deletions(-) create mode 100644 app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButton.java create mode 100644 app/src/main/res/drawable/ic_accessibility_black_48dp.png create mode 100644 app/src/main/res/drawable/ic_create_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_create_black_48dp.png create mode 100644 app/src/main/res/drawable/ic_delete_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_delete_black_48dp.png create mode 100644 app/src/main/res/drawable/ic_lightbulb_outline_black_48dp.png create mode 100644 app/src/main/res/drawable/ic_redo_black_48dp.png create mode 100644 app/src/main/res/drawable/ic_settings_backup_restore_black_48dp.png create mode 100644 app/src/main/res/drawable/ic_undo_black_48dp.png diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/MainActivity.java b/app/src/main/java/tu_darmstadt/sudoku/ui/MainActivity.java index 58beb21..f9a3722 100644 --- a/app/src/main/java/tu_darmstadt/sudoku/ui/MainActivity.java +++ b/app/src/main/java/tu_darmstadt/sudoku/ui/MainActivity.java @@ -130,7 +130,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On if(view instanceof Button) { Button b = (Button)view; switch(b.getId()) { - case R.id.aboutButton: + /**case R.id.aboutButton: i = new Intent(this, AboutActivity.class); break; case R.id.continueButton: @@ -144,7 +144,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On break; case R.id.helpButton: // TODO: create help page.. what is supposed to be in there?! - break; + break;*/ case R.id.playButton: GameType gameType = GameType.getValidGameTypes().get(mViewPager.getCurrentItem()); int index = difficultyBar.getProgress()-1; diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButton.java b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButton.java index 9cb8c9e..86c7337 100644 --- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButton.java +++ b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButton.java @@ -3,6 +3,7 @@ package tu_darmstadt.sudoku.ui.view; import android.content.Context; import android.util.AttributeSet; import android.widget.Button; +import android.widget.ImageButton; import android.widget.ToggleButton; /** diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButtonType.java b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButtonType.java index 88939b7..4c51bb1 100644 --- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButtonType.java +++ b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuButtonType.java @@ -1,5 +1,8 @@ package tu_darmstadt.sudoku.ui.view; +import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; + import java.util.ArrayList; import java.util.List; @@ -7,15 +10,25 @@ import java.util.List; * Created by Chris on 15.11.2015. */ public enum SudokuButtonType { - Unspecified, - Value, - Do, - Undo, - Hint, - NoteToggle, - NumberOrCellFirst, - Delete, - Reset; + Unspecified(R.drawable.ic_accessibility_black_48dp),// placeholder + Value(R.drawable.ic_accessibility_black_48dp), // should be non picture + Do(R.drawable.ic_redo_black_48dp), + Undo(R.drawable.ic_undo_black_48dp), + Hint(R.drawable.ic_lightbulb_outline_black_48dp), + NoteToggle(R.drawable.ic_create_black_48dp), + NumberOrCellFirst(R.drawable.ic_accessibility_black_48dp),//placeholder + Delete(R.drawable.ic_delete_black_48dp), + Reset(R.drawable.ic_settings_backup_restore_black_48dp); + + private int resID; + + SudokuButtonType(@DrawableRes int res){ + this.resID = res; + } + + public int getResID() { + return resID; + } public static List getSpecialButtons() { ArrayList result = new ArrayList(); diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButton.java b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButton.java new file mode 100644 index 0000000..b490de3 --- /dev/null +++ b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButton.java @@ -0,0 +1,22 @@ +package tu_darmstadt.sudoku.ui.view; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.ImageButton; + +/** + * Created by TMZ_LToP on 07.12.2015. + */ +public class SudokuSpecialButton extends ImageButton{ + private int value = -1; + private SudokuButtonType type = SudokuButtonType.Unspecified; + + public SudokuSpecialButton(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public void setValue(int value) { this.value = value; } + public void setType(SudokuButtonType type) { this.type = type; } + public int getValue () { return value; } + public SudokuButtonType getType() { return type; } +} diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButtonLayout.java b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButtonLayout.java index a935db9..e778b38 100644 --- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButtonLayout.java +++ b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuSpecialButtonLayout.java @@ -1,10 +1,22 @@ package tu_darmstadt.sudoku.ui.view; import android.content.Context; +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Canvas; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.RotateDrawable; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; +import android.view.animation.Animation; +import android.view.animation.AnimationSet; +import android.view.animation.DecelerateInterpolator; +import android.view.animation.RotateAnimation; +import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.LinearLayout; import java.util.ArrayList; @@ -18,7 +30,7 @@ import tu_darmstadt.sudoku.game.GameBoard; */ public class SudokuSpecialButtonLayout extends LinearLayout { - SudokuButton [] fixedButtons; + SudokuSpecialButton[] fixedButtons; public int fixedButtonsCount = SudokuButtonType.getSpecialButtons().size(); GameController gameController; SudokuKeyboardLayout keyboard; @@ -27,8 +39,8 @@ public class SudokuSpecialButtonLayout extends LinearLayout { OnClickListener listener = new OnClickListener() { @Override public void onClick(View v) { - if(v instanceof SudokuButton) { - SudokuButton btn = (SudokuButton)v; + if(v instanceof SudokuSpecialButton) { + SudokuSpecialButton btn = (SudokuSpecialButton)v; int row = gameController.getSelectedRow(); int col = gameController.getSelectedCol(); @@ -38,7 +50,22 @@ public class SudokuSpecialButtonLayout extends LinearLayout { gameController.deleteSelectedValue(); break; case NoteToggle: - btn.setText(keyboard.notesEnabled ? "ON" : "OFF"); + //btn.setText(keyboard.notesEnabled ? "ON" : "OFF"); + //TODO: add rotation + + AnimationSet aniset = new AnimationSet(true); + aniset.setInterpolator(new DecelerateInterpolator()); + aniset.setFillAfter(true); + aniset.setFillEnabled(true); + + RotateAnimation rotate = new RotateAnimation(0.0f,(keyboard.notesEnabled ? 90.0f:-90.0f), + RotateAnimation.RELATIVE_TO_SELF,0.5f, + Animation.RELATIVE_TO_SELF,0.5f); + rotate.setDuration(1500); + rotate.setFillAfter(true); + aniset.addAnimation(rotate); + + btn.startAnimation(aniset); keyboard.toggleNotesEnabled(); break; case Do: @@ -74,21 +101,23 @@ public class SudokuSpecialButtonLayout extends LinearLayout { public void setButtons(int width, GameController gc,SudokuKeyboardLayout key) { keyboard=key; gameController = gc; - fixedButtons = new SudokuButton[fixedButtonsCount]; + fixedButtons = new SudokuSpecialButton[fixedButtonsCount]; LayoutParams p; int i = 0; //ArrayList type = (ArrayList) SudokuButtonType.getSpecialButtons(); for (SudokuButtonType t : SudokuButtonType.getSpecialButtons()){ - fixedButtons[i] = new SudokuButton(getContext(),null); + fixedButtons[i] = new SudokuSpecialButton(getContext(),null); p = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT,1); - p.setMargins(5,5,5,5); + p.setMargins(5, 5, 5, 5); //int width2 =width/(fixedButtonsCount); //p.width= width2-15; fixedButtons[i].setLayoutParams(p); - fixedButtons[i].setGravity(Gravity.CENTER); fixedButtons[i].setType(t); - fixedButtons[i].setText(SudokuButtonType.getName(t)); + fixedButtons[i].setImageDrawable(getResources().getDrawable(t.getResID())); + // fixedButtons[i].setText(SudokuButtonType.getName(t)); + fixedButtons[i].setScaleType(ImageView.ScaleType.CENTER); + fixedButtons[i].setAdjustViewBounds(true); fixedButtons[i].setOnClickListener(listener); fixedButtons[i].setBackgroundResource(R.drawable.numpad_highlighted_four); addView(fixedButtons[i]); diff --git a/app/src/main/res/drawable/ic_accessibility_black_48dp.png b/app/src/main/res/drawable/ic_accessibility_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..46d736af34ffb826e13f3182e2725a46fcee246f GIT binary patch literal 572 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfr;7E#WAFU@y!kYtV0C??jN^@ zM8B0ad9~@%VT~$9$BztNM_zN}bse>yvcg+*vB6%4|1-|$Z)<)3{H{XdNuLS!o-PQG z#nTbFQC&6lc-IU&(lvk{i zZp<`6OFBb?( z`*PTAiqR66Mir%JACBHMU3^g1W2#*6G?h7)lQ*Pzg@?a)uP(`9V&GvmEcm~2GVdK0 zCb8w~@BUcjIZ4IS>M;*P13z;D1A_zu0~*v%H6Rj;)D~ul0(7Yat^>dKBAWnH;9!qoI0NGgW-NxAGJsqQLQA-H7&=z0 SRd;{J00f?{elF{r5}E)J3$QEz literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_create_black_24dp.xml b/app/src/main/res/drawable/ic_create_black_24dp.xml new file mode 100644 index 0000000..2ab2fb7 --- /dev/null +++ b/app/src/main/res/drawable/ic_create_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_create_black_48dp.png b/app/src/main/res/drawable/ic_create_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a09d3627a8c580713139121e82dc86b26cf3db5d GIT binary patch literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfr-=8#WAFU@$H@cZ~Y1-+8;jO z-gtvMXFkDe%RLdo_;*p6=`}jy=!zeR(|_&>%2) zz_9N8;-41xpFOXcx4k%jU7M`!jQ5{k_y0C9Z=bs-=Hd0Tm3h3@63H_Tn=x4hOqIBd1RSldz7O#ra;vxexxv@V;azZ!c*w-+XXxtojd= zKce5i_6h%y*p^s6_koS{r}x$eci)^)f1gwCoYMby!ZmZVixuk)4*uOa!G6Yrk1;3Y zeF|oA|7_-b692FXNL&OF2SLO}5U~(MOau{)AfgaNB!Y-Q5a9?S3_--t$(#}LzP~u1 zyjP#Ff4;-NI;Nk8IiK*W0WER(_aM*TS*pMNv{82(KDbo@#G$@&h)dA$GC>V1*K + + diff --git a/app/src/main/res/drawable/ic_delete_black_48dp.png b/app/src/main/res/drawable/ic_delete_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c2590128d8bd59595b83a3c97737358bbf046a32 GIT binary patch literal 498 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfpMp&i(^Oy8eVH6(j$M4; z#-_{kVa?S9op#~QFouJ59(yEmn{xI%O5B?uEWG*u$G^*(-{+bcPgL=o1V>BkvnG2# z-rOm5CcfdoA6||#@tp_$uyUNa599%<{s)(SassWy4je${*zCbBiBHs_8J{fG<^D{W zSMT$4pBFQa=Kbi*hU8P_8oV34f6nt_UK70UcFpv;|L0U%z1XUAz%I5V{EL=V+DyMH zP0kIz=CRK=-}&=?=F-Jsl3r))Pbtm)8qo1z%I}gJTJo-ScHJenLg%U1DNAiWs}sBZ zl;ZPFyWQU+pT(CtDnm{ Hr-UW|jX#Xv literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_lightbulb_outline_black_48dp.png b/app/src/main/res/drawable/ic_lightbulb_outline_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..11160499dfa6fff485df0be262230155d4983bc0 GIT binary patch literal 1656 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_black_48dp.png b/app/src/main/res/drawable/ic_settings_backup_restore_black_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..be0716c40f3facf67ec4b9038171d8de4ed62c5b GIT binary patch literal 2308 zcmV+f3H$bmP)G0000QfNklw3rtyclU__t{T1F&f1QsMt7(xUUqZnwZ zGX>hh?Y;f@n?DfA^PJmr&U4PW&+GjM+#jZ$hyrd6p#ZZa}Eh&~&3$>fu*0;*ZZr%2ZQo2f+DTzZhKy2cj9vxWpgOY#a`E>}cP5CNqw*Zl{13{ysM*yX-pI3bsGwd+l>8ng0v znO;}B;{>7Bh-i0(YQmtFe<0euLx??#Xt$rCgheq25$(QCNR6S}#qZGo!ejuAE*1@= z2%)5l+bypXMh>Fc?@16k4cZ5yRuWdLv~QShAY>+!(H#F0!mM8Nb)!S7EukZ$<)yss$qjVWqL7U&r+~RYD!h4$Q{sBbA0L_cmzaRu^5RLxM zP@-g**6z5ENf>twQI?{bsHxSuM%0R7(-DnU6Gh)gG^)d>6IvIXqbX18V)Zc$s?%C4 zJW5oJ&|2SBW6W<6WowACSGDeC8&W|=<6duqC`)SGJI+v!5nB;u(=gBfWyX&%ppXs| zf1C#FMHID@ByjZ_+mvy{!IOxx#RRTZN%5*L5|Bp_MQe$p*OeR3VPW|XFd2UhVJS_Vrh^nIZg83=>KS5u zH!wdOXW%-?$3LTa_daJ(yVykq{wd&=;+1bC5JwbGqZz+Ez-D?CJJJS}C?~S4zaZwxPc&|u# z53m;BEmu5+%Xn`f=Mk5kr3ml+P4TG9@ZEX?hfp>nS+ohyDG#cw!*{zCPhksQ8%-~g zMJdYh+K&~Fxf93jEUp`|#aK#Z#Dxw;rS$$+FuF##^%$kN6S3yQFvu zPvNblNIzPFx2BlCAg5Xmj>TI|NIz=CTjP{pH08Ta#Zwr8w@xGd=oH>6Q#{^h_^v15 zyO+Z%q>YLRO1IIrwwt@ zHOh?Kl&`@fPN>EYFrGFS;~y9OV<}Fk#t%@=Si-)GykgOT_rVd8MEV_^JhgIPi&r)c9YcWL7kjVxvm{+eRu zLrRYM@rT5EQyd7E6Uy^YcNmDz zoSYp$%tsWp5CA7f#}CI5Mb8lkCnv{WhbT%hlz=!nH-2ad*LR~jIX3=Dh_Xcl%E_Ve z!+u0j8wmpDaUPF}a!5AmzLn~6 zyntwRhI}l~EhB?y)XM}c&%K~Ie&J0l&uu_7`(3uZw(%AkE;Ou^(~S9cBTtKp}gIZ!_G3l&^u!rwbMIpM1n8+Fqa|`KLml;Kje1%@5ANBGn@3VpDnauKA;R+eVgN`$d7+F9HiBQ`pAXc8{Iuem?v6L7pr4@-lA5%_D z}tYsNB=EiPWmStI%Wm%SGS(as4mStI%Wm%SG eS(as4mi1p4ka>A8K>jQM0000-UbE%*M;4A zpVNERONTrFD!~8^@>P8+x3O-~U69L|%bgMJaGU9t*oEa>ab@qmZ#`wy_xQ)}JEtp) zw#sWZi_@uT;!S<=*=yuQd?zoEcar$(p!KRzgymtD zq2sL7%p<45jtKdu&YgC#NZZ^t@BTdZko(2!e$RPbU0!?d|ABXVEzG5Nue*BToNmrj z%Wpo+Fe?VE2$n;BRH}iZ}ZraD$Ch@>c z>Miq>X$p&`%CY?vEez?~{_<(jZ-zqQ7!UFFAGw8s?|)>P8xqOZ(Y>H6kIk}q%7RF? zoxNK^8NRc;u9%v+Mt|PG3L4=o@SF%8d*U<}H}Ge5RYt3lZxbCm0%> zn?&C{)Oi$WY~w$fk%67%bVaAlqr}R%w4JI9wvML$hTRo+GUb+^;%jJANKzK=X!P4K zZwe;^t7F^Yj)iv1&K5JU9{g$JDQ9@il5NEoF$c#B$F6r=bURtWu|Q$P1Hn%n56@lj zZw+VQYGUJ4y76A1_a1`=ht&^BPY?Tz*SLY^$QOGwS)IO{$`&A?^F&mo@vY)p`-Tn1 z+syxe=h@gTmzS!mtFv^Li6Hlih4a$F3PtaJ`K z>r$ojKQTYrqM!L^Kf{^g8SN3iE``yq^2&3ZWu~UOeqywHSU2raQR$j=`_FxKYNu4h z6DGxO5x739V#;H`eW$c1a~Pb9)lqu4bVnoqM5W)oKARYhy--?IvU^r}mtFRiIU)^@ z@A$dA+}066e7-gy4++0s>l(DImYR7 zQ*1j!qr-2_AI)jg85$S(*0!e1k8W_duyCJ6#as}hb%m8zE0D24IB@GpT?d5~2@-)O zj$1(@E%}13w_}-En#!&k{?^O_u^3%0nq3E)GimXv!_k=_R_Ir$TTkQ^1aiXvKGZDY z72wcQSY9!0_FbT2YY~5=7eFbO9<4m7>$}-GSY*4NR~Ya$IDBY)bl>qPg8+w>sQ<=e zwhjs&hHZb2|9Zs0!6H4O{w>E|6K5HQ#so&;{}nU0wyQC8a4QJdeBS=uivJ_SX-0*( z28RhhPjCOH@O|T&DeRk>4r(+R9RGdC+4-fvJA0F^OoH)Ok&X7Zo0A!VnZ3dB-?hUx fg7;$Ndx$^-15gTe~DWM4fnw#1P literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main_menu.xml b/app/src/main/res/layout/activity_main_menu.xml index 719e01e..4a0bc96 100644 --- a/app/src/main/res/layout/activity_main_menu.xml +++ b/app/src/main/res/layout/activity_main_menu.xml @@ -110,7 +110,7 @@ android:textStyle="normal" android:id="@+id/playButton" android:layout_gravity="center_horizontal" - android:layout_weight="2" + android:layout_weight="3" android:onClick="onClick" android:capitalize="none" android:clickable="false" @@ -118,7 +118,7 @@ android:background="@drawable/mnenomic_numpad_button"/>