From 8fa84b2a61a7aff6ec9189182ceb3d3b56890c9c Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Mon, 16 Apr 2018 21:16:20 +0200 Subject: [PATCH 1/3] Fix spelling --- .../java/com/health/openscale/gui/UserAddTest.java | 4 ++-- .../core/bluetooth/BluetoothCommunication.java | 2 +- .../openscale/core/bluetooth/BluetoothMGB.java | 2 +- .../openscale/core/database/ScaleDatabase.java | 2 +- .../java/com/health/openscale/gui/MainActivity.java | 6 +++--- .../openscale/gui/fragments/GraphFragment.java | 4 ++-- .../openscale/gui/fragments/OverviewFragment.java | 2 +- .../gui/preferences/TimePreferenceDialog.java | 12 ++++++------ .../src/main/res/layout-large/fragment_overview.xml | 2 +- .../app/src/main/res/layout/fragment_overview.xml | 2 +- android_app/app/src/main/res/values/strings.xml | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java index 8109f1f1..499b6391 100644 --- a/android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java +++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java @@ -68,7 +68,7 @@ public class UserAddTest { @Rule public ActivityTestRule mActivityTestRule = new ActivityTestRule<>(MainActivity.class, false, false); - private void setLangauge(String language, String country) { + private void setLanguage(String language, String country) { Locale locale = new Locale(language, country); Locale.setDefault(locale); Resources res = context.getResources(); @@ -82,7 +82,7 @@ public class UserAddTest { context = InstrumentationRegistry.getTargetContext(); // set app language to English - setLangauge("en", "EN"); + setLanguage("en", "EN"); // Set first start to true to get the user add dialog SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java index 12f108b9..561a5bca 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java @@ -315,7 +315,7 @@ public abstract class BluetoothCommunication { * * @param value byte which is tested * @param bit bit position which is tested - * @return true if bit is set (1) ohterwise false (0) + * @return true if bit is set (1) otherwise false (0) */ protected boolean isBitSet(byte value, int bit) { return (value & (1 << bit)) != 0; diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java index 78705aea..9036bdd7 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMGB.java @@ -201,7 +201,7 @@ public class BluetoothMGB extends BluetoothCommunication { addScaleData(measurement); // Visceral fat? - // Standart weight? + // Standard weight? // WeightControl? // Body fat? // Muscle weight? diff --git a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java index ba8f0c4e..9da7e8af 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java +++ b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java @@ -143,7 +143,7 @@ public class ScaleDatabase extends SQLiteOpenHelper { cursorScaleDB.close(); } catch (SQLException ex) { - Log.e("ScaleDatabase", "SQL exception occured while getting scale data list: " + ex.getMessage()); + Log.e("ScaleDatabase", "SQL exception occurred while getting scale data list: " + ex.getMessage()); } return scaleMeasurementList; diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java index 0a841f7f..3c2bd551 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java @@ -209,7 +209,7 @@ public class MainActivity extends BaseAppCompatActivity dialog.dismiss(); Uri uri = Uri.parse("market://details?id=" + getPackageName()); Intent goToMarket = new Intent(Intent.ACTION_VIEW, uri); - // To count with Play market backstack, After pressing back button, + // To count with Play market back stack, After pressing back button, // to taken back to our application, we need to add following flags to intent. goToMarket.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET | @@ -526,8 +526,8 @@ public class MainActivity extends BaseAppCompatActivity } }; - private void setBluetoothStatusIcon(int iconRessource) { - bluetoothStatusIcon = iconRessource; + private void setBluetoothStatusIcon(int iconResource) { + bluetoothStatusIcon = iconResource; bluetoothStatus.setIcon(getResources().getDrawable(bluetoothStatusIcon)); } 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 5acb0f58..5dbac609 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 @@ -424,12 +424,12 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { } if (prefs.getBoolean("regressionLine", false)) { - PolynomialFitter.Polynomial polynom = polyFitter.getBestFit(); + PolynomialFitter.Polynomial polynomial = polyFitter.getBestFit(); Stack valuesLinearRegression = new Stack<>(); for (int i = 0; i < maxDays; i++) { - double y_value = polynom.getY(i); + double y_value = polynomial.getY(i); valuesLinearRegression.push(new PointValue((float) i, (float) y_value)); } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java index 1c1f45fa..b39834f7 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java @@ -103,7 +103,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener context = overviewView.getContext(); txtTitleUser = overviewView.findViewById(R.id.txtTitleUser); - txtTitleLastMeasurement = overviewView.findViewById(R.id.txtTitleLastMeasurment); + txtTitleLastMeasurement = overviewView.findViewById(R.id.txtTitleLastMeasurement); pieChartLast = overviewView.findViewById(R.id.pieChartLast); lineChartLast = overviewView.findViewById(R.id.lineChartLast); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java index 048a6094..b4f29a8e 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java @@ -31,16 +31,16 @@ public class TimePreferenceDialog extends DialogPreference { private Calendar calendar; private TimePicker picker = null; - public TimePreferenceDialog(Context ctxt) { - this(ctxt, null); + public TimePreferenceDialog(Context context) { + this(context, null); } - public TimePreferenceDialog(Context ctxt, AttributeSet attrs) { - this(ctxt, attrs, android.R.attr.dialogPreferenceStyle); + public TimePreferenceDialog(Context context, AttributeSet attrs) { + this(context, attrs, android.R.attr.dialogPreferenceStyle); } - public TimePreferenceDialog(Context ctxt, AttributeSet attrs, int defStyle) { - super(ctxt, attrs, defStyle); + public TimePreferenceDialog(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); setPositiveButtonText(R.string.label_ok); setNegativeButtonText(R.string.label_cancel); diff --git a/android_app/app/src/main/res/layout-large/fragment_overview.xml b/android_app/app/src/main/res/layout-large/fragment_overview.xml index 3ac90126..a4ba0edd 100644 --- a/android_app/app/src/main/res/layout-large/fragment_overview.xml +++ b/android_app/app/src/main/res/layout-large/fragment_overview.xml @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/label_title_last_measurement" - android:id="@+id/txtTitleLastMeasurment" + android:id="@+id/txtTitleLastMeasurement" android:autoText="false" android:textSize="20dp" android:typeface="monospace" /> diff --git a/android_app/app/src/main/res/layout/fragment_overview.xml b/android_app/app/src/main/res/layout/fragment_overview.xml index bf04471e..de977d3b 100644 --- a/android_app/app/src/main/res/layout/fragment_overview.xml +++ b/android_app/app/src/main/res/layout/fragment_overview.xml @@ -66,7 +66,7 @@ Ignore data that are out of range Initial weight Regression weight line - Regression polynom degree + Regression polynomial degree Goal line Help From caee1bb3f4853488a21ee9c671e89ee93f9d4ac0 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Mon, 16 Apr 2018 21:34:01 +0200 Subject: [PATCH 2/3] Minor code cleanup --- .../main/java/com/health/openscale/core/OpenScale.java | 2 +- .../health/openscale/core/bluetooth/BluetoothMiScale.java | 3 +-- .../openscale/core/bluetooth/BluetoothMiScale2.java | 3 +-- .../health/openscale/core/datatypes/ScaleMeasurement.java | 2 +- .../openscale/core/evaluation/EvaluationResult.java | 8 -------- .../health/openscale/core/evaluation/EvaluationSheet.java | 4 ++-- .../main/java/com/health/openscale/gui/MainActivity.java | 1 - .../com/health/openscale/gui/fragments/TableFragment.java | 2 -- .../openscale/gui/preferences/GeneralPreferences.java | 2 -- 9 files changed, 6 insertions(+), 21 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java index ff72ed47..79596aa1 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java @@ -319,7 +319,7 @@ public class OpenScale { for (int i = 0; i < scaleUsers.size(); i++) { List scaleUserData = measurementDAO.getAll(scaleUsers.get(i).getId()); - float lastWeight = 0; + float lastWeight; if (scaleUserData.size() > 0) { lastWeight = scaleUserData.get(0).getWeight(); diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java index c5e02178..3c93fc35 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java @@ -196,8 +196,6 @@ public class BluetoothMiScale extends BluetoothCommunication { private void parseBytes(byte[] weightBytes) { try { - float weight = 0.0f; - final byte ctrlByte = weightBytes[0]; final boolean isWeightRemoved = isBitSet(ctrlByte, 7); @@ -224,6 +222,7 @@ public class BluetoothMiScale extends BluetoothCommunication { final int min = (int) weightBytes[8]; final int sec = (int) weightBytes[9]; + float weight; if (isLBSUnit || isCattyUnit) { weight = (float) (((weightBytes[2] & 0xFF) << 8) | (weightBytes[1] & 0xFF)) / 100.0f; } else { diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java index 5e9ad0e3..44950297 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale2.java @@ -175,8 +175,6 @@ public class BluetoothMiScale2 extends BluetoothCommunication { private void parseBytes(byte[] weightBytes) { try { - float weight = 0.0f; - final byte ctrlByte0 = weightBytes[0]; final byte ctrlByte1 = weightBytes[1]; @@ -195,6 +193,7 @@ public class BluetoothMiScale2 extends BluetoothCommunication { final int min = (int) weightBytes[7]; final int sec = (int) weightBytes[8]; + float weight; if (isLBSUnit || isCattyUnit) { weight = (float) (((weightBytes[12] & 0xFF) << 8) | (weightBytes[11] & 0xFF)) / 100.0f; } else { diff --git a/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java b/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java index e6d88989..c09e9aec 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java +++ b/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java @@ -272,7 +272,7 @@ public class ScaleMeasurement implements Cloneable { } public float getBMR(ScaleUser scaleUser) { - float bmr = 0.0f; + float bmr; // BMR formula by Mifflin, St Jeor et al: A new predictive equation for resting energy expenditure in healthy individuals if (scaleUser.getGender().isMale()) { diff --git a/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationResult.java b/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationResult.java index 3fb385b0..0470217e 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationResult.java +++ b/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationResult.java @@ -24,13 +24,6 @@ public class EvaluationResult { public float highLimit; public EVAL_STATE eval_state; - public EvaluationResult() { - this.value = -1.0f; - this.lowLimit = -1.0f; - this.highLimit = -1.0f; - this.eval_state = EVAL_STATE.UNDEFINED; - } - public EvaluationResult(float value, float lowLimit, float highLimit, EVAL_STATE eval_state) { this.value = value; @@ -38,5 +31,4 @@ public class EvaluationResult { this.highLimit = highLimit; this.eval_state = eval_state; } - } diff --git a/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java b/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java index 3c74825c..ed20ca17 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java +++ b/android_app/app/src/main/java/com/health/openscale/core/evaluation/EvaluationSheet.java @@ -168,8 +168,8 @@ public class EvaluationSheet { public EvaluationResult evaluateWeight(float weight) { float body_height_squared = (evalUser.getBodyHeight() / 100.0f) * (evalUser.getBodyHeight() / 100.0f); - float lowLimit = 0.0f; - float highLimit = 0.0f; + float lowLimit; + float highLimit; if (evalUser.getGender().isMale()) { lowLimit = body_height_squared * 20.0f; diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java index 3c2bd551..a88f1055 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java @@ -46,7 +46,6 @@ import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.View; import android.widget.Toast; import com.health.openscale.BuildConfig; diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java index 8c97d678..ed993b8b 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java @@ -242,8 +242,6 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { private Spanned[][] stringCache; - private ArrayList> dataList; - public void setMeasurements(List visibleMeasurements, List scaleMeasurements, int maxSize) { diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/GeneralPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/GeneralPreferences.java index 51af6c7b..56638138 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/GeneralPreferences.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/GeneralPreferences.java @@ -31,8 +31,6 @@ import java.util.List; import java.util.Set; public class GeneralPreferences extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { - private static final String PREFERENCE_KEY_APP_THEME = "app_theme"; - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); From cd4e06bddd60c5d400eca45900266bb1fa9a8f9b Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Mon, 16 Apr 2018 21:49:26 +0200 Subject: [PATCH 3/3] Set labelFor --- .../app/src/main/res/layout-large/fragment_overview.xml | 6 +++--- .../app/src/main/res/layout/activity_usersettings.xml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/android_app/app/src/main/res/layout-large/fragment_overview.xml b/android_app/app/src/main/res/layout-large/fragment_overview.xml index a4ba0edd..68b4bf6c 100644 --- a/android_app/app/src/main/res/layout-large/fragment_overview.xml +++ b/android_app/app/src/main/res/layout-large/fragment_overview.xml @@ -57,9 +57,9 @@ android:weightSum="100"> diff --git a/android_app/app/src/main/res/layout/activity_usersettings.xml b/android_app/app/src/main/res/layout/activity_usersettings.xml index 185395a8..5a077fd8 100644 --- a/android_app/app/src/main/res/layout/activity_usersettings.xml +++ b/android_app/app/src/main/res/layout/activity_usersettings.xml @@ -163,6 +163,7 @@ android:id="@+id/lblBirthday" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:labelFor="@id/txtBirthday" android:text="@string/label_birthday" />