From 6cde0722e2ae4a561b239d89584dafb664cecf80 Mon Sep 17 00:00:00 2001 From: Jannik Date: Fri, 26 Aug 2016 09:00:41 +0200 Subject: [PATCH] Widget, clock and settings fixes Widgets shows now from beginning the right time and name Widgets have now a propper preview image Clock works again Settings bugfix with change profile and exercises Small Changes in String.xml Deletion of unused Images --- .../privacyfriendlybreakreminder/AppWidget.java | 15 +++++++++++++-- .../BreakReminder.java | 5 +++-- .../ExerciseListPreference.java | 10 ++++++---- .../drawable-nodpi/example_appwidget_preview.png | Bin 3522 -> 0 bytes app/src/main/res/drawable/arrow_black_left.png | Bin 1088 -> 0 bytes app/src/main/res/drawable/arrow_black_right.png | Bin 1089 -> 0 bytes app/src/main/res/drawable/widget.png | Bin 0 -> 7331 bytes app/src/main/res/values-de/strings.xml | 6 ++++-- app/src/main/res/values/strings.xml | 6 +++++- app/src/main/res/xml/app_widget2x1_info.xml | 2 +- app/src/main/res/xml/app_widget2x2_info.xml | 2 +- app/src/main/res/xml/app_widget3x3_info.xml | 2 +- app/src/main/res/xml/app_widget4x4_info.xml | 2 +- app/src/main/res/xml/pref_general.xml | 2 +- 14 files changed, 36 insertions(+), 16 deletions(-) delete mode 100644 app/src/main/res/drawable-nodpi/example_appwidget_preview.png delete mode 100644 app/src/main/res/drawable/arrow_black_left.png delete mode 100644 app/src/main/res/drawable/arrow_black_right.png create mode 100644 app/src/main/res/drawable/widget.png diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java index 2056412..b42678b 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java @@ -18,6 +18,7 @@ public class AppWidget extends AppWidgetProvider { static String time = ""; static RemoteViews views = null; + //int[] appWidgetIds; static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) { @@ -25,6 +26,13 @@ public class AppWidget extends AppWidgetProvider { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); CharSequence widgetText = prefs.getString("name_text", "Help"); + int workTime = prefs.getInt("work_value", 0); + String clockTime = ""; + + if(workTime<10) + clockTime = "0" + workTime + ":00"; + else + clockTime = workTime + ":00"; // Construct the RemoteViews object if (views == null) @@ -32,7 +40,7 @@ public class AppWidget extends AppWidgetProvider { views.setTextViewText(R.id.appwidget_text, widgetText); if (time.equals("")) - views.setTextViewText(R.id.time, "00:00"); + views.setTextViewText(R.id.time, clockTime); else views.setTextViewText(R.id.time, time); @@ -50,6 +58,8 @@ public class AppWidget extends AppWidgetProvider { @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { // There may be multiple widgets active, so update all of them + //this.appWidgetIds = appWidgetIds; + for (int appWidgetId : appWidgetIds) { updateAppWidget(context, appWidgetManager, appWidgetId); } @@ -101,10 +111,11 @@ public class AppWidget extends AppWidgetProvider { views.setOnClickPendingIntent(R.id.appwidget_text, pendingIntent); views.setOnClickPendingIntent(R.id.time, pendingIntent); - // Obtain appropriate widget and update it. appWidgetManager.updateAppWidget(appWidgetId, views); + updateAppWidget(context,appWidgetManager,appWidgetId); + super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions); } 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 2efe1bb..008d01f 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 @@ -3,7 +3,6 @@ package orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder; import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; -import android.app.FragmentManager; import android.app.Notification; import android.app.NotificationManager; import android.appwidget.AppWidgetManager; @@ -73,6 +72,8 @@ public class BreakReminder extends AppCompatActivity String allProfiles = sharedPrefs.getString("profiles", ""); if (allProfiles.equals("")) { allProfiles = this.getResources().getText(R.string.standard_profile).toString(); + String exercises = this.getResources().getText(R.string.all_exercises).toString(); + editor.putString("exercise_value", exercises); editor.putString("profiles", allProfiles); editor.apply(); @@ -142,7 +143,7 @@ public class BreakReminder extends AppCompatActivity String currentProfile = sharedPrefs.getString("name_text", "") + "," + sharedPrefs.getInt("work_value", -1) + "," + sharedPrefs.getInt("break_value", -1) + "," + sharedPrefs.getBoolean("cont_value", false) + "," + sharedPrefs.getString("exercise_value", "-1"); - if (!allProfiles.contains(currentProfile) && profileSelected.equals(sharedPrefs.getString("name_text", ""))) { + if (!(allProfiles.contains(currentProfile) && profileSelected.equals(sharedPrefs.getString("name_text", "")))) { if (ct != null) { ct.cancel(); isRunning = false; diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ExerciseListPreference.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ExerciseListPreference.java index b50065e..b7486b9 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ExerciseListPreference.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/ExerciseListPreference.java @@ -94,12 +94,14 @@ public class ExerciseListPreference extends ListPreference implements DialogInte } - if (exs.equals("")) + if (exs.equals("") && positiveResult) exs = "-1"; - SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString("exercise_value", exs); - editor.apply(); + if(positiveResult) { + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.putString("exercise_value", exs); + editor.apply(); + } } } diff --git a/app/src/main/res/drawable-nodpi/example_appwidget_preview.png b/app/src/main/res/drawable-nodpi/example_appwidget_preview.png deleted file mode 100644 index 894b069a4907d258f60b1b2406b90f5a0fe1c35b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3522 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 Hr-UW|O=fVS diff --git a/app/src/main/res/drawable/arrow_black_right.png b/app/src/main/res/drawable/arrow_black_right.png deleted file mode 100644 index 76bfaced063ca4777855a4bc95196604a0c35ae8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1089 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrgNx5a1Ky3KYizR8-{U5q!UCEJMi5(|ih=6DDxrd4E=UAyCPWHqK9Ur&2*ON3K>>)RFpD5kK+>mh4m&VF z^GkyKf*BZ@m|0la*f}`4xOw;l1cgP!q+}ITG_-XMO|9&mT;03^!eWw=(=xLP%IoSI z8k<|%I(jBgnL2IO>^XDi&0nx^(c&dbmn~nha@FcJYuBycuyxn&J$v^bIeGfr<*V0k z-M;_m$+MSl-hKT1?Z?mGfBydKOq}xvXfZf0uO2b=SsfoM-=i9Jfj_@f%%*9(3wPB+-HT1_AEsqED*n}}xu~juEKkd4A2!rf;=C;+idxu-^S+6RWN@kT`q$hiA|gogI5yftt2->PHt8GXpgp zv)Y$)@aue_g6m#DBK-P?RBpZXk4}r3)E%C#yW@xGeX%RWV%xb-10_qlfyCDNA5*zk z*#lLCoCOhn4^E3car^LJcgKI*zoMeMFSGjZycV*C^QFIqXKf>QsPrqw_E+|fEC0-$ zwrHM!+>{de!zn-BtX9ku)jzoQAs3&r+V}XzXrce6J5)bjW}kTEd~Z|qyJCrrcO-xU z_ZxsRx;spld^mnkw{!kK?Kz(NKgsTx>RB&zXVQ=02h)zsXWOpwk7tMKcgya`o2MIc zeiefR*@1#gKxO}JcP#zzIrX1Hy5Z@1hV3eKzpO$Y*E4P3^rC&!^Zq0G%s?Rthwz^d zCHI`-mrb&7+0Wl7euwjv{lC&bix2cZubc-$f7c86F|;04{5Id;$rqH@Jzf1=);T3K F0RRX=eSQD{ diff --git a/app/src/main/res/drawable/widget.png b/app/src/main/res/drawable/widget.png new file mode 100644 index 0000000000000000000000000000000000000000..09e4b7395de2eb75349089a5f1e68c6165a60eb5 GIT binary patch literal 7331 zcmX9@bwCu|+XZQm6j(}f>5@izrQ1cMq*LkckfpmDq&t@mX%Iw^ZVBn`m4@HE-}lGt z?983Jd*|NgInO!gM!Z*($Hk_=MnXcuRaB7C0M3cP5rT;heAboaR|6+x7Y+G$NHxEy z_JIpjD~Kut2?-vD^I(DoTw^&Z=(->w5xM?%Ag@}|cp@QD2`kD#G(8QEb1)i-1wca# z2c`5n@DEkAqysR6s_@A01rixT{C}Y&gP{g**#=jA`nj}ZkV%fv>a?Zm=-HHnjQkff ztPEQlL>rEeC3XXTKYz~wi#oXPs5vM7sh=>7;w-Tm|5mM0#Dat@v;4%UpZbVoBf#5#%=vK1l0VJC*aBVm)GS^dHILZirVfcJ->(ZA-2wd zou|jsfahtKolz{jLrDq&>mm{Nqp~?Y8_wB!3+1MMJkc@|ZGEVK?ZSK2Onybbi=WKa z7h6BA=c;tIjGu0IX^NYg*JR5`bO6zbU#0JcwdeQ&5E9W zFZ93pi-9<57}qnougzPH&u2^dPQuuGtil%9l_gC59{;*2!uA6s$*DD?e zv)V>YFRpfT1N3?oBhhgw${5r1H3Ys)$=J25xLbE3=0333ey=~6DNiC1ewsh5?XEHO z{EN2iGpjwL3@J$4n<|bvm@Evlo-7FQ28KP0LF1c8?Q_H<;Ittl;BoRN&tkvleFVWN ze2Cf_7^Sw)aZ?&emCtGCJoao9cNbY>74sX(SpSZLFWwY>Bdn#LFXs+VyPpk>fCs&Q zakk8SXVJKKp2kcy1a2U1cXMmU2+9JUZms+VNwhyt2SprL#?EpnSPD<>aL!wPo)TK~ zZCJIgtZtmN7-&uz(5lwkudHcTdcN6=^Bzs-xyuW}tM6lKs>ar;q|L~G7x!9JD=Q;O z;_+(QZSzOWpnHni$@A0wX>CkRNlaqx{ndUU$jH|TZYSHYgj(*h`+I3mG!=NqI>81O zxPgFk!YPn{t)XG(`UZ>iW3uB452@c z(vPEj;|tUkpIYo^&p)vn#E*{3uQ?69_6BCSUAxxsWBxO7)Urc&r$4Yb$2c?1cAwy? zgLR2$6njl;!9vMV z6)MDfswl#LJ4O5IgSxmyhhw?w$dZhQ$m#dXqo|hslB`I(k&$-NB4B>jxY!I`CuI@d zN=9raZM)yx-#PanV}v6t%nYzK?*APll370-=|yPf@>1)1WC}YK82n8;`1P(`0bVd5 z^Tm9V$RzRL1Jfq3xFtg|lvYBp!>x?DK}qqm9+cxzv%(lbqQeh6L))pJ)Vj}qP~HLQ z!QP$u-X8KU{LQ755YU%Yj?`X0hN2h)k4neTgsqg;?O;an`K%wmoFF9~^Og9k{%lPn zqEuyT9$qtdXiYg=_aV?Y4=h{Is>hn2T}DUGVvT{Qs2^V3Atm{a#N8f)O)C8?C}*3X zD3$Zm(xPq{-fQcTI!kk0@K(#3f2DjhnaLP)Bu|oz!p>+$AqGCRtx+tu%F-}t{It~zu-4%`*g z&%he5rj$QjY70`YI5$hxSr3$8QacaRwL7eJ-2sR*b^XUhy}J4KEX~M&QrpnWV(h&B z7njX=oFdmy2=>&px@0vn>|lN@Q$RV_=?6JZ@;usNCC4v?_ezj=&!(3t)%e|bkiM_K zxFs)!8IDmbo3c(D(4_F2b~0`BLXQ_TdRNIWBLRr0FUfB9-31c0`8jPoo0$XOr-KEe z=e3=3{AP4weZEa5-v9a0!v`-wS)QnfF;%DUw}$TJIVUYo%3q<04!iH?KfH6?=E|YT zUW9GmEXOh+3sDmbm<-|ZlK=< z?tW1wXW1^l%ge7LXnR41o{)gM{nDl@Zlm}&#gChDl1DO|z@jyX2ebP=jL#eTj6IPK zH#MZW4-m>Pfao8@JyyM}I8EN}7bRKOq;;!{oy!zuV2NU6fAA)iH7Q4p2$7qM?8DgQ zQ;OHg$r1Ia$?*z?4WO76CfaNVHWc@%;?#Bm6{Y#LgQX`mbV(TtBDh_~GO5-s9#ES*Q%$p3a*z^#UM(#-MOW~}IMYL~Hb@#}2=)6Q$_ zB?eR=Dw<#Wzm-cv1@cWzm7E(}$ELdJ=-j^J*fPW~?6rH{P-SgbJIO>DU5a5wTIN01 zEGW>_1Y$c=mf**7grbOur;&+sTC_-;jTgdOH-KclkFO(s**&xzgLL+_k2f5*rScUc z33&AYNbaT`vJ1z4n{#q(qFiVdp?@f2>?1Yn5t?WE6&WVytH3&HNc&kIj!i7x?%rB= zKs7HaQ7MLmS)|XJ-}P+8?sXj1+j^}G<)iOP#oQ_2@Bx8&eX|^-u{c~M^YoT!@8VGY z&DJHLD5dPDz(~o{cWHbz=F9|L6WmR_Su8Bgd!fAPEvw!mnPIh~NAOV3v6|*3Ye?ni zKd#fN)<+BQkllH#It0-uX1>b!=N$gA_f*NG7_uNRA6O^gZdy&0lO-ZFBcGLzV|HRs^8lzk z_|_JVL4;B?t*V!K7m%ACpjw(cxDKP>2}@;A|D3ZxnRmVU8&-)cxFD6|_iqvM1^qj1 z?e~kwI{-vJ0>!18R^NNS7-DDQxnG=SZE%_&Ms0m+CMX7E+T7v7o(e?K>Afc8-H1ac zLhHUTdX*rV6x1Jz`@zz)&VG@OfWv;H0C9+5M&xA2RM9Y%rsNj4`#KRzK#xjh+L{I_?yGI;%XHy{{ue9*|4_*l;=h5%+3CqCzXE5pPS*+`WPI~ za25o0R0}12!p}wSQ*iK_fy$S2cRy&n1|ag_?y$B6v1j@95OXCBg98+Lg!UIFCs(W5k~%4X)7O618q^@<-h*LXwoE^nsC&I@c7+bWs7dJvgZPT z?hSEQMpJ#p7d?7|0OF|f%XA4EBWndo6)XI`E~X4tl(cX8L_$$}@~o_26108sPwIgS z&nb0;EQGY@M;r}Ja#5LO9g;VIEIWTHf1yMBoC%ZgUsnFtLD8GRcDSgWj2NeZXp@)Y zY3eIJB2Jh;_=mG%`us%b>z7%j-A{Km?-L8Ukl0_$q!tY;$BVe`y?>^kFRg0@0`KGX z$x2Y6IYCE-?LfF6kWK`LzV%nJm4sY!YyS7ui0?fwQ@cm+Lh)W##EBe~!8Xk=AOBmj znyC$T2MjiII54jSHTuzz(|+G;oDRq6C+Sz~!UI%f;#lgWUC-0RnBxNmXIhK4jK2&|M4^|UNQ|D#b zf?Lp&%3T0-alYk`bCeENVqrY&6b(q_Sn>v2vt`gV8L7odSg3 z{yS4r!)}J?ul2BOe7fmD!4G$X4v59#!%ae21T06%Y_dtvY!d;FLrG=v6;8Go!K9LI zj0+!)9%ou&K#+u9bD;y=AZE)M+2#kOeJh>t$k*q~32FSrWG!F&xvC7+0E^I!JX!Rr zA7&=|6#XRFRRXtu3tu{V3S72^69oBQxi1To7~^-%Xegs`^7h=)#>NQmjCOh>uw!|9 z>S&ZF$0hDZDgGoV;~lE4Ws^z+RBvg~t&k-?D%SnUw6E@j4m~n4M!Z5@xxY!y$rH}9K&gJi})5Cn{ucp78yeCBw(py z?3;Q(M_tJE4M5CnQqP&qxb2M}ln%tpp)wJ!kj8rb-cg`@&+FkM2MRdkE(o$ZVdM%q z7&`7m8zzp`;ycqsFrM^X?U*jdxAt`OK$9`Jn{Xp|PhMC^&hzm!2(1*#~ty8`f~uw^=afKi4_Nr7qpd zv>L2Wy=Ej64!IiSgGb>tk9(~onE9z}CydiK~9j>i?&wguQyFVr4P1g2h%lYAnh;>4sD8?hM% z`&$YtXSVPNkKFjnu1q{$uSwn{BWK0zFyh44qXfDv(<9ydRFoo@L$)+^8s!<1@h;sM z3I!=+PP4P~t>DGh2if#q&Z0%OqUy)$M^lT7+$2+Wb!TzkNDTKYW6y%iW@RlHqWp@Z zcU4+W=tpGG#QS75a8!vEL7aMx1j{C5r!R`NtmS2NLD@#uAlaI=5X$(z;#zqkg?HA> z2?AhH)w1I8J0khWrnlw5G*L&CgKLJ0kqks$2CB~kM2(tiHZ(&OHJ8^oGZ)pr7SO2E z>(kvmyQ6#Dy-@Uo3;qe~ z$u_jJE=~qEFsACAw6OsQJZuSzo+afOJ&eOQT#k4uFXmkI6<`CZ*RN^G{TcHb+Gxq- zh;HWBDn3@Of3Uj|F(Yd6oW|0%(f~nU;5aVGya&YD>tu6zddNnY%*yDyo&|u-Jg>79 zn(6zV5B5&N&K#sP{(h72^FCumF(jY~cz$egi`qd(@>YLxjyLB(NO$S>sLrGN6R*PB(w|Vd5uolEI$WlMIti zsmH7vPzwsr9q?M2yQ5VsJBm90W>UbfFp` z1+R)UlO!67^$6u6;nHCV2A;k(xC2P7ecF~Zfjb(_gA(#5ywR(NzjeuuY3~n+t~{M; z8JlSdkArBTw_o%3M%Zhs=n~#|U!PR#HQSOm4j=i^NvZfHbxpD=1%b!ufJcWbi0`17 zq#{ss_H8>Acpi2fuPVzU+lCj7CLFoE^sFJ6d$i9^i`9{Sg%(F z4Bo*qdBZ*`rJqmlx(+Z>igKjVG8JIdq-D-uZWVi8!WJpK34L5^3NNs%ZU#{~1~Y+5-5@OUGC>LZ@GcUWtRQBH<#7u1XvA5gpT+2B;+CIu153>x*xTHA0!js@PF}Z2evN$T__)3YZO0M+ zD%y3q0-&F;@Ce@8UA#c0X^$j6ylL|*#u47w0u%g@3)zFqV=RV>8Op@WrSp6_<{FAm zL+zUgiOZa+=+kQ*r2Cy9wBnkig8}E~cPMoy6uMHaHSB~rm>aK#RvFT5!CXv;XR1~? z2|(5~a`~X;c77OJY6pM61t&L=RG&D2-@ldFI6=_41Ujc<=RlHDFWtdrx}SGjFVc?m z4Z)t=ui6zVqVjZD5-}hLtmRzbE>nqC7NDC(YZe#(=Nw4Q`l+X8dOq+Kxugu*C(rfi z;nd*fONDPJL*|M&}+g&MM8n?XDVU1Qyr?Rr@~WW87C088KY zHKWyS^jk-bz;y*E7(z|-*nAT!o_wnNc7bCviYW(lVLVDe(fE5E(3LWpeJfj)W}WjQBIL_eJse z5+GKY=gT{ZDF^SG?N^p8y+$!GwGxpG#fplg%FYUteuEOf^LpEnsE6J9R2d`^(IUu%_)Qh+?NdgiVoH3<1c9o zpJwcYYo>*mnt&rLk_W7)(XuH8ys!4wnICb2F+dJej-&@7WAP);JCtJef`JZ(vIT5dx=tGA*wTKVLw>%~e-Stf`&`00!gUxa6~#@MU+p zgkSsY@}6H3=D~j^pY*bVn=T8fT%sfh2T3PO zgJLi~VP_&hW-s>LHXSErLDjb_58Xwb`U=6hc+wTW-of9nGnbq<9dZ)NQGIl}OFk$} z{|wfGg(*$l-8jEkGCkoVCwG^yWs3G(ePWDNR+6QxF>u9!R3*I3E0 zM#+~vSmn5->VSg&lO51Z_4dHzlp(noipAsN64k6oL>nLjNMU04TX1#gV-M58cA8PF zogO*E~-SA8{+J< zrB#$0azElp=d-|cgMF~YijV9*lWo518mVEUQ;rD-D;+I5MyQb?vUDesw&)w1OtYmN zH0OZ~7G0X!VBj`Gc{#QBUj7VH4c^cCQNT|&UP&&xqla>EP)w%jeCqRpR;cUhx$jN% z%F&omDpzpR5B3!#8snyK|2taz0IW4d{jaZwZd4!y{d*1$5hsrwdD&uabzS`_6v7T; zz~&`9RF;C*f&Z8%sUG=L{k1H*OCB_7upF!UGCV0y!#S50Zff#V;jAJz;As*4`2W1o z=xe8u@K-z~!^AksO8OZDCHg#(8cYm6pZ5w%vz;S#j7%d#7_9*1Q1yneSG7VtBie4c zdGJHtposwz_TP+0Oo-wgw#|CZLT$83nb0KA6Tv zO(QFL(j1=PMn8jA-W5%Z^GgXeysmqJcQC>!U1M>t^N7rGoDG~FrlZ4b-kbO}_x`vg zS0|TO`YIowzdCCGWnzqaO2ruL6Ja>7TimlK>rc|QzBIDTmGHZYCg)2G<>LCUkx@bm zaPg`Iq!rUJdBHkjKB+oFKYnVx#~{XGhb`N+wHOV0xvA$DdSW~mHK z7o@0lE}d8HWaArl9iL4P%9;t zg%Z$TSY%odHYWpZ3h+8pMV*~|>98f*y~jHQdlOtsH{y{0r^}f?Be`k{=M?Y<>dET7 z1f$=?KjBl02}3oXl<03IFk6NOU`J{O9q!e0t6CgY6dP=@2u6HZm6A+Vt*dzCH+0c_ z3~JAwE=<4(s}z7IENKxA_Ej)6P_9~1C`dZXo^ZulxcC7FjaGER5H-{<#?^%|KhKnhBeSyD_(ylRq z_bzq}%{G)vz;po9B6JJ(idUQBpqRFeR`xAbWx}KUc2^Y3(?BM%3=3*^lcy$64pq^{QVOZ5=7`LeK$tfL z$@{FvGD#lh@8X`bX)UAygN>6A50#mcfGGF~h?DS~sqYdDBt^us5Xj$z4@H;>*cy@a dQsvJmgJ~oG1Xx_|fsI8ZMOihOns>&q{{b$cOi%y- literal 0 HcmV?d00001 diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9cabfaa..9b076ba 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -66,7 +66,7 @@ Derzeitiger Wert ist $1 Minuten Überspringen - Zufall,90,5,false,Arme.Beine.Kopf.Nacken.Becken.Wirbelsaeule.Rumpf;Oberkoerper,90,15,true,Arme.Nacken.Kopf.;Rumpf,30,5,true,Wirbelsauele.Rumpf.;Unterkoerper,30,5,true,Beine.Becken.; + Zufall,90,5,false,Arme.Beine.Kopf.Nacken.Becken.Wirbelsäule.Rumpf.;Oberkoerper,90,15,true,Arme.Nacken.Kopf.;Rumpf,30,5,true,Wirbelsäule.Rumpf.;Unterkoerper,30,5,true,Beine.Becken.; Pause nehmen Einstellungen Starten/Anhalten der Uhr @@ -81,9 +81,11 @@ Nacken Arme Rumpf - Wirbelsauele + Wirbelsäule Becken Beine Neues Profil... + Statistik + Arme.Beine.Kopf.Nacken.Becken.Wirbelsäule.Rumpf. \ 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 e79b899..8b81ed6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -104,7 +104,7 @@ 10:00 - Next + Next Description: Description of the Exercise Execution of the Exercise @@ -139,5 +139,9 @@ By clicking on the current profile (\'Random\'), you will see all the currently available profiles. \nYou can add new profiles by clicking on \'New Profiles...\' and edit the current ones in the settings Start/Stop the clock Welcome to the Privacy Friendly Break Reminder + 0 + + Legs.Arms.Pelvis.Spinal Column.Torso.Neck.Head. + diff --git a/app/src/main/res/xml/app_widget2x1_info.xml b/app/src/main/res/xml/app_widget2x1_info.xml index 231cb7d..38c67ab 100644 --- a/app/src/main/res/xml/app_widget2x1_info.xml +++ b/app/src/main/res/xml/app_widget2x1_info.xml @@ -4,7 +4,7 @@ android:initialLayout="@layout/app_widget2x2" android:minHeight="40dp" android:minWidth="110dp" - android:previewImage="@drawable/example_appwidget_preview" + android:previewImage="@drawable/widget" android:resizeMode="horizontal|vertical" android:updatePeriodMillis="86400000" android:widgetCategory="home_screen"> \ No newline at end of file diff --git a/app/src/main/res/xml/app_widget2x2_info.xml b/app/src/main/res/xml/app_widget2x2_info.xml index 7ad9519..a57b25e 100644 --- a/app/src/main/res/xml/app_widget2x2_info.xml +++ b/app/src/main/res/xml/app_widget2x2_info.xml @@ -4,7 +4,7 @@ android:initialLayout="@layout/app_widget2x2" android:minHeight="110dp" android:minWidth="110dp" - android:previewImage="@drawable/example_appwidget_preview" + android:previewImage="@drawable/widget" android:resizeMode="none" android:updatePeriodMillis="86400000" android:widgetCategory="home_screen"> \ No newline at end of file diff --git a/app/src/main/res/xml/app_widget3x3_info.xml b/app/src/main/res/xml/app_widget3x3_info.xml index 41b1252..50ffe49 100644 --- a/app/src/main/res/xml/app_widget3x3_info.xml +++ b/app/src/main/res/xml/app_widget3x3_info.xml @@ -4,7 +4,7 @@ android:initialLayout="@layout/app_widget3x3" android:minHeight="180dp" android:minWidth="180dp" - android:previewImage="@drawable/example_appwidget_preview" + android:previewImage="@drawable/widget" android:resizeMode="none" android:updatePeriodMillis="86400000" android:widgetCategory="home_screen"> \ No newline at end of file diff --git a/app/src/main/res/xml/app_widget4x4_info.xml b/app/src/main/res/xml/app_widget4x4_info.xml index 4a628a7..b15d101 100644 --- a/app/src/main/res/xml/app_widget4x4_info.xml +++ b/app/src/main/res/xml/app_widget4x4_info.xml @@ -4,7 +4,7 @@ android:initialLayout="@layout/app_widget4x4" android:minHeight="250dp" android:minWidth="250dp" - android:previewImage="@drawable/example_appwidget_preview" + android:previewImage="@drawable/widget" android:resizeMode="none" android:updatePeriodMillis="86400000" android:widgetCategory="home_screen"> \ No newline at end of file diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 6999afa..799dd38 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -2,7 +2,7 @@