diff --git a/android_app/app/src/main/java/com/health/openscale/core/ScaleUserDatabase.java b/android_app/app/src/main/java/com/health/openscale/core/ScaleUserDatabase.java index ca063b7e..e03dfe49 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/ScaleUserDatabase.java +++ b/android_app/app/src/main/java/com/health/openscale/core/ScaleUserDatabase.java @@ -166,12 +166,14 @@ public class ScaleUserDatabase extends SQLiteOpenHelper { scaleUser.body_height = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_BODY_HEIGHT)); scaleUser.scale_unit = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_SCALE_UNIT)); scaleUser.gender = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GENDER)); - scaleUser.goal_weight = cursorScaleDB.getFloat(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_WEIGHT)); + double goal_weight = cursorScaleDB.getFloat(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_WEIGHT)); String goal_date = cursorScaleDB.getString(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_DATE)); scaleUser.birthday = formatDateTime.parse(birthday); scaleUser.goal_date = formatDateTime.parse(goal_date); + scaleUser.goal_weight = Math.round(goal_weight * 100.0) / 100.0; + cursorScaleDB.moveToNext(); } catch (ParseException ex) { @@ -223,13 +225,15 @@ public class ScaleUserDatabase extends SQLiteOpenHelper { scaleUser.body_height = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_BODY_HEIGHT)); scaleUser.scale_unit = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_SCALE_UNIT)); scaleUser.gender = cursorScaleDB.getInt(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GENDER)); - scaleUser.goal_weight = cursorScaleDB.getFloat(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_WEIGHT)); + double goal_weight = cursorScaleDB.getFloat(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_WEIGHT)); String goal_date = cursorScaleDB.getString(cursorScaleDB.getColumnIndexOrThrow(COLUMN_NAME_GOAL_DATE)); scaleUser.birthday = formatDateTime.parse(birthday); scaleUser.goal_date = formatDateTime.parse(goal_date); - scaleUserDBEntries.add(scaleUser); + scaleUser.goal_weight = Math.round(goal_weight * 100.0) / 100.0; + + scaleUserDBEntries.add(scaleUser); cursorScaleDB.moveToNext(); } diff --git a/android_app/app/src/main/res/layout/activity_newentry.xml b/android_app/app/src/main/res/layout/activity_newentry.xml index 25e72731..55c0d8b7 100644 --- a/android_app/app/src/main/res/layout/activity_newentry.xml +++ b/android_app/app/src/main/res/layout/activity_newentry.xml @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:ems="10" android:hint="@string/info_enter_value_unit" - android:inputType="numberDecimal" + android:inputType="numberDecimal|numberSigned" android:layout_column="2"> @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:ems="10" android:hint="@string/info_enter_value_percent" - android:inputType="numberDecimal" + android:inputType="numberDecimal|numberSigned" android:layout_column="2" /> @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:ems="10" android:hint="@string/info_enter_value_percent" - android:inputType="numberDecimal" + android:inputType="numberDecimal|numberSigned" android:layout_column="2" /> @@ -148,7 +148,7 @@ android:layout_height="wrap_content" android:ems="10" android:hint="@string/info_enter_value_percent" - android:inputType="numberDecimal" + android:inputType="numberDecimal|numberSigned" android:layout_column="2" /> diff --git a/android_app/app/src/main/res/layout/activity_usersettings.xml b/android_app/app/src/main/res/layout/activity_usersettings.xml index 9fe3efc1..84a6f377 100644 --- a/android_app/app/src/main/res/layout/activity_usersettings.xml +++ b/android_app/app/src/main/res/layout/activity_usersettings.xml @@ -62,7 +62,7 @@ android:layout_height="wrap_content" android:ems="10" android:hint="@string/info_enter_value_cm" - android:inputType="numberDecimal|numberSigned" /> + android:inputType="numberSigned" />