From d3d8839e3ee6e083eca69763196e621b20b2e9d9 Mon Sep 17 00:00:00 2001 From: Gongxter Date: Sat, 20 Feb 2016 15:06:55 +0100 Subject: [PATCH] Added dialog and text for dialog for the welcome screen --- .../ui/MainActivity.java | 4 +- .../main/res/drawable/ic_star_blue_48dp.png | Bin 1218 -> 1457 bytes .../main/res/drawable/ic_star_grey_48dp.png | Bin 1164 -> 1437 bytes app/src/main/res/drawable/ratingbar.xml | 19 +++-- .../main/res/layout/activity_main_menu.xml | 1 - app/src/main/res/layout/welcome_dialog.xml | 68 +++++++++++++++++- app/src/main/res/values/strings.xml | 6 +- 7 files changed, 84 insertions(+), 14 deletions(-) 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 a65c2b9..29e09ea 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java @@ -24,6 +24,7 @@ import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; import android.widget.Button; import android.widget.ImageView; import android.widget.RatingBar; @@ -75,9 +76,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On editor.apply(); } - // TODO: remove this after testing - WelcomeDialog welcomeDialog = new WelcomeDialog(); - welcomeDialog.show(getFragmentManager(), "WelcomeDialog"); // check if we need to pre generate levels. diff --git a/app/src/main/res/drawable/ic_star_blue_48dp.png b/app/src/main/res/drawable/ic_star_blue_48dp.png index 872e2b324da895f3302533044b03b431b7703e66..05d0034a3ca66de673a45953f246faa21f7d6725 100644 GIT binary patch delta 1440 zcmV;R1z-BY39$>1BYy>WNklWl#vx=A4(+`Gy$R(U%y@>qG+o z)Dip%EVC~heSe)a4?+eNWlul&=vfpsgUFskVL}`70ewbt_9ok7IN;h(sjNKAt2 zY`|q3c`L;9l}1@&EUyJPu(9uiN2&L-`7EQjoedN=NUxy z9E5M*gK3^V_J{4DqFesXenS^!j10Pp!0M7CE<|kS=R}J;roKjolP$b6fww?pW^l(of4 z5CmL+wtu<6MZh8SIp^2*q}>U6O!yVJ2>b>D*A}^;EO3dGJp+z(4H%+!{gBgpn4k0e zN3ON>3#Bvz$fBc}^(I(UID7aTHxR-_WY0END5ZBXCT?Zo8Q?vaf+22ySFx3mquBPV z3UKeYAMc(x=alCdr*qMvtbF+FP)puj}O2~PdWbWIbMHsj4UjVysGx<8A*&$f36HT}Lre*hMM%1s;(2hOt~-=JuyqCGyklw8oFF*|NqXYe z9qtHScOXAtLwBmrtZfBt(k^Fk^b`8@!GEtS+0+I(a=xt$nu6}%fyypq7e)?-q&?Qg zTFD@sJQZ|BjyRbLT6vLfi=Z>*b;r_*%|uYeuV_vXcQEa1F&-FouxBpj1mU5+yT^FT zpUIDNoHavj5Y)e*gMT3l zdr-ZJ%)^HnO(weLlzljK%_(bdvIlHI;Y~aRzn)RNj6g5t`e87VY4@qhhu3@t`iwEn zAPm+aNQdZmgM~SA_W9jwQ%2nb{@K^)_fH)kDm7YXknbL_7SGl|!sap$>DPCwQL^b- z%16QZW#fB&zCL)UGJIJj2%RYE4}ZSP4$HRDe+z-X?B!i<5H>ES=^-#X*Ok3gw&}&S z@}ppOlB;gH#Fk*hMa~}j?gI;&lA{2atD{{#h&}+Mvq&b>xVWgJNt-1>uC>1o$Mm04 zZU=uhaWXpx9Xr8ow4DUr&-P{NE?+W3{Hm6FP=4*}l_;CUxl4f?)J$NqSzajOhcx{I9k zKwlL$ggRDdKK6Dn{$_}Jn({HA3|a&}2SH-B2OWzSD{=IkuF1(pk8Kfh7PuOizu9MP urFvo@F_0KY3?v2;1Brpez#0FXf&T!n6hLUGFvBkZ0000Ne|#Gs1e=y|3q-JNKUX!(lJy+;h&H-~OLxW}Z10f`WpAf`Wo#kdUfFNY&v} zo0>gi)B}tFD}8BD&Lj8S0330EZnj1bc+oD8+_MIl08DhBgM&u7rx`d5%yPT_0$Q!n z!@)t3mXCr1aDNl9EQHwA$vI!$A;hBaS^)eu&f&YP(R;J*pq>K9x-;z{A=OlukSC4v zm2YxJqCI%stPH~^D@Rhe{8UHQHv)K}$=318_U=Xcj}PoCMsH zsSp!VwE_FfIAsKwYmGjT6$f=!@Q>`ugoA`sQ-EVYOMjWCo^f6NV52+e*$UtQOrZvK zB9XFtstuK{h7BkVJ_2+CKQvWgSWqLDA(G)nW#>@ zs6pU-1gx+|pO3W{6H@g8>+2ZI2+(Vde!bKan##I*f8WkrYx_Z$)SBuH&Jgg7HTr|Z z$3a4>`+={4sdWP9A7Gg^`sXwUigSSP+*rwH9e;E^)gP(O#jMf41B-!QJchFixTjJ$ zRZmvk3kDMS%0oC`01sKCPgZl0suS%!^K8g@05}0`F4VYkK)@_{P@|D+kaJumPBt2j|Ls zZmV?rWEHTug6 z@9`Ay4$&g!c)I8&uIGIVvBd@8Tms$z+A4+P9JR#_MBj4P97_{`4j*&Sc(HGYet(p* z)*Ag^wKuUw4_c#N1r`E7C7p+w6U;xyfmf{2o0Aw3TBG*^4+^PP0B>`3^|I5e93-S_ za`~r)sBpdsc+DDpHjUx4dvkUj(d)%m+A=MUpD)DapoI?3PNG$XeQC}wtkGwHmxNRw z1MfQr%?I}Ql7sF5R$8MUNE=Qbs3<+aeZX_TY=VMZbN N002ovPDHLkV1f~qG#CH? diff --git a/app/src/main/res/drawable/ic_star_grey_48dp.png b/app/src/main/res/drawable/ic_star_grey_48dp.png index 991abe138bfc50b5b1d21f57b61af418899a8a9c..37e4733cb241c6c03c1b86a8c1c2cb126bb7be0c 100644 GIT binary patch delta 1420 zcmV;71#|k037rd&BYy>CNkll6b2 z*c1H8Y_rcieSeKKcOiqavZo(>>si!l29Z5eQ9=ju!F@%Xau@YkWYMoqdt=qMGw4Pl z^@$@9rhprC(U!HAL1d3UoUg!0LGT)L5?QpjU|cQTZD!CiA{q&Z>UhRn5-_foA#Dm& z<^aw+$ZHX%@3fUI#`c;IflYl90j2KG=CRE-2aGix(tlP4mB}6jtPgUPY2<;<8qXlI z=P^C$~wvjCwSs((|Go0yQMgflO^;g+eO!b=1q8}aTDWuz``gR1}Ls{Cq z0wKV~cz>G%d;%OnpLc#~CiPCx&xBuqPr$Dca6=XaWr5G+>`8F6Z@>_>>w}!u!#s!g z57f2wGc7j*$f9GJ^%_{1IeYjUHxj~9vgaFLD7oKaOx(uACE#tJgCTBzOR?pNqu6o< z(f}Oj2ij7g?e<@>#|cE4qu6pScZ<0**>YpF-GAY>4^dr*^%%n39m=_sKyr#m*HJtH z^bTv7>@Uc!M4a(5q)Q7V=ZJI;#YO){Z!*My{ykC}UC4saEBF&|E9q6}Gm+ec) z>Acxeg=FC&?Q_b4U(mN0eCQj~f%XsJa7I;e#J{pYn#{ubF?j)aQT2}5bMUzkjz7il zihmMF3q#-!imSl=s&~Zhg~v5;i@u?)dkugBEYQtm%nfGD+L=>&y*TvE$$x9F zat3V0;Vt|Mer3S%G6KDv`h#F(pgrVL99|9?7&68*gIKVPKzfLNCs^Q!vyXSLO&N6; z_kwjBI+E@?mgM-uPZ$D2D)7hBvDOq5s~{ zKYZssEYmCA+X(!HAa>3m*0_?U2YXrhzdtXoa))G*uH<_V9;CB;a&qt_hDfPl&=D=K+%RpDTOWjyT8zi;0bbtQn9GU=n zaKDZq^qjbMV}1RD=X$Uj^tnu9{k^e^TV>Fx5Ro|V0d1#^vBb*EXT2SazZIeMKLd{f zWza(KDTp$wL;3_*tbpjbO^Y)aJ!?ylv%&Si{LX%Gt#q9fND3qck^)JAq(D+2Deym6 a;9mgNBZtY|tquSH002ovP6b4+LSTYA&cGi4 delta 1144 zcmV-;1c&>b3ycYnBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_ z000McNliru-~tj2B{p@@t9t+d1Q|(0K~#9!?VDSORaF?re=`n>HAs0&v7(E&5vhb2 zw9&3$WEvu7e+onmd~jx{2zr`_&g_ALA(n~}6n`PUnI@u^BHjW=MMv>o z)5BiEbeMDIoHP5f&e`h^n>p-r_TKCK=KpnBpTsz3jM!JMNyvRo`0TU#h z%d3N4E&&JN7GOm#9b{&Wz#-tC0X}*Nm@Mhvyg6t=8E^pZ2cF4eh*gq+J98CcX4V4i ztKgDeV5+2pd2vuj75~WgTsX+gMgS*(<_a(Eab5n!dVhD&vMS&Jj39$LQDe&P8EmMu z*KLTI*>GS!@Kp>m|1FZPcn!$aa7F`T2RO#Kzs)hX{UUIx;OOq>+$o@2(m$~RGP9?F z`$~NA+wrJmTgEWqYzcseC2i~P!cs;1Zs0RuJhiU|V3a$i7QFYj3;oJN%*^fvegLLZ zpV|w|lYexqs$NXeQJ@X@sSe?62ii)(DXW{8)C0_O;Z`sD)H$ao)?Uoax_~t`45k<8 zlJs_B-MpE-1Z*H$!>T1+1(r#&#K%Eq_9*ZjFtSGAoB;Ps}3un-iRky+5N#I)#;eTudo|1Gr)7iYF%fR!%`yRo07kD9# z32m%%DKlFItOtf<1m*_NF6k3*%N=I+Ebt|8Yszpg081oo^`hJ{0HhhNhZ~m?oRhAn z+8y_e6R9Xl+C{YBmzEAD0VhcZ4Fk>-?G{Tzmw?+OU9SlT0S~7L2ck9n8A;qYDL}I` z=zqax2SD`z$Sv(Wk^!K$T5(WIMzj2}W;Ur70A&$gi9I_2$^g({a={gMc$0@>1!QL9 zslI@=8JOmd%~jrGikXd$^E)+pVDTfsE0Q+#Ik&*fo&(lV-Zs6$Hhk}Eh*bjUD)1IC ztpLu=`P?SwrnSJetnyIY4k|YXYy&z6Du0E#VqBM*eF1z3%uPEFHN=>Int^kaE|whw zUX%1qmCslVd_eSLmtwl+Ca#x#3$d9c;9LjZ0a~hs;~e$18;HK=?%AJ)0Q@{4bP3S<8y@Oq^ynH7NA2RvbBFA^;nj7uU9HF3n0 ze}=gH(@a!2Uk|(~=|URAXSZ{9HPQCsn{62t$Ilnya?nE#&aW<<_NF<%aJw{KHM0%C z$Ie01fjzz?>50HnNspxsrvTI*U=FYxm_$%eP*6}%P*6}%Qu+@7)+2{DZ9!%L0000< KMNUMnLSTY0`xHO` diff --git a/app/src/main/res/drawable/ratingbar.xml b/app/src/main/res/drawable/ratingbar.xml index 3f204ef..98b8175 100644 --- a/app/src/main/res/drawable/ratingbar.xml +++ b/app/src/main/res/drawable/ratingbar.xml @@ -15,18 +15,25 @@ --> + - - - + android:src="@drawable/ic_star_blue_48dp" + android:tint="@color/colorAccent" /> + + diff --git a/app/src/main/res/layout/activity_main_menu.xml b/app/src/main/res/layout/activity_main_menu.xml index 175c70f..001fb79 100644 --- a/app/src/main/res/layout/activity_main_menu.xml +++ b/app/src/main/res/layout/activity_main_menu.xml @@ -124,7 +124,6 @@ android:layout_gravity="center_horizontal" android:layout_weight="3" android:onClick="onClick" - android:capitalize="none" android:clickable="false" android:elevation="10dp" android:background="@drawable/standalone_button"/> diff --git a/app/src/main/res/layout/welcome_dialog.xml b/app/src/main/res/layout/welcome_dialog.xml index a4e6330..f445fac 100644 --- a/app/src/main/res/layout/welcome_dialog.xml +++ b/app/src/main/res/layout/welcome_dialog.xml @@ -1,12 +1,74 @@ + android:layout_height="match_parent" + android:weightSum="3"> - + android:text="@string/welcome" /> + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5b4bd09..d2d3824 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -87,7 +87,11 @@ Reset - Welcome to Privacy Friendly Sudoku. + Welcome to Privacy Friendly Sudoku. + Swipe or press the arrow buttons on the left nd right to change the game filed mode + Field mode: + Press or swipe the stars to change the difficulty + Difficulty: Are you sure you want to delete this save?