From 9290c466e77c62ca440a4b52fe688de6f8c3d589 Mon Sep 17 00:00:00 2001 From: OliE Date: Sat, 8 Apr 2017 18:41:55 +0200 Subject: [PATCH] - add WHR, wHtR and BMI to data entry activity - show inactive icon if measurement is not editable --- .../gui/activities/DataEntryActivity.java | 12 ++++++++++++ .../openscale/gui/views/MeasurementView.java | 9 ++++++--- android_app/app/src/main/res/drawable/delete.png | Bin 0 -> 1582 bytes .../app/src/main/res/drawable/editable.png | Bin 0 -> 775 bytes .../app/src/main/res/drawable/noteditable.png | Bin 0 -> 437 bytes .../app/src/main/res/values-de/strings.xml | 1 + .../app/src/main/res/values-fr/strings.xml | 1 + .../app/src/main/res/values-ja/strings.xml | 1 + 8 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 android_app/app/src/main/res/drawable/delete.png create mode 100644 android_app/app/src/main/res/drawable/editable.png create mode 100644 android_app/app/src/main/res/drawable/noteditable.png diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java index 9ebbc7e9..7f1a4ccb 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java @@ -35,6 +35,7 @@ import android.widget.Toast; import com.health.openscale.R; import com.health.openscale.core.OpenScale; import com.health.openscale.core.datatypes.ScaleData; +import com.health.openscale.gui.views.BMIMeasurementView; import com.health.openscale.gui.views.CommentMeasurementView; import com.health.openscale.gui.views.DateMeasurementView; import com.health.openscale.gui.views.FatMeasurementView; @@ -42,6 +43,8 @@ import com.health.openscale.gui.views.HipMeasurementView; import com.health.openscale.gui.views.MeasurementView; import com.health.openscale.gui.views.MuscleMeasurementView; import com.health.openscale.gui.views.TimeMeasurementView; +import com.health.openscale.gui.views.WHRMeasurementView; +import com.health.openscale.gui.views.WHtRMeasurementView; import com.health.openscale.gui.views.WaistMeasurementView; import com.health.openscale.gui.views.WaterMeasurementView; import com.health.openscale.gui.views.WeightMeasurementView; @@ -60,11 +63,14 @@ public class DataEntryActivity extends Activity { private TableLayout tableLayoutDataEntry; private WeightMeasurementView weightMeasurement; + private BMIMeasurementView bmiMeasurementView; private WaterMeasurementView waterMeasurement; private MuscleMeasurementView muscleMeasurement; private FatMeasurementView fatMeasurement; private WaistMeasurementView waistMeasurement; + private WHtRMeasurementView wHtRMeasurementView; private HipMeasurementView hipMeasurement; + private WHRMeasurementView whrMeasurementView; private CommentMeasurementView commentMeasurement; private DateMeasurementView dateMeasurement; private TimeMeasurementView timeMeasurement; @@ -95,22 +101,28 @@ public class DataEntryActivity extends Activity { tableLayoutDataEntry = (TableLayout) findViewById(R.id.tableLayoutDataEntry); weightMeasurement = new WeightMeasurementView(context); + bmiMeasurementView = new BMIMeasurementView(context); waterMeasurement = new WaterMeasurementView(context); muscleMeasurement = new MuscleMeasurementView(context); fatMeasurement = new FatMeasurementView(context); waistMeasurement = new WaistMeasurementView(context); + wHtRMeasurementView = new WHtRMeasurementView(context); hipMeasurement = new HipMeasurementView(context); + whrMeasurementView = new WHRMeasurementView(context); commentMeasurement = new CommentMeasurementView(context); dateMeasurement = new DateMeasurementView(context); timeMeasurement = new TimeMeasurementView(context); dataEntryMeasurements = new ArrayList<>(); dataEntryMeasurements.add(weightMeasurement); + dataEntryMeasurements.add(bmiMeasurementView); dataEntryMeasurements.add(waterMeasurement); dataEntryMeasurements.add(muscleMeasurement); dataEntryMeasurements.add(fatMeasurement); dataEntryMeasurements.add(waistMeasurement); + dataEntryMeasurements.add(wHtRMeasurementView); dataEntryMeasurements.add(hipMeasurement); + dataEntryMeasurements.add(whrMeasurementView); dataEntryMeasurements.add(commentMeasurement); dataEntryMeasurements.add(dateMeasurement); dataEntryMeasurements.add(timeMeasurement); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java index ea6bb081..4feb97e2 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java @@ -114,7 +114,7 @@ public abstract class MeasurementView extends TableLayout { editModeView.getLayoutParams().height = pxImageDp(20); editModeView.setScaleType(ImageView.ScaleType.CENTER_INSIDE); - editModeView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.edit)); + editModeView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.editable)); editModeView.setVisibility(View.GONE); indicatorView.setLayoutParams(new TableRow.LayoutParams(0, LayoutParams.MATCH_PARENT, 0.01f)); @@ -167,9 +167,12 @@ public abstract class MeasurementView extends TableLayout { break; case EDIT: case ADD: - if (isEditable()) { - editModeView.setVisibility(View.VISIBLE); + editModeView.setVisibility(View.VISIBLE); + + if (!isEditable()) { + editModeView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.noteditable)); } + indicatorView.setVisibility(View.GONE); evaluatorRow.setVisibility(View.GONE); break; diff --git a/android_app/app/src/main/res/drawable/delete.png b/android_app/app/src/main/res/drawable/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..b3753f3a82cb1015aa3250d6d204c7c8a31ae7f6 GIT binary patch literal 1582 zcmV+}2GRM6P)@@khKF@ zqgM@e_fP2C0F14n?UErk2}+s)EGkn^12EEQ+nFGL70@?Q{{{G`Oq6u>tF zE(1nYtGG-ZLn_dJWd&mjQ1>~Y?g=O*32p)&udyGc-~r&Vu2xzK0jJFDo31uoE+ieP zh2FYf0(DP7DNA6Yq)oMUqy!ABh0;<87zo@_3*+4Zb-x7ao&euoU>I;ySbYMR80mf; zSRbS7RiHUip9k!UkzMW7@5jFv7y-N#sUHI#3jf|`X5Yr>FCAtUTY%+&MashovO65v zaS5{KlzuUCH#&0rll-lu)cq3ZAs}l9vPKU9Sv!z5dI-qcfvnL(K-Laqjk+hGmKP%x zLDF@=1YjKb`w)O3lC}Wb!m{4Xj#Xo?yAU8r(}B4J!N;Ky7#|jZ(~?#KubJ7_N(^_G zCGZunhUDOV=mX3Gwn$nfsqD*=?n1zbF3>Rp*e>b5at3vmCE(&af*J7za0oa|aF^Hw z3v_Oip0=Yv ztC_W#+4rR=u>h-q(ZGD*oFg(%(u2kHq)LFKxxjR%`D{FUrdk_V&hD620TN4(me@GGc)&Bs~BeX zIWWg*9s|sb8dXel2j1nVt36T?d?x)JICX z+!acL0QYtEr#L|~+ebix`&euxKKL_uU}h%(_p6d7S1t365+O z1*b=85OBb$CmvcPWcw)EfmM?F6tUgx)DO7=X%OIM_3PsV6M|n$A(3q)kRWLwg=81x zl{5(0>(nPm8te*5x(0vnD}lQS5~EAP6ktuva%d+%zMW?Fmn&3r0?ceX`Cp1O0C#yr z|D^Fk@fmnpgVS%qt(j4G+r}-%hneizrX9je2*$oUx@}Zmp zOa{(6Hoi<6ll8qo3-FnwtE*KM-Yj*Hf9iA^crgcyqV(DCY@~pSW(N3# zxc>kDAIKbpVBdxr?|{xSDhcunW?*4s=i(C-l2TFA(6q95@CyuzjLOI?ZfNV7FlqX- zb?Y~8-Mjz5(PPJN-o5|i`MZxlf8S4@G6@(Ui#%N%Ln02pofcVsNI|5faD7y-)O3mO zs!?0@9{&Ho!)(GNZxOvlcWZyE4|k0p$?&y2;L2EbAmRV+4~-8ERP!a=4@>)A_{1hG zASe6b{CJ z2%OKV(6(nccv8tLexA{%GVZXSox_uvpVqWJk73|+zo%7q?^}_@w`+-}Ifwol^?h8^ z=DsM*|NLiR>D519xt`xFb;@*_scS{p;jOds?FHstEm$D8!5PS{c0I{&IB$E|@0Ag2 zV-4;0@;;9I`Sg>_D>>U Y>zopr0Kp>`iU0rr literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/drawable/noteditable.png b/android_app/app/src/main/res/drawable/noteditable.png new file mode 100644 index 0000000000000000000000000000000000000000..08fb005a48411cfad294301d9691a4701dd6b991 GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!5(0ceT!Az@J3Bu=zqq)#yu7@+ zy1Kr;zPY)%y}iA=ySu-?e|UI!e0+R*dU}3-etCI$eSLj|Mcn8=g*(NeEIVA z>(_7JzJ34x{l||VKY#xG_3PK~-@pI-`SbVh-+%x9UEAhj0MHJ`k|4ie28U-i(mFdh=kcC4)NnSjKg%>Dv&eO#)B;xSf z>j(J`8SpR%)VKft?`&!4tJFJJLNCK|k=^=|;Mq*OD)i61j^8U?_ASoo`P`O!uUVe{ z{BeALy|-=f`76d>eIV3wh8_O|9{euSV2jgT{pDMA>A6)$|LlKd82A6z`>ySuoa^}t zs#zazeo@_9#Wdq**>0h|eRuLh*DpE8eR?+|hkAo+!}GliEy6F{Uoe;|eHB^$HEH76 zxY)TK!u7q%x$(B0!v6&g4n4ixc72YIIpgl?tB>lYy*&AR(>{#e%^SM>c~u^wD7 Vp?#$vuL;m+44$rjF6*2UngD_XwtfHr literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml index bd430235..a89ac6b6 100644 --- a/android_app/app/src/main/res/values-de/strings.xml +++ b/android_app/app/src/main/res/values-de/strings.xml @@ -116,4 +116,5 @@ Sonntag Fehler beim Wertebereich Wert ist erforderlich + Bearbeiten \ No newline at end of file diff --git a/android_app/app/src/main/res/values-fr/strings.xml b/android_app/app/src/main/res/values-fr/strings.xml index ed541ca2..f4a709a3 100644 --- a/android_app/app/src/main/res/values-fr/strings.xml +++ b/android_app/app/src/main/res/values-fr/strings.xml @@ -135,4 +135,5 @@ Vendredi Samedi Dimanche + Modifier diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml index e773f2d5..0c7c8ab2 100644 --- a/android_app/app/src/main/res/values-ja/strings.xml +++ b/android_app/app/src/main/res/values-ja/strings.xml @@ -116,4 +116,5 @@ 日曜日 値が必要です エラー値の範囲 + 編集 \ No newline at end of file