From eb382e72cbd4da05897f20973dba066036878e9c Mon Sep 17 00:00:00 2001 From: Jannik Date: Sat, 3 Sep 2016 13:49:10 +0200 Subject: [PATCH] First Bug Session Resolved Bugs 1-19, 21-24, 28, 29 und 31 from the buglist. See in Excelfile --- app/src/BugReport/Feedback Pausentool.ods | Bin 0 -> 8645 bytes .../BreakActivity.java | 4 + .../BreakReminder.java | 20 +++- .../DynamicListPreference.java | 1 + .../HelpActivity.java | 110 +++++++++++------- .../ProfileActivity.java | 1 + .../SeekBarPreference.java | 1 + app/src/main/res/drawable/ic_about.png | Bin 0 -> 376 bytes app/src/main/res/drawable/ic_help.png | Bin 0 -> 987 bytes .../res/drawable/tutorial_play_button2.png | Bin 0 -> 2756 bytes app/src/main/res/layout/activity_break.xml | 4 +- .../res/layout/activity_break_decider.xml | 13 +-- .../layout/activity_break_no_exercises.xml | 1 + app/src/main/res/layout/app_widget2x1.xml | 3 +- app/src/main/res/layout/app_widget2x2.xml | 3 +- app/src/main/res/layout/app_widget3x3.xml | 3 +- app/src/main/res/layout/app_widget4x4.xml | 3 +- app/src/main/res/layout/first_dialog.xml | 66 +++++------ app/src/main/res/layout/help2.xml | 54 +++++++-- app/src/main/res/layout/help_overview.xml | 13 +++ app/src/main/res/layout/new_profile.xml | 11 +- .../menu/activity_break_reminder_drawer.xml | 21 ++-- app/src/main/res/values-de/strings.xml | 29 +++-- app/src/main/res/values-fr/strings.xml | 29 +++-- app/src/main/res/values/strings.xml | 30 +++-- app/src/main/res/xml/pref_general.xml | 6 +- app/src/main/res/xml/pref_notification.xml | 2 +- 27 files changed, 278 insertions(+), 150 deletions(-) create mode 100644 app/src/BugReport/Feedback Pausentool.ods create mode 100644 app/src/main/res/drawable/ic_about.png create mode 100644 app/src/main/res/drawable/ic_help.png create mode 100644 app/src/main/res/drawable/tutorial_play_button2.png create mode 100644 app/src/main/res/layout/help_overview.xml diff --git a/app/src/BugReport/Feedback Pausentool.ods b/app/src/BugReport/Feedback Pausentool.ods new file mode 100644 index 0000000000000000000000000000000000000000..2d72fb4e8b53262a345a3997e529a44968a07236 GIT binary patch literal 8645 zcmZ{K1yCJJx9%pmy9IZ50vmVF#@%h>!QI_mgB&zya1U%O1l>q*cY?cH;O6}Ay*hQz zeYdB&x_f%QHB-G-uc_+qQ&ob6LjnAsLIsF$5Qt^}Gx)nA{i&a9KY`tSoWW+!&JMN~ zX7095jvStjmh4VuZnkdhPR?LQOD7ADPhdxPb~k5Nu$iTs4H)dM`o|_70O3Ctr~rG@ zdXF>k0DvAT0Py#l+}wQ}z;5i`pB!fOKu$Y+SY3n%L0HY5ePfBTTBI4!xc=S#yw#L0MAhIJ=G3?18}b)3j*Ai^JGKSBdu>~^5883L z^T=|YMT4$vg{!q{$=iE-Pf z9{g+i{$m{P^2>Bj16dyT!8+amP~Q0?G}oT2g(UJWYC@X~auc)-r)K)2-^z@@GW_iH zp?%|FyDl~+smJ^&7(OP&D~_dl2*Z08cL)?u!=EFWp3s>+CR z0w*_J2^@paUXKeAX85|RtT`LzEkCHn&rqDd|IFyMZZPRH`)Yu-DBmd{j(fLfYR#Xg z6(Q&cUsoUAo~`e7Z2aIigJOU2N&oz<6C&!~dN!^!==Vi8b&d_Pjxa>|wX69fhR|8Z zY52+_P9p230=qJvG6fScGa5`EGnJ%KA7-@n!|$lLga@RAI>O@OLO(KnN~h`4ps)J4 zp2V9m`8QwM{g-F1q{XwwX|@2pB4h$Wgj3371ai@PIe>n$ELtG4<%_3FpP~jC5aTG( zuI7|Ha?RREv`vMBVBdTn8m7i`Z{J(tR~kSCvi9PTK3uZ@(oEau!zj`zgj!1Xf|V?i zc+8D%yYr}_xGh~GHdP7m-Q z&m1u(+O2%sPCpRK1y5z`-d*X)fL`mqG5em49~jR1`>+~6EXNy1PfpqIHd*#k5*X+C zVrQcB4r_=N&^^gLRBtrQSs#P;tuw*H-KXX9_9%+dsOBF_Hw$@@Dl6T45N5F{Tsm`% zYqizdbE=CEM}4U2{JYk3op9~^&XYz8JfBP=IFHebwn^azem4nEMtPH`79ejgG06sm ztlIvyBS0LAwEh0f_EB^PPfJsHs3D!reR9?a507+KhaG9S*%t$ji%EJ4pwqGx#{~OJ#W_6-J~T8|(D7D#(HT9{>M=Lw$?a092ox01!ku$u zS86bF3HV|TXGWTxVa_m+kWI@&3ZT&mP#nNHiiFUwlxR69Q<_>G&VTAT};k|{E6M2JTl zW#WuVZbzaj$(M04McP4vngsOyP?%c4)JSES`vq&_JCfbpOgaGo)IU#HI61oi{jd0w`%jG4T;D4+c8g)}lQDmeURy#6 zfjbzQ*7uaBu|K(u9~!!f-#IaoBK#>eGk%j)@6naifbF+qeKEIsY5ok>^3W)>D-3a@ zA$AJ)41TSw9UXh(zJ{KZPl{m}dP2i~UUpq8c6q9rt=d1g?s!bH^mO;sidNQhHVUt} z1|${eh+fuTy)3=GPHObbxGcYn-K|^(`>C~@`eDBoZ21~{6X>xK$_<5h?HLr|=KIVC z?;PJ{i|rb_PG@^wWVg4yNE-Vs&CJO+U(>vD>EAgBYWH{%1?UIvZkzsg5UQ7ju4g9> z@E(_Yy?|9-i8|&Ilk_OiYKHqPkFy>R1dZPy({aUHORujsyj2M~AH)vM7F1MJ?g#4d zTU0%TL>!3_Yk{MV=WbauRgurP`T=4B^Kpo5h9QG$TfZr(umuw9!!SV}ROz}z>kKaw@jKOA;n;r9 zo;zVMAI^S0i=|`Us~z$Em|rZ2W*Qngyj9e}@Fi5czec}yCIb6oISa97Z`7(H+p15g z#W$(~VXVFWBZT?-a+8jof)ubqEi&$VQ{RizUX+eR9S`#xpw2PPESDUO91`Lq%zKSPf%Z-Tq2U+uvv&b-Wa8X%M+E zHK%L?c`3Krg6KOz7^j4VkZ2>{xKcYFgM&l9ng9h)x8fw|y9B{iaa)zPJ_nFyI6xC> zci$O8;m5ZMyAUOIwRVg9WWv2$*F014Slne2y6td~AFoM?BnS*a_EAd#Aa{haP= zHXMYX%iXnmFCmkUxT3xPuF?OkFMS!Gy7^t*o|^$&Bmrnb=WRc)~mMr+l=$6x{X zv(3c?5~=o@9NUsQTzl{K5jej^qL1F6U9X-SG30bJ7dnt;Yn5 z8z}*qokNVp?4tS5K{p2}d?w*2+PLG=Ie5vnJt3jSl_agJw_VIyMrKs&6)ZA3*nh>y zwR7Kc(rGWy28E^-fMxvo$-U)eSymJv$g%cY&}?^emQC%R{SJJb2?-;>YjhqKy!uPC zc}%<89e)exRTRHitL*8+7awno9r zQ$m?*I8O#$PV1Y^taU5#BaNayaC}-M*0#?uqhKR%wwyvbaSgJDQqd6KIYg)x0hL9*Kx^MRUKHb9ss8tu?hQN{|r7vrogN7Tytq>y`(J1fo6WBuGQKKah45RHc}Z-TJ?iD$EBJ$jDmnwtKFi zoNyLdRCZ1|!JM13N@N865SKDXBd@CYyRr;44DQl-xR|Lu(n(OZeJId=6*~2eplHPj;>0r$Y?4n zU8Elgy8>}>Iy)E+m$CoGRVP~zsk+CBQg}2%WNn4%f;5Sn#_t9gB-EZUnTeT0M1=>I zP2mXnJ)Cf#MXKD-A-*8`D5P4jYclv$wPLa}w0+(7x`b9^fJK~t$6Uq`vSJM&?NZH1 zi5dPfzunnOAsU$7F{?@~PgBWgX_dCgv`86BSu%u}&+Ld!Tan@(Hv1`kd^&2IA$Z7f z%UyN2Gb-}R^X;u)>*r}TuQNChX({(V#f;W+fCV1 z&2LG*Cu)w7B6Wy{i1#aCep{qxpsVK>NiAONVT7ojj5rgPU5Bn)MqCZk={UOlb6QNZ zNxLH(ZLvycNHZ z!iV#fl*y&@7V!k99VK=P4%TXb>J{p$Hs4>Zov=2HiKUbz;k|@91S{`h6wM|YqA{sS z3}}Mr7fqIcRxw4^&-OdB6(T9hB|qoSLZ%L{s#-luXssQ*mqU54*dn(Ep^8_CXFk=E z9@dHbLq*S(lGH1|N-p=wf2<&vhztW0Lv*ku&0+7>i8s${Fnv6YY=ojBN}YP=qTaUj zT@XW0?k|4VQ9@bG%qlI7|(7@$)L8_`ifJL7J z|6Oxyqz=QyyNXCMs#qXu07ArJ{9AYpLrbV^1O_6l%K-|Z%Me)*asw`{fr4)h7KZ1y z>I@AeGlZm z{E$&u^Y9zxOR`qrp#k7_~X0UQuri za^h!AI}sC3bW>}TWrZTt_}Eh3sv=rYR7HK0mrJj)pkovdV8IxRi}+I*5}Yyvb+i8C z_!doMB3gxp<644Ub+Iy0(4l*GM|k6rNypSih;9c?RS7z@++TxPCxD^lK$GU;*oO{O zVX1hU=C6@ABYdR(oG2u6=HU-V0nZzNe<=}tu!MDne?OtyHMouth)795q#gbNfcpLe z{*b&2i+{5M+++M&Z$GS+b7-J6F!;U@nZ{e1dea5>vEOVJ6(wL$ZzlKLN+|oU1d6Z- zC+>}9-h#c{?GKiBIw-NkKc-~~@xpO^6QgY2f6;+QrVMVQWTjT9c!!eb@t1b<@6Bt8 z#W8fbk#*fRWt~)D?a#c}Iw!jLGa{`lj^zC(iK2HkG6*JA!DuwuKU$HP0K5RKUeu-~ z8E8_8WK=QJ<>3=Dp%}bRonh>JsG%WFf+6Uic`+4E{^?u>EJ_Wybc_jB( ziW3xOBr)H^10a)|0nYnaNjE-b>gqjKjC!YKC1x&Ks1z8x|VPA1DU22i5DJ=3@T4jk*1hfDRo zEmIV*O=qL(A$3zRU3WA^m)96JKy(E}-Xcvc!`U$CYGb2+2w8oCv;)oBwz*k)DOK7ppy{ejc@_@+FZ}7lhm>K(Tp9_dGWr)#Wnfe;>`HT zcWMPn_XkEcg6j?7u5PVup{zaO+8c!9ug3#eYS! z=+GEX7}^LY4Za3$n@Z4$VSSB};j$^8KK^tmN>rIr81-`SY(!aB&_`56FtmAvT*!bi zmd(tyx#E+@J`Niw@QOy$v*Q34s3+^=(pvw=nX3C`-Kjr>RTRWbk^7QIIqI~YE^Y_j zjt9T-ZZ^1@?ip|n3bYux{Z;wfr=oSuA2{Z$(uCLrl+)t?Dpab~vDCrqd_aI>P}Mgp zA>tJ_3ve1yxm)x@Nkv3vf(sYEJc7T92?C|yEcE6(vR@Zv(;7Q34sHUJm5&_Sn^_Y$H<@iu2e(dkTb+y;eLMi zy3>EBbJ>Q5>R3|1`1y?lS(<2v!sm*2}p=F;{!Y=s%KFn)2i}Z$hnGy zp9`~;ZGKlyrYNV>@ZwK%s`Oz@Fvm?Jl6dc&>(IXTK*^pJ5Tz5FDD zUDH5_XMKJaPL&zC>asw%{*jITC!Y%Wef(|J}TiRB{V<`t+ z{T2j>QAb)_$DhEO9j*XWuBb2 zBfQVNqe||^62Oh8SwVSCP6V96kGsIosjTDx#>9>cFh^sx&WNZaGvHQWDwgVdGito5 z(`YG4YC2tA+)Ql3)pV?+v5W(|#Fl=;w}wVxz;ORX#N9$b1$ zw~e0@2K2^cee}ji+EcYRA1W+V$!R*V+|#;72)_^2D1792f!Z!@NR^O6fVfz2%8a;( zB`dJ{eBp&TA-n{#n^nCU_*!YVun#o>!(sx62Rg+l3zaf4KVd9YmYjrD$v_9`(|6(a zczF`Geb2?{4uDz={PGza$?bjxNW?mFh|`dlJf^tHb)QxmtB7)z!2TdBuL>WwhNC&l zsdJiBEIL1*A6%S9Rf4%jl`qyIPBo)?v{DrYhGi# zmMlV;UXC;+jpK|($e&?2e!~_{F>&BgQa@&3`&Dkedl%Ccx|R?vf%c6aU*1Bj5Otf| zs~Cj!6HoGGCkQ)E^^BW;no!oAQS%2_aSG!zlh69A%r&&31JmpV-@>Qpw=#$GtEP;8PV07@q=Au#lOc2-VMD$!P zF?^i{v#Rr`&I+OBA&EJuQyqt9iz&K@7Ltn>41}tvcO~nfB?bgbCJ?Y8QxEGxo)IEB zF!dlN5HZK8ab2CBne*()6+fyTqkNK9_SazO3@PalS~Lwzpq2TUw+?S`&l^fOYuGh< zHhq!Z-q=oa-RA}Z)C{my_B7w`L*~QcwAUPPc(bD^2ZTIDva-OZ9qzquSN0n}Eqbo_ zCk@bL$bpy9n^EDS9=<^Z|IBjR@e>8ndhrz}Bi8urEU1pjn699Mf81O_BxfmIi@S;x zGuy~}4sZO0{4`7AlkZSex41geO`Id@>_;l=u6(A~JM^WWQu=dx9{l4Yz9UO}=H{R# zUGs!YcLi6o@Hap|b|Do#ty)l>KPN(k?LDn=q6zjD!pF%ND98<{QfrkQg`mWP=lV6* zo;|5&%+Uy;4m?`J@_DiNn@3ia7MzEEp|i1iThuDDn$MC-_X56?L7EdH@?wPLP6uO_ zcsmtPn`7=J}iirFSBCr zV-d(|hp}r$9QvL4k0G8|u$S5KK}+nq%Mb#bnI)PeOV$B-e%qWH{E4bAd|TL*p(Q!NzVzSUn<&J=eEt%;Y-*^wuY@-AZ1Ha2|DU1ZJ7t17nbDNVsOLADR5a!=tx!K0SVW3{oBO2=eoAElW_=jsAoC!uHnAll>%wd8 zi_YwL=fYzXsS(m@?h~nB$c8rHo(_`IGiL2=ftr7R9)uThnS{;ZEH9e+fM;L;dUDD$uOEV@? zd+DR({49qVh22aoWFWzyGiLEU!j#sDMRIDPaUD4)@YV`chFbg_@U5#rz-nlk{Xe2>h`i%B5lkC+>KL@%aAyos+-k?YrvA48liP% zB>51&LL2n`YaR%+J8SjH7P_@dX5~P$oJvlhG%_Qx=cLS%Oe*xr1On*mQ*X6!v(vy~IKPyoXWNIkn8^a3|f*c7fqx!|I;peZIgult5g?+obcoEOnj7kxQsgdy(kE z*0?#Ro(ddc%hS)XiYpS#Q?GhL6{K?*qU?mgpL=rj-5?)hx5%E2L9lMq0Iam={pI9(Zhk+H z_ByG<_ZjL69b7B zL0IX1c|Io%XL?UHz5PwX{?D`es8P(z#XmE6?*IV&KP^Z`Q-V!FS(f9InWL>0*zG^3 z_SMM}cCcJ%GWQYdecoc8O)T{JC%&O~fba9X2nKvKpy5?fWwTUIHTfbT1%mScpCDjX zwKCAHYWH>mViSR9_wnZNcIbKKq6!~XHQW%n%Q)rM%s+6Mu#lH3ZUtpd;YZv2F_>N_ z1Xn0D^n|v3IoTXtNdo8IZNq47hfJt6Udkj_r-gX6c~_V>xnx0mV+h_NRAPSqTEboc zJ~=Q^M2*)3X3VQ@i;qTHlsdLGi9~Nc-of|CWH!{gVPRiPT#D{c?v_GXfL5)_w|ShwunDF&ZrF(e#+R|s2MDPD8@_z6d-$MA?-pENn{FCxYXrK;jsy0`V6heh3#cFt!Ba3}g?7r3u_ws8mw_tbQ z&pY>=Znd}T*nb=W^N#I5GJ!vy0sK!v!ryoQDgRHNpsMsY>VKCU{DaW^)BQ()@Ne9| z`Ko_#DhU6Lz4|xs-<#(j;4|6(vX%aA;@?5{j|l{dKSGTE8-l7z@PEDp0D%8{{`@R>j?k= literal 0 HcmV?d00001 diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java index ac08e8e..023e4d8 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakActivity.java @@ -88,6 +88,10 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList //Keep screen on while on break getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + + View view = (View) findViewById(R.id.textViewBreak); + onClick(view); + } public void onClick(View v) { diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java index 4367ab5..ce1f5f6 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java @@ -1,5 +1,6 @@ package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder; +import android.annotation.TargetApi; import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; @@ -8,11 +9,13 @@ import android.app.NotificationManager; import android.appwidget.AppWidgetManager; import android.content.ComponentName; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Vibrator; @@ -79,6 +82,7 @@ public class BreakReminder extends AppCompatActivity editor.putString("exercise_value", exercises); editor.putString("profiles", allProfiles); editor.putString("current_language", Locale.getDefault().getLanguage()); + editor.putBoolean("notifications_stayOn", true); editor.apply(); WelcomeDialog welcomeDialog = new WelcomeDialog(); @@ -103,7 +107,6 @@ public class BreakReminder extends AppCompatActivity editor.apply(); } - System.out.println("Alle Profile: " + sharedPrefs.getString("profiles", "-1")); // If chosen, set screen to "stay on" @@ -514,7 +517,7 @@ public class BreakReminder extends AppCompatActivity this.startActivity(intent); } - public static class WelcomeDialog extends DialogFragment { + public static class WelcomeDialog extends DialogFragment{ @Override public void onAttach(Activity activity) { @@ -530,9 +533,20 @@ public class BreakReminder extends AppCompatActivity builder.setView(i.inflate(R.layout.first_dialog, null)); builder.setIcon(R.mipmap.ic_launcher); builder.setTitle(getActivity().getString(R.string.app_name_long)); - builder.setPositiveButton("Ok", null); + + builder.setPositiveButton(getActivity().getString(R.string.dialog_positive), null); + builder.setNegativeButton(getActivity().getString(R.string.tutorial_help), new DialogInterface.OnClickListener() { + @TargetApi(Build.VERSION_CODES.M) + @Override + public void onClick(DialogInterface dialog, int which) { + Context context = getContext(); + Intent intent = new Intent(context, HelpActivity.class); + context.startActivity(intent); + } + }); return builder.create(); } + } } diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DynamicListPreference.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DynamicListPreference.java index 3210155..f628e52 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DynamicListPreference.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/DynamicListPreference.java @@ -34,6 +34,7 @@ public class DynamicListPreference extends ListPreference implements DialogInter setEntries(entries()); setEntryValues(entryValues()); setValueIndex(Integer.parseInt(sharedPreferences.getString("current_profile", "1"))); + setPositiveButtonText(mContext.getString(R.string.dialog_positive)); return view; } diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java index 9f9bcc7..96cb85e 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/HelpActivity.java @@ -1,20 +1,79 @@ package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder; +import android.content.Intent; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import android.view.View; +import android.widget.AdapterView; import android.widget.ImageView; +import android.widget.ListView; +import android.widget.TextView; public class HelpActivity extends AppCompatActivity { + boolean isInNextView = false; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.help); + setContentView(R.layout.help_overview); setupActionBar(); + final ListView lv = (ListView) findViewById(R.id.listView2); + + lv.setOnItemClickListener(new AdapterView.OnItemClickListener() { + public void onItemClick(AdapterView myAdapter, View myView, int myItemInt, long mylng) { + String selectedFromList =(String) (lv.getItemAtPosition(myItemInt)); + isInNextView = true; + + setContentView(R.layout.help2); + TextView title = (TextView) findViewById(R.id.titleText); + TextView description = (TextView) findViewById(R.id.descriptionText); + ImageView img = (ImageView) findViewById(R.id.img); + + switch (myItemInt){ + case 0: + img.setImageResource(R.drawable.help_start_screen); + title.setText(R.string.help_start_screen_title); + description.setText(R.string.help_start_screen); + break; + case 1: + img.setImageResource(R.drawable.help_settings_screen); + title.setText(R.string.help_settings_screen_title); + description.setText(R.string.help_settings_screen); + break; + case 2: + img.setImageResource(R.drawable.help_create_profile_screen); + title.setText(R.string.help_settings_screen_title); + description.setText(R.string.help_settings_screen1); + break; + case 3: + img.setImageResource(R.drawable.help_notification_screen); + title.setText(R.string.help_settings_screen_title); + description.setText(R.string.help_settings_screen2); + break; + case 4: + img.setImageResource(R.drawable.help_create_profile_screen); + title.setText(R.string.help_create_profile_screen_title); + description.setText(R.string.help_create_profile_screen); + break; + case 5: + img.setImageResource(R.drawable.help_break_screen); + title.setText(R.string.help_break_screen_title); + description.setText(R.string.help_break_screen); + break; + case 6: + title.setText(R.string.disclaimer); + img.setImageResource(R.drawable.ic_help); + description.setText(R.string.disclaimer); + break; + default: + + } + } + }); } private void setupActionBar() { @@ -28,53 +87,22 @@ public class HelpActivity extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { // Respond to the action bar's Up/Home button case android.R.id.home: + if(isInNextView){ + isInNextView = false; + finish(); + Intent intent = new Intent(this, HelpActivity.class); + startActivity(intent); + return true; + } + finish(); return true; } return super.onOptionsItemSelected(item); } - public void clickHandler(View v){ - switch (v.getId()){ - case R.id.imageView: - setContentView(R.layout.help2); - ImageView img = (ImageView) findViewById(R.id.img_back); - img.setImageResource(R.drawable.help_start_screen); - break; - case R.id.imageView1: - setContentView(R.layout.help2); - img = (ImageView) findViewById(R.id.img_back); - img.setImageResource(R.drawable.help_settings_screen); - break; - case R.id.imageView2: - setContentView(R.layout.help2); - img = (ImageView) findViewById(R.id.img_back); - img.setImageResource(R.drawable.help_create_profile_screen); - break; - case R.id.imageView3: - setContentView(R.layout.help2); - img = (ImageView) findViewById(R.id.img_back); - img.setImageResource(R.drawable.help_break_screen); - break; - case R.id.imageView4: - setContentView(R.layout.help2); - img = (ImageView) findViewById(R.id.img_back); - img.setImageResource(R.drawable.help_general_screen); - break; - case R.id.imageView5: - setContentView(R.layout.help2); - img = (ImageView) findViewById(R.id.img_back); - img.setImageResource(R.drawable.help_notification_screen); - break; - case R.id.img_back: - setContentView(R.layout.help); - break; - default: - - } - } - } diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ProfileActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ProfileActivity.java index 383e37b..5e34cbe 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ProfileActivity.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ProfileActivity.java @@ -113,6 +113,7 @@ public class ProfileActivity extends AppCompatActivity implements View.OnClickLi editor.putString("profiles", sharedPrefs.getString("profiles", "") + name + "," + interval_seekbar.getProgress() + "," + break_seekbar.getProgress() + "," + cont + "," + sharedPrefs.getString("exercise_value", "-1") + ";"); editor.apply(); finish(); + Toast.makeText(this, R.string.new_profile_success, Toast.LENGTH_LONG).show(); break; } case R.id.button_profile_cancel: diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java index f45acc0..3d9c778 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java @@ -150,6 +150,7 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee super.showDialog(state); Button positiveButton = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_POSITIVE); + positiveButton.setText(mContext.getString(R.string.dialog_positive)); positiveButton.setOnClickListener(this); } diff --git a/app/src/main/res/drawable/ic_about.png b/app/src/main/res/drawable/ic_about.png new file mode 100644 index 0000000000000000000000000000000000000000..95660456dafd9de215eb1feeeac432aa1b82304c GIT binary patch literal 376 zcmV-;0f+vHP)gDrZfBF(e@Mjo-n@CcZboFj zMw#WZinZ~*3-$V)6oU{PkP z6L42p{SULWleq9*bpl>a^;4fztvn`RfUKAUp&5vkrDP76fFfV!KxhVH9Z<;}$X+3`v_1C-z7jje4BtQ;F|=5QhJY01+SpM1Tko0U|&IhyW2F0z`la5CI}U1k`u+W~;Zi-%P)mxl&toU3GP} zweR)(fA`-#J+mh|ayvP4{5mJ_zcV;91J@7h+r9-96h&;G(3bk{)-hdic^yNzWzy-s-Q1z+FkNB|&1Q0sf(+ z_gkE9CGesV^$!aGY7Yz1S09&NXQ0h zvAIFC?8bmXBAH&#J6~KDR;9E?fJhL1Yb^e(p&5#?_6*Uyod^Oxd|{J?gUqiH@D7j; zq-x!U$bU=}1wP1RO@_#q@2!-=0Im@r`T#CQPo}Nai~_V96ayPg05HBdnSY|TZ2i+- z*?WpXh%D?`L?F`Or9`j)>wMdK@jgQ^?tO^=s`xzpDk9*SGaeAhmU#l+ckBDezt1Wo z2F+z>5dr^FMm{Zaz9~>snPIRQ%!mLj%pOMQ8nnO>L+^|u#j;uTje&NIG^-h?X}O04 z!Js?Yh*x)4vq)5rdqIyf(4*BgViEXk^o!3bp0gwnjUvoZ$YRU%I!qulK13PtqsY&t zwzh!pk`RSrC&Jz$_RXNDoB1LpgL}6fnKpXRdy|#yQ=i!kz3Z+v+I%TVV8&xz8(Hrt zF$1vm(LGAwgjwaX@z$f?(RS>WKohV7<|(}FI9)vzt%QDrK-7Xajnlmc8p~ybKy;u9 zo4{EdDN{RWrC_EUDe)hjiZZ9EkzywE>>qY+s-6aWu2tCR7{+GbOaPuM9Dgm}eXUX= z8Qo4~59irzL_;6%4qt2)0Gx-pD)C0KvB;MB#`k(|{i2(U%(*%J8yT7;6A=l()3X_q zvqbQRFMvlUvlRH+KCqVhNKW=ywth};)Ct9Buh+REDc9?@Gj>xpcEMH=M?_d0Nk!M< zS*fH-3Hd+7x002ov JPDHLkV1mcv$DIHG literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/tutorial_play_button2.png b/app/src/main/res/drawable/tutorial_play_button2.png new file mode 100644 index 0000000000000000000000000000000000000000..ca2ed8e7163ccf3a5aed0bff66d284a1adb595f1 GIT binary patch literal 2756 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 KMNUMnLSTZ&FG~sl literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_break.xml b/app/src/main/res/layout/activity_break.xml index 4d24fb7..7942fa6 100644 --- a/app/src/main/res/layout/activity_break.xml +++ b/app/src/main/res/layout/activity_break.xml @@ -18,11 +18,10 @@ + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" />