diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java index b2b89084..8a897493 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java @@ -24,6 +24,7 @@ import android.support.v4.app.Fragment; import android.util.Log; import android.widget.Toast; +import com.health.openscale.R; import com.health.openscale.core.alarm.AlarmHandler; import com.health.openscale.core.bluetooth.BluetoothCommunication; import com.health.openscale.core.database.ScaleDatabase; @@ -188,6 +189,10 @@ public class OpenScale { } if (scaleDB.insertEntry(scaleData)) { + ScaleUser scaleUser = getScaleUser(scaleData.getUserId()); + + String infoText = String.format(context.getString(R.string.info_new_data_added), scaleData.getConvertedWeight(scaleUser.scale_unit), scaleUser.UNIT_STRING[scaleUser.scale_unit], dateTimeFormat.format(scaleData.getDateTime()), scaleUser.user_name); + Toast.makeText(context, infoText, Toast.LENGTH_LONG).show(); alarmHandler.entryChanged(context, scaleData); updateScaleData(); } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java index 7d691ede..2a8a055b 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java @@ -133,6 +133,8 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { @Override public void updateOnView(ArrayList scaleDataList) { + tableDataView.setAdapter(new ListViewAdapter(new ArrayList>())); // delete all data in the table with an empty adapter array list + if (scaleDataList.isEmpty()) { return; } 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 0eec998f..4c2d4e59 100644 --- a/android_app/app/src/main/res/values-de/strings.xml +++ b/android_app/app/src/main/res/values-de/strings.xml @@ -133,4 +133,6 @@ Suche nach Bluetooth Waagen Knochenmasse Grundumsatz (BMR) + Messe Gewicht: %.2f + %1$.2f%2$s [%3$s] zu %4$s hinzugefügt \ No newline at end of file diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index 57c4b7ce..e649b79b 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -100,6 +100,7 @@ Connection successful established Initialize Bluetooth device Bluetooth has an unexpected error + %1$.2f%2$s [%3$s] to %4$s added Enter your name No user exists. Please create a new user in the settings.