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

some small bug fixes

Browse Source 
upgrade gradle build file to version 1.5
This commit is contained in:
OliE
2017-04-11 19:22:43 +02:00
parent cf27af7b35
commit bf3b5e4548
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/build.gradle
View File

@@ -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 {

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

@@ -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 {

2
android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
View File

@@ -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() {

4
android_app/app/src/main/res/layout/fragment_graph.xml
View File

@@ -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" />

5
android_app/app/src/main/res/layout/fragment_statistics.xml
View File

@@ -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" />