From bf3b5e4548ce68f2fddd9a0646a4e409c5310b26 Mon Sep 17 00:00:00 2001 From: OliE Date: Tue, 11 Apr 2017 19:22:43 +0200 Subject: [PATCH] some small bug fixes upgrade gradle build file to version 1.5 --- android_app/app/build.gradle | 4 ++-- .../com/health/openscale/gui/fragments/GraphFragment.java | 4 ++-- .../java/com/health/openscale/gui/views/MeasurementView.java | 2 +- android_app/app/src/main/res/layout/fragment_graph.xml | 4 ++-- android_app/app/src/main/res/layout/fragment_statistics.xml | 5 +++++ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index 011cc43b..9af6606d 100644 --- a/android_app/app/build.gradle +++ b/android_app/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.health.openscale" minSdkVersion 18 targetSdkVersion 22 // don't set target sdk > 22 otherwise bluetooth le discovery need permission to ACCESS_COARSE_LOCATION - versionCode 12 - versionName "1.4.3" + versionCode 13 + versionName "1.5" } buildTypes { diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java index 9e9c42d2..c0ff0f46 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java @@ -275,14 +275,14 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { diagramMuscle.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#d3d3d3"))); } - if(prefs.getBoolean("waistEnable", false) && prefs.getBoolean(String.valueOf(diagramWaist.getId()), false)) { + if(prefs.getBoolean("waistEnable", false) && prefs.getBoolean(String.valueOf(diagramWaist.getId()), true)) { lines.add(lineWaist); diagramWaist.setBackgroundTintList(ColorStateList.valueOf(Color.MAGENTA)); } else { diagramWaist.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#d3d3d3"))); } - if(prefs.getBoolean("hipEnable", false) && prefs.getBoolean(String.valueOf(diagramHip.getId()), false)) { + if(prefs.getBoolean("hipEnable", false) && prefs.getBoolean(String.valueOf(diagramHip.getId()), true)) { lines.add(lineHip); diagramHip.setBackgroundTintList(ColorStateList.valueOf(Color.YELLOW)); } else { diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java index df80d9de..4857b352 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java @@ -295,7 +295,7 @@ public abstract class MeasurementView extends TableLayout { } protected int getInputType() { - return InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED; + return InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL; } protected String getHintText() { diff --git a/android_app/app/src/main/res/layout/fragment_graph.xml b/android_app/app/src/main/res/layout/fragment_graph.xml index 988a57c8..2cb7112d 100644 --- a/android_app/app/src/main/res/layout/fragment_graph.xml +++ b/android_app/app/src/main/res/layout/fragment_graph.xml @@ -65,7 +65,7 @@ android:layout_marginRight="10dp" android:clickable="true" android:src="@drawable/waist" - app:backgroundTint="#D3D3D3" + app:backgroundTint="#FF00FF" app:fabSize="mini" app:rippleColor="#FF00FF" /> @@ -76,7 +76,7 @@ android:layout_marginRight="10dp" android:clickable="true" android:src="@drawable/hip" - app:backgroundTint="#D3D3D3" + app:backgroundTint="#FFFF00" app:fabSize="mini" app:rippleColor="#FFFF00" /> diff --git a/android_app/app/src/main/res/layout/fragment_statistics.xml b/android_app/app/src/main/res/layout/fragment_statistics.xml index 05f225b0..99352833 100644 --- a/android_app/app/src/main/res/layout/fragment_statistics.xml +++ b/android_app/app/src/main/res/layout/fragment_statistics.xml @@ -70,6 +70,7 @@ android:layout_column="2" android:layout_gravity="center_vertical" android:layout_weight="20" + android:gravity="right" android:text="-1 kg" android:textAppearance="?android:attr/textAppearanceLarge" android:textSize="15dp" /> @@ -112,6 +113,7 @@ android:layout_column="2" android:layout_gravity="center_vertical" android:layout_weight="20" + android:gravity="right" android:text="-1 kg" android:textAppearance="?android:attr/textAppearanceLarge" android:textSize="15dp" /> @@ -154,6 +156,7 @@ android:layout_column="2" android:layout_gravity="center_vertical" android:layout_weight="20" + android:gravity="right" android:text="-1 days" android:textAppearance="?android:attr/textAppearanceLarge" android:textSize="15dp" /> @@ -217,6 +220,7 @@ android:layout_column="2" android:layout_gravity="center_vertical" android:layout_weight="20" + android:gravity="right" android:text="-1" android:textAppearance="?android:attr/textAppearanceLarge" android:textSize="15dp" /> @@ -259,6 +263,7 @@ android:layout_column="2" android:layout_gravity="center_vertical" android:layout_weight="20" + android:gravity="right" android:text="-1" android:textAppearance="?android:attr/textAppearanceLarge" android:textSize="15dp" />