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

Clean up space around if, for, functions etc.

Browse Source
This commit is contained in:
Erik Johansson
2017-11-25 18:46:18 +01:00
parent f2857204ff
commit 5756ffa92f
19 changed files with 95 additions and 103 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) {
super(context);
}
@@ -196,8 +194,7 @@ public class BluetoothMGB extends BluetoothCommunication {
popInt(); //unknown =00
popInt(); //unknown =00
}else
if( hdr_1 == 0x01 && hdr_2 == 0x00 ){
} else if (hdr_1 == 0x01 && hdr_2 == 0x00) {
measurement.setMuscle(popFloat());
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;
if( txtUserName.getText().toString().length() == 0 )
{
if (txtUserName.getText().toString().length() == 0) {
txtUserName.setError(getResources().getString(R.string.error_user_name_required));
validate = false;
}
if( txtBodyHeight.getText().toString().length() == 0 )
{
if (txtBodyHeight.getText().toString().length() == 0) {
txtBodyHeight.setError(getResources().getString(R.string.error_body_height_required));
validate = false;
}
if( txtInitialWeight.getText().toString().length() == 0 )
{
if (txtInitialWeight.getText().toString().length() == 0) {
txtInitialWeight.setError(getResources().getString(R.string.error_initial_weight_required));
validate = false;
}
if( txtGoalWeight.getText().toString().length() == 0 )
{
if (txtGoalWeight.getText().toString().length() == 0) {
txtGoalWeight.setError(getResources().getString(R.string.error_goal_weight_required));
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<>();
for(ScaleData scaleEntry: scaleDataList)
{
for (ScaleData scaleEntry: scaleDataList) {
calDB.setTime(scaleEntry.getDateTime());
if (addPointValue(valuesWeight, calDB.get(field), scaleEntry.getConvertedWeight(openScale.getSelectedScaleUser().scale_unit))) {