From e82d8d81ab2c3bec1e2073fdb6ec4536a38710ea Mon Sep 17 00:00:00 2001 From: Jannik Date: Sun, 4 Sep 2016 10:51:22 +0200 Subject: [PATCH] Bug Fix #3 - Only Potrait Mode - Pop-up in break activity while on break - new Summary in the settings - New title for the diclaimer in the help activity - new strings - updated xml report --- app/src/BugReport/Feedback Pausentool.ods | Bin 8642 -> 8979 bytes app/src/main/AndroidManifest.xml | 24 +++++-- .../BreakActivity.java | 64 ++++++++++++------ .../BreakReminder.java | 8 +++ .../HelpActivity.java | 2 +- app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + app/src/main/res/xml/pref_general.xml | 1 + 9 files changed, 77 insertions(+), 28 deletions(-) diff --git a/app/src/BugReport/Feedback Pausentool.ods b/app/src/BugReport/Feedback Pausentool.ods index 1ad96aa1d9b2c11bb151f902b05fe4df70db6d87..addc617ad137502dedcb38a014b62d1dadc52fca 100644 GIT binary patch delta 6600 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 G0000{i;Kem delta 6260 zcmV-)7>nnVM#4j|T?T*2tQJ>$7XSbvt^fcF0001EZ*FvDZgehqZEWma%WfM5ODv#wVV|tfl2FWbugOv}_)~Xl%83Xjjm{0JkcKnn1 zk~udbG8v>INv6n5)3)4zy2yM*M4q^D?!D&*pPs(=Tz1RD$O(V^XSHTyug19F4Q$8n zKdb%n_Okw@#-iBrZOaXO{;c+aN43-E|M?$JgI>?+@)JAgCLZ_WdN=T6{6E9}{OBaM zIxfymLjNSNA}2cWEsx{t?nyA>etOY~cJhgMw){fgd)3QTOSJ1_{ytvyYC2bcb`*bD zz2)L${c1b3#;bomna;&9>zDU}RWE)Yx%FOvQTIkx>|n6<+q`!jfB396h~v@8?(TRz zZj9TFAnflpkB^Uc#nGC2QFb>wZ%CewG^VHG6_xYU^nFZwQ6GgcL1FChNIes%pts@HE!XM8 z2xh~THY(&JZeTe5ubJl<6-qfYc$Yr-3w00vZVKf2@Nqk_|~(+zT?+j-h+wS z>w0vbUD>wEx>Mc~WCi@_U+^nC*NgN89vHrUtFR>=*7r8T{dk zo&A5SF7C(M^zJL4kE@PS6Ar4JyW3#4rc;EdUB~JU`(cpyHXIi>fT#4`w(oZv9b4?y zN6sCB)y>ujp;(O+)7L4_H6P3vtvrn3{j4Fj=2rQN+Psy6x&ixEe1^6%in3i${bqka z+4|Dlv~R*z1bJ^Ia1+l*5>$->}&k%*dc+Lvp8{GscPJu56Dx=vvXdF%{ToQ4S*7K0Tr%Thb;xIvWnwao? z1GX{+4)YAu1Df4BZ0uLo>>PvjfMz#g*eh#xjsbf>vk$9-NRBysK%<)n%SV4&s!!Gj zc8+y>K&y|AD?>Sp7L8zu>}bGw{QRkWG-OBJ#Dz91 z@aqwe>4_0b55cfS+>g+XTQq+`HclRkxD|E>^)A}TAxNuxNd&3UXyksV$3cBO2#Cx< zvNd}ZS<12F+FdKOqg2MEo<_$)-bY))I)9IbMx+RxKWp00o`WoxYjwDrodcsPTPOai z`^tpV4fPpsPPLw7Wa{OE#I1_= z6sAvIB}{-qC^45ggkokHPVDm5y>~%prs7k}O?W;2Fv47p;t(@EZR6bNA<5?ZV({ip zK>MP4b~GDUy|HM+9<_g#M9rh;=Se?$x~o3mKgh|G(rhtv(q44~NFcdg7sths`6-mw z;rrm5o;lYm4HMb4n{D~NarBnH?DoMEx^Sj<7^$>#vQv4lmSn*5!?OH^&9?hM8*q%H z(;ciZ=F_n*`nbdC<1RV3DPzaJEA@#p9gMmI^s$rp{ZgN)_40oz@JNeph3qCyZ2TAd z-g9Dh&imoy58p;hb{I&J8!;baA2Wx9i*$tpVec;M@Ilbw{$GkUSAt^pMISv7phpPT zn(ik|?Za@}-T-c&Oo4Rfx_u0p;};twgJtWvfraS0egqMBbN`R04QQ_Y;8~M8`{E!P z%537?+R(O&4XX}$<1(L*$#>lMS&b^F96v}R_d|`q*XMuZ$;SbJ>O}Dl(28@w^CMs{ zWN#f0e{TaI({(X#IjkOi18p}v0@q4YEzm7$zWE3kM0&%gmX3A|)R&yzTYrwQnW^bycyFE8rK zFoT$mocDiRSnIIQg}sd%u+nkNSrjlpzc={<_Ln9I=0@ajEcg!H;VkL7lTQ(>b86nR zdqr?wtDOg@>>XMbQwRLh(_%wzvVGs4z0Q2$TqN%o8`d@K^&5^@P5mu*To%Gm`+NYp z2?W9bOEiN)x(+>!Pk}35xI+pw$Rb{#le5$tQVhO*fBKEjq@n}y+WVS89?SPR1TXzE=l^H&Ro zHQ;}V)qWmYAhT3A?t|lUztnbUtVXy+?E5$1%a{uT*5e@34+;U~hOwH5?I+M2nIO1n z$KLde^}L@fikb_Vqf%cLYC1BHTwzA1aINorY@L#>h&J6HjVY>1wVg{L8Q%NEsMqHV(m#~SbM{r0rz_W!d-%{ zy^6UPAzm|r^T7QR)@-oXVbBAy1FsYAHx}4dL;2eomxBi~jXs{R8~86+eVuR^(~8Om z!0#A*UpVGBaWEPsgRs;-&YQks50mfw>$G$^u~%)tj*AUe!NpOxbiYs-#sDxIJ4k=P z?HxEi;y1vda%KUgTZrzEDN>FvXMLv=Z$BZc7)hH*;%IT1YwOnO%ar^Dw&>yO&s<|@ zhALT2##TdSbFWlrYJGl%;3EuI8cm@!7t1e}R`?h;JL?2VTxwIaPCq!JT`}q^T0LPu zmcpdm?1=`G$^T#jC`G|o?G+Z%kT!o73Vhl%Ebj5JYT8u{l&0yn?UA&C%Z>K31bZ$v zK!%5zZP)VbNwehii7@(7<{&y+zu*zJZvvO2Xu5D8Uc9#`70i(GYp^rqhh=tzgSpEo%QTB|?U&4LC4f~9pV|!wN;hUN-t(}Fr~qI_+qw!bjgh~m8{RSOC|RpBq45A^v3U}6 z$VSowBm-e_0_~i1^*VeASzRo$@IMAYAC%-LB<5*%Q^=SElM*KujF}tOxkbV(&FyS@=0{8#>NRWMZ(72 zlDp@#w-iYY(`-7_MPhGra_xS}a+Kr@)m|h1&p|=u&dKELi9LTlxnEm*AXhYqUmJ`| zSh<&HmYOA}mNf9)Shu{ca+ws(r{y^05TtV^q5wPW2g^rM7ChV_<* zoq(b}Bp=(MhzS0-5}bH$ky zexfho*AxVM6eq9C&b_c3a8}}g5;sv0RcLxl0=l7)R8vg?N{J|LxoyepxO8G z77@uitbzL%71ex;U#S7ie4q`tSAopzX-Lf9C4EjxbKspgWyPwu}nR>_$zjTF4LZ2Dy;6$l~&Ef{7bqS6$Qm;6)90e{yY*&zc~YoVT~g=*czPYst`wqxCzR{^ z6nZgCtE8VJan`L=n9KS!1y?xXAgBeGaYIbv(UpHzn-p~UnoMAMuBBC7u0=ph1YlA| zsTDdJs~Xej%#J9Gpq0NiyE@ch-&8rJSil>Ia)<06NrVjMkVt~a<|V#A`9#!|Oe;l) zx&y@E;le|IOm_5~gMQwjG6Eds(S6dklgN`88PV_h7qCU{i2ce#Rmx76RAzZEQFnoPHbzhaZlDMC098OzYa)`{ zNFsu*LBhaJ?hv-c)GEf~Ojz0)kFDT}rAdF9l$X-Ub|WY@DuxG}+3oU#Qmf>Ik`{J2 zhqQt)d`=Z=q1RFH4p}w-Hk~F2qY3{vtR*KLb%PH*t!8M1CiIszeqeJP5F)V#1Kx1l=zVH zQyvrfc@gMPl0s1pUl7?QW4LIGrY(&Kn7Xkh;+AKMTGeHW7J2a=eiRlz8)~SD+eSBD zvyIDT0kMv9CK`|C6+jx zMj=_wE)!qMiw0K3&X4rg@K}bQ4ky~EYU|P#eW|)3qkCk4)1o*BKsha?h2udB4ETxD zN2I(Q*4WNTR_Qoymz=HAYR=yg4nxl zE2%6Wf&CC=b|lZ2+bXH(6#H{O{wulsGeZhzEy4}S+1f!owPU$<_F%EKf*VjNsi+Cq z!18@;v^b^}@^g4Sf<|d!0LU9w*zaQa3#dpwB=eJh7sQugq!t+# zEej|X_y7Cn|04K+RGbi%l1q;a0_{c(i)>*9A;~-ymcaC2lOw@==_F;b@jYB891$Ip z64TQ^QPxaNtG)iayGMJt|=oM27+kKPc&28b0~^DHMc@CC&`7{LlfUIJ$Jk9)XF>f z<_zD`nKL)C*(SZ&!0K;1JDOvWke1I@^cVhsRAaQAX|w{eAHJ3EcE7+)5TzNO1m63& zPp@l`z$}IO?CPz#E?BK%uGhRTs?xuyrsTeuI1TM?X&N( z3nNq+Z}=z>NSC|TocePR}-Ms8Kl_?;xeFz2o{i3 zisXD30Wznw-R3ktilYc|g3K0VuSKCSw(4fmC!!PGsx z;Z@oAhKPH`Q)pe5E(a~Q(RoX!*$|uFz#@*E``B{K&AMZ?l;+L#C-YgdQB)@g|1~?h zf=BaTs7WL3*yn$9XXd(A_R8?+yR5Js{)}^mppHuaui)~EiJH6j|DpibqwnHj_t*l# zC9|b8m=ZH{SuWCQS0~cCqMd&bjf7kS6$J=5N|BY=y+f+CKwA-vr3x(6tz_ask(V!6 zrfwLaMYz;_xxZP(X26mqu$;BXXy8oi=bHFgE>>!nELMNgr1&X*)FvR1(u?d5Duz`> zRD~GXQDmE9;_3cG4fZo74rog%+KiqKU55Bs#4J|+1psU1sJA)yWtetm!<3^(nhC0u zD@f9UDk-osK~crX(li~{@aRMVNhC1@Sre(Dq-rzu+`c9pt!bc^tBl&^s*JRl%qvWK zc;o3?BIkenE`iUD)r^wU96ywVJ++ZFC$C*De&nLlCl6X(P;_h$gHuWWhTUmBQB;f! z+dIm(|7JlO5|nG<9&tDyMO@jQ<>-twUePXBW~AZpC-IY2z#AzuWDyXO-pJfyb&`p0 z`D<0>f=TQ8g=&jXIiV?f&RsU81dI0Iyn^siRses(B0j0Tjd?Xov97KP!2KM7koFe# zOV$TzOzl^v6H37k5upx5=AyPj2zhC9c9EkH?7vbB&Nk~V@h2alpOCfgQU%|4U}}lP zNx3nMGW=q=D?|JO7NqD9Qb1HeG9*YvLGY)}ZJoYR+OL{0F8Ag^z z^-F)Wxj2%`^ehaFlqyrBP=&Ar{0R<3fJKCc)MS8{V6Jm-x5i~;*A&bf;A6W`B?z3G## zWO<^iFtjQ%`6w;ncF`LEDMQ^$!_*!7n>H+9!4A+))H!(;3xWY}A#6gaJ}Qd~X= zr?Q8nxwn6GaA>5)3x{Q4yY?w3eE&DZ^>1)ok(UUWc*~9koX68IJAwUS`Uz^?gv5q* zY%mKJ7eD`h0kb?GAOQu}B%|19lVKnu0V1=7AP@mS(=eWg@nppqPw#n}d=62U#5U+s zk*?xttC-9h#fbJ9pqhPf6RNtYtjQ|gR`GJM{e@+8c!R#}@icy;?&lRhlhz@H3dyV% zS9=!#03xoFWg)WY*0%D1^@s600jUA03ZPX0E{320002b$1uA9 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5dd351a..2a1e00d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,12 +5,14 @@ @@ -29,13 +32,20 @@ android:name="android.support.PARENT_ACTIVITY" android:value="orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder.BreakReminder" /> - - - - - - - + + + + + + + sections; private Random random; private boolean exerciseSide = false; + private AlertDialog.Builder builder; + private AlertDialog ad; @Override protected void onCreate(Bundle savedInstanceState) { @@ -86,6 +90,11 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList setRandomExercises(); } + // FIXME erstes erstellen vom Dialog + builder = new AlertDialog.Builder(this); + builder.setMessage("10sec " + getResources().getText(R.string.exercise_break).toString()); + ad = builder.show(); + //Keep screen on while on break getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -148,6 +157,12 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList // Next Exercise currentExercise++; side_repetition.setText(R.string.exercise_break); + + // FIXME Set additional 10 Sek Countdown + builder = new AlertDialog.Builder(v.getContext()); + builder.setMessage("10sec " + getResources().getText(R.string.exercise_break).toString()); + ad = builder.show(); + if (currentExercise > exerciseList.size() - 1) { currentExercise = 0; if (sections.size() == allAvailableExercises.size()) { @@ -266,7 +281,6 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList break_exercise_type = (TextView) findViewById(R.id.break_exercise_type); break_exercise_type.setText(exerciseList.get(currentExercise).getSection()); - //FIXME setExerciseImage(); } @@ -295,7 +309,7 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList } } - //FIXME Change to the correct picture and whether its side or repetition + private void update() { //After 10 seconds first side/repetition, then after 20 seconds break for 10 seconds, afterwards second side/repetition and after 20 seconds break and new exercise breakTime++; @@ -303,9 +317,17 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList case 10: System.out.println("Time for Exercise: Left!"); side_repetition.setText(sideRepetition + " 1"); + + // FIXME cancel dialog + ad.cancel(); + break; case 30: System.out.println("Time for Break between sides!"); + + // FIXME Set additional 10 Sek Countdown + ad.show(); + side_repetition.setText(R.string.exercise_break); //If exercise contains 2 images, set ImageView to the second image if (exerciseSide) { @@ -315,6 +337,10 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList break; case 40: System.out.println("Time for Exercise: Right!"); + + // FIXME kill dialog + ad.cancel(); + side_repetition.setText(sideRepetition + " 2"); break; case 60: @@ -341,6 +367,10 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList } description.setText(exerciseList.get(currentExercise).getDescription()); execution.setText(exerciseList.get(currentExercise).getExecution()); + + // FIXME Set additional 10 Sek Countdown + ad.show(); + side_repetition.setText(R.string.exercise_break); setExerciseImage(); @@ -373,31 +403,25 @@ public class BreakActivity extends AppCompatActivity implements View.OnClickList isRunning = false; ct_text.setText("00:00"); //Trigger the alarm - String ringPref = sharedPrefs.getString("notifications_new_message_ringtone", ""); + //String ringPref = sharedPrefs.getString("notifications_new_message_ringtone", ""); - if (!ringPref.equals("")) { - Ringtone r = RingtoneManager.getRingtone(getApplicationContext(), Uri.parse(ringPref)); - r.play(); - } + //if (!ringPref.equals("")) { + //Ringtone r = RingtoneManager.getRingtone(getApplicationContext(), Uri.parse(ringPref)); + //r.play(); + //} //Vibration - boolean vibrateChecked = sharedPrefs.getBoolean("notifications_new_message_vibrate", false); - if (vibrateChecked) { + //boolean vibrateChecked = sharedPrefs.getBoolean("notifications_new_message_vibrate", false); + //if (vibrateChecked) { // Get instance of Vibrator from current Context - Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); + //Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); - if (v != null) { + //if (v != null) { // Vibrate for 1500 milliseconds - v.vibrate(1500); - } - } + //v.vibrate(1500); + //} + //} - //Cancel the notification - if (timeLeft) { - NotificationManager notificationManager = - (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - notificationManager.cancel(999); - } //Remove lag to keep screen on when the break ends getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); 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 705ce55..b361dbf 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 @@ -254,6 +254,14 @@ public class BreakReminder extends AppCompatActivity }); } + @Override + public void onDestroy(){ + super.onDestroy(); + NotificationManager nManager = ((NotificationManager) getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE)); + nManager.cancelAll(); + } + + @Override public void onResume() { super.onResume(); 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 3201abc..9c87f7d 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 @@ -65,7 +65,7 @@ public class HelpActivity extends AppCompatActivity { description.setText(R.string.help_break_screen); break; case 6: - title.setText(R.string.disclaimer); + title.setText(R.string.disclaimer_title); img.setImageResource(R.drawable.ic_law); description.setText(R.string.disclaimer); break; diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 42b3a9a..4705b0d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -102,4 +102,6 @@ Hilfe öffnen Okay Übungen wurden erfolgreich erstellt! + Haftungsausschluss + Wählen Sie die zu trainierenden Körperbereiche aus \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7f97c5e..052e451 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -102,5 +102,7 @@ Voir l\'aide D\'accord Exercices créé avec succès! + Désistement + Sélectionnez les parties du corps pour l\'entrainement \ 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 369b2a8..cf43754 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -60,6 +60,7 @@ The changes could not be applied because the name for the profile was empty! The changes could not be applied because there is already a profile with the same name! + Choose the body parts, you want to exercise Break @@ -139,6 +140,7 @@ DISCLAIMER PLACEHOLDER + Disclaimer Select profiles diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 95d499b..95de41e 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -48,6 +48,7 @@