mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-22 16:23:09 +02:00
Code Issues Releases Wiki Activity

- fix small bug if fragment not attached to an activity

Browse Source 
- update version to 1.3
This commit is contained in:
OliE
2015-08-15 15:40:54 +02:00
parent 7d7e04cd51
commit cae5216d30
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.health.openscale" package="com.health.openscale"
android:versionCode="5" android:versionCode="6"
android:versionName="1.2" > android:versionName="1.3" >
<uses-permission android:name="android.permission.BLUETOOTH"/> <uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

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

@@ -16,6 +16,7 @@
package com.health.openscale.core; package com.health.openscale.core;
import android.support.v4.app.Fragment;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Handler; import android.os.Handler;
@@ -433,7 +434,9 @@ public class OpenScale {
for(FragmentUpdateListener fragment : fragmentList) { for(FragmentUpdateListener fragment : fragmentList) {
if (fragment != null) { if (fragment != null) {
fragment.updateOnView(scaleDataList); if (((Fragment)fragment).isAdded()) {
fragment.updateOnView(scaleDataList);
}
} }
} }
} }

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

@@ -693,7 +693,9 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
Calendar histDate = Calendar.getInstance(); Calendar histDate = Calendar.getInstance();
Calendar lastDate = Calendar.getInstance(); Calendar lastDate = Calendar.getInstance();
lastDate.setTime(lastScaleData.date_time); if (!scaleDataList.isEmpty()) {
lastDate.setTime(scaleDataList.get(0).date_time);
}
scaleDataLastDays = new ArrayList<ScaleData>(); scaleDataLastDays = new ArrayList<ScaleData>();
@@ -713,8 +715,8 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
long days = 0 - daysBetween(lastDate, histDate); long days = 0 - daysBetween(lastDate, histDate);
if (days == 0) { if (days == 0 && !scaleDataList.isEmpty()) {
axisValues.add(new AxisValue(i, DateFormat.getDateInstance(DateFormat.SHORT).format(lastScaleData.date_time).toCharArray())); axisValues.add(new AxisValue(i, DateFormat.getDateInstance(DateFormat.SHORT).format(scaleDataList.get(0).date_time).toCharArray()));
} else { } else {
axisValues.add(new AxisValue(i, String.format("%d " + getResources().getString(R.string.label_days), days).toCharArray())); axisValues.add(new AxisValue(i, String.format("%d " + getResources().getString(R.string.label_days), days).toCharArray()));
} }
@@ -820,11 +822,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(25);
pieChartData.setCenterText2FontSize(14); pieChartData.setCenterText2FontSize(14);
} else } else {
{
pieChartData.setCenterText1FontSize(20); pieChartData.setCenterText1FontSize(20);
pieChartData.setCenterText2FontSize(12); pieChartData.setCenterText2FontSize(12);
pieChartData.setValueLabelTextSize(12); pieChartData.setValueLabelTextSize(12);