#127: Last used blood sugar unit preserved

Author: bosik

portable/comp-android/diacomp/src/main/java/org/bosik/diacomp/android/frontend/activities/ActivityEditorBlood.java

@@ -27,9 +27,12 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 import org.bosik.diacomp.android.R;
+import org.bosik.diacomp.android.backend.features.preferences.account.PreferencesLocalService;
 import org.bosik.diacomp.android.frontend.UIUtils;
 import org.bosik.diacomp.core.entities.business.Units;
 import org.bosik.diacomp.core.entities.business.diary.records.BloodRecord;
+import org.bosik.diacomp.core.services.preferences.PreferenceID;
+import org.bosik.diacomp.core.services.preferences.PreferencesTypedService;
 import org.bosik.diacomp.core.utils.Utils;
 
 import java.util.Date;
@@ -44,6 +47,8 @@ public class ActivityEditorBlood extends ActivityEditorTime<BloodRecord>
 	private Button   buttonTime;
 	private Button   buttonDate;
 
+	private PreferencesTypedService preferences;
+
 	// TODO: i18n
 	private static final String ERROR_INCORRECT_FINGER_VALUE = "Укажите палец, из которого бралась кровь";
 	private static final String ERROR_INCORRECT_UNIT         = "Incorrect unit of measurement";
@@ -103,6 +108,8 @@ public void onClick(View v)
 				ActivityEditorBlood.this.submit();
 			}
 		});
+
+		preferences = new PreferencesTypedService(new PreferencesLocalService(this));
 	}
 
 	@Override
@@ -112,7 +119,7 @@ protected void showValuesInGUI(boolean createMode)
 		buttonTime.setText(formatTime(entity.getData().getTime()));
 
 		final Units.BloodSugar unit = createMode
-				? Units.BloodSugar.MG_DL // FIXME: use preferences (last used unit)
+				? preferences.getEnum(PreferenceID.ANDROID_LAST_USED_BLOOD_SUGAR_UNITS, Units.BloodSugar.class)
 				: entity.getData().getUnit();
 
 		spinnerUnit.setSelection(writeUnit(unit));
@@ -189,6 +196,8 @@ protected boolean getValuesFromGUI()
 			return false;
 		}
 
+		preferences.setEnum(PreferenceID.ANDROID_LAST_USED_BLOOD_SUGAR_UNITS, entity.getData().getUnit());
+
 		return true;
 	}
 

portable/comp-transfer/src/main/java/org/bosik/diacomp/core/services/preferences/PreferenceID.java

@@ -31,7 +31,7 @@ public enum PreferenceID implements Coded
 	 */
 	BLOOD_SUGAR_UNITS("f8b8f180da6d4d9198ee42944b23dfdf", Type.STRING, Units.BloodSugar.MMOL_L.getCode(), true),
 	/**
-	 * Target blood sugar, in mmol/l
+	 * Target blood sugar, in preferred units
 	 */
 	TARGET_BS("e6681282aa724d3fa4cd6ac5735a163f", Type.FLOAT, "5.5", true),
 	/**
@@ -50,6 +50,10 @@ public enum PreferenceID implements Coded
 	 * Units of mass to use in manual rates, options are {@link Units.Mass}'s codes
 	 */
 	RATES_MASS_UNITS("589985b443c243d6844209964b2b1e8e", Type.STRING, Units.Mass.G.getCode(), true),
+	/**
+	 * Units of measurement used for the last blood sugar recorded
+	 */
+	ANDROID_LAST_USED_BLOOD_SUGAR_UNITS("622096bc5ed14fac93339de8a6d1df96", Type.STRING, Units.BloodSugar.MMOL_L.getCode(), false),
 	/**
 	 * If it's first start on Android device. TODO: move it?
 	 */