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 516086f5..c83d6d3d 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 @@ -365,6 +365,12 @@ public class OpenScale { public void registerFragment(FragmentUpdateListener fragment) { fragmentList.add(fragment); + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + int selectedUserId = prefs.getInt("selectedUserId", -1); + + scaleDataList = scaleDB.getScaleDataList(selectedUserId); + fragment.updateOnView(scaleDataList); } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java index 8dec9f01..32d25d9f 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java @@ -387,10 +387,10 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE || (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_LARGE) { - pieChartData.setCenterText1FontSize(25); + pieChartData.setCenterText1FontSize(20); pieChartData.setCenterText2FontSize(14); } else { - pieChartData.setCenterText1FontSize(20); + pieChartData.setCenterText1FontSize(15); pieChartData.setCenterText2FontSize(12); pieChartData.setValueLabelTextSize(12); } 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 1a0d43ed..542e7492 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 @@ -208,7 +208,8 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { HashMap dataRow = new HashMap<>(); - dataRow.put(0, Long.toString(scaleData.getId())); + int columnNr = 0; + dataRow.put(columnNr, Long.toString(scaleData.getId())); for (int j=0; j< measurementsList.size(); j++) { MeasurementView measurement = measurementsList.get(j); @@ -216,7 +217,8 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { measurement.updateDiff(scaleData, prevScaleData); if (measurement.isVisible()) { - dataRow.put(j+1,measurement.getValueAsString() + "
" + measurement.getDiffValue()); + columnNr++; + dataRow.put(columnNr, measurement.getValueAsString() + "
" + measurement.getDiffValue()); } }