mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-09-02 12:54:10 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/oliexdev/openScale

Browse Source
This commit is contained in:
OliE
2017-11-26 07:59:14 +01:00
parent 89967e756c 9278f3aa0d
commit e238133aa0
26 changed files with 727 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,8 +74,6 @@ public class BluetoothMGB extends BluetoothCommunication {
} }
public BluetoothMGB(Context context) { public BluetoothMGB(Context context) {
super(context); super(context);
} }
@@ -196,8 +194,7 @@ public class BluetoothMGB extends BluetoothCommunication {
popInt(); //unknown =00 popInt(); //unknown =00
popInt(); //unknown =00 popInt(); //unknown =00
}else } else if (hdr_1 == 0x01 && hdr_2 == 0x00) {
if( hdr_1 == 0x01 && hdr_2 == 0x00 ){
measurement.setMuscle(popFloat()); measurement.setMuscle(popFloat());
popFloat(); //BMR popFloat(); //BMR

12
android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
View File

@@ -173,26 +173,22 @@ public class UserSettingsActivity extends Activity {
{ {
boolean validate = true; boolean validate = true;
if( txtUserName.getText().toString().length() == 0 ) if (txtUserName.getText().toString().length() == 0) {
{
txtUserName.setError(getResources().getString(R.string.error_user_name_required)); txtUserName.setError(getResources().getString(R.string.error_user_name_required));
validate = false; validate = false;
} }
if( txtBodyHeight.getText().toString().length() == 0 ) if (txtBodyHeight.getText().toString().length() == 0) {
{
txtBodyHeight.setError(getResources().getString(R.string.error_body_height_required)); txtBodyHeight.setError(getResources().getString(R.string.error_body_height_required));
validate = false; validate = false;
} }
if( txtInitialWeight.getText().toString().length() == 0 ) if (txtInitialWeight.getText().toString().length() == 0) {
{
txtInitialWeight.setError(getResources().getString(R.string.error_initial_weight_required)); txtInitialWeight.setError(getResources().getString(R.string.error_initial_weight_required));
validate = false; validate = false;
} }
if( txtGoalWeight.getText().toString().length() == 0 ) if (txtGoalWeight.getText().toString().length() == 0) {
{
txtGoalWeight.setError(getResources().getString(R.string.error_goal_weight_required)); txtGoalWeight.setError(getResources().getString(R.string.error_goal_weight_required));
validate = false; validate = false;
} }

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

@@ -258,8 +258,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
pointIndexScaleDataList = new ArrayList<>(); pointIndexScaleDataList = new ArrayList<>();
for(ScaleData scaleEntry: scaleDataList) for (ScaleData scaleEntry: scaleDataList) {
{
calDB.setTime(scaleEntry.getDateTime()); calDB.setTime(scaleEntry.getDateTime());
if (addPointValue(valuesWeight, calDB.get(field), scaleEntry.getConvertedWeight(openScale.getSelectedScaleUser().scale_unit))) { if (addPointValue(valuesWeight, calDB.get(field), scaleEntry.getConvertedWeight(openScale.getSelectedScaleUser().scale_unit))) {