mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-11 19:24:06 +02:00
Code Issues Releases Wiki Activity

fix various minor bugs

Browse Source
This commit is contained in:
OliE
2017-05-07 10:56:43 +02:00
parent 53492b2bc4
commit b08a07c19a
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -365,6 +365,12 @@ public class OpenScale {
public void registerFragment(FragmentUpdateListener fragment) { public void registerFragment(FragmentUpdateListener fragment) {
fragmentList.add(fragment); fragmentList.add(fragment);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int selectedUserId = prefs.getInt("selectedUserId", -1);
scaleDataList = scaleDB.getScaleDataList(selectedUserId);
fragment.updateOnView(scaleDataList); fragment.updateOnView(scaleDataList);
} }

4
android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
View File

@@ -387,10 +387,10 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE || if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE ||
(getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_LARGE) { (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_LARGE) {
pieChartData.setCenterText1FontSize(25); pieChartData.setCenterText1FontSize(20);
pieChartData.setCenterText2FontSize(14); pieChartData.setCenterText2FontSize(14);
} else { } else {
pieChartData.setCenterText1FontSize(20); pieChartData.setCenterText1FontSize(15);
pieChartData.setCenterText2FontSize(12); pieChartData.setCenterText2FontSize(12);
pieChartData.setValueLabelTextSize(12); pieChartData.setValueLabelTextSize(12);
} }

6
android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
View File

@@ -208,7 +208,8 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
HashMap<Integer,String> dataRow = new HashMap<>(); HashMap<Integer,String> 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++) { for (int j=0; j< measurementsList.size(); j++) {
MeasurementView measurement = measurementsList.get(j); MeasurementView measurement = measurementsList.get(j);
@@ -216,7 +217,8 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
measurement.updateDiff(scaleData, prevScaleData); measurement.updateDiff(scaleData, prevScaleData);
if (measurement.isVisible()) { if (measurement.isVisible()) {
dataRow.put(j+1,measurement.getValueAsString() + "<br>" + measurement.getDiffValue()); columnNr++;
dataRow.put(columnNr, measurement.getValueAsString() + "<br>" + measurement.getDiffValue());
} }
} }