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

Fix spelling

Browse Source
This commit is contained in:
Erik Johansson
2018-04-16 21:16:20 +02:00
parent b0db99c9de
commit 8fa84b2a61
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java
View File

@@ -68,7 +68,7 @@ public class UserAddTest {
@Rule @Rule
public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class, false, false); public ActivityTestRule<MainActivity> 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 locale = new Locale(language, country);
Locale.setDefault(locale); Locale.setDefault(locale);
Resources res = context.getResources(); Resources res = context.getResources();
@@ -82,7 +82,7 @@ public class UserAddTest {
context = InstrumentationRegistry.getTargetContext(); context = InstrumentationRegistry.getTargetContext();
// set app language to English // set app language to English
setLangauge("en", "EN"); setLanguage("en", "EN");
// Set first start to true to get the user add dialog // Set first start to true to get the user add dialog
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

2
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
View File

@@ -315,7 +315,7 @@ public abstract class BluetoothCommunication {
* *
* @param value byte which is tested * @param value byte which is tested
* @param bit bit position 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) { protected boolean isBitSet(byte value, int bit) {
return (value & (1 << bit)) != 0; return (value & (1 << bit)) != 0;

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

@@ -201,7 +201,7 @@ public class BluetoothMGB extends BluetoothCommunication {
addScaleData(measurement); addScaleData(measurement);
// Visceral fat? // Visceral fat?
// Standart weight? // Standard weight?
// WeightControl? // WeightControl?
// Body fat? // Body fat?
// Muscle weight? // Muscle weight?

2
android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java
View File

@@ -143,7 +143,7 @@ public class ScaleDatabase extends SQLiteOpenHelper {
cursorScaleDB.close(); cursorScaleDB.close();
} catch (SQLException ex) { } 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; return scaleMeasurementList;

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

@@ -526,8 +526,8 @@ public class MainActivity extends BaseAppCompatActivity
} }
}; };
private void setBluetoothStatusIcon(int iconRessource) { private void setBluetoothStatusIcon(int iconResource) {
bluetoothStatusIcon = iconRessource; bluetoothStatusIcon = iconResource;
bluetoothStatus.setIcon(getResources().getDrawable(bluetoothStatusIcon)); bluetoothStatus.setIcon(getResources().getDrawable(bluetoothStatusIcon));
} }

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

@@ -424,12 +424,12 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
} }
if (prefs.getBoolean("regressionLine", false)) { if (prefs.getBoolean("regressionLine", false)) {
PolynomialFitter.Polynomial polynom = polyFitter.getBestFit(); PolynomialFitter.Polynomial polynomial = polyFitter.getBestFit();
Stack<PointValue> valuesLinearRegression = new Stack<>(); Stack<PointValue> valuesLinearRegression = new Stack<>();
for (int i = 0; i < maxDays; i++) { 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)); valuesLinearRegression.push(new PointValue((float) i, (float) y_value));
} }

2
android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java
View File

@@ -103,7 +103,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
context = overviewView.getContext(); context = overviewView.getContext();
txtTitleUser = overviewView.findViewById(R.id.txtTitleUser); txtTitleUser = overviewView.findViewById(R.id.txtTitleUser);
txtTitleLastMeasurement = overviewView.findViewById(R.id.txtTitleLastMeasurment); txtTitleLastMeasurement = overviewView.findViewById(R.id.txtTitleLastMeasurement);
pieChartLast = overviewView.findViewById(R.id.pieChartLast); pieChartLast = overviewView.findViewById(R.id.pieChartLast);
lineChartLast = overviewView.findViewById(R.id.lineChartLast); lineChartLast = overviewView.findViewById(R.id.lineChartLast);

12
android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java
View File

@@ -31,16 +31,16 @@ public class TimePreferenceDialog extends DialogPreference {
private Calendar calendar; private Calendar calendar;
private TimePicker picker = null; private TimePicker picker = null;
public TimePreferenceDialog(Context ctxt) { public TimePreferenceDialog(Context context) {
this(ctxt, null); this(context, null);
} }
public TimePreferenceDialog(Context ctxt, AttributeSet attrs) { public TimePreferenceDialog(Context context, AttributeSet attrs) {
this(ctxt, attrs, android.R.attr.dialogPreferenceStyle); this(context, attrs, android.R.attr.dialogPreferenceStyle);
} }
public TimePreferenceDialog(Context ctxt, AttributeSet attrs, int defStyle) { public TimePreferenceDialog(Context context, AttributeSet attrs, int defStyle) {
super(ctxt, attrs, defStyle); super(context, attrs, defStyle);
setPositiveButtonText(R.string.label_ok); setPositiveButtonText(R.string.label_ok);
setNegativeButtonText(R.string.label_cancel); setNegativeButtonText(R.string.label_cancel);

2
android_app/app/src/main/res/layout-large/fragment_overview.xml
View File

@@ -75,7 +75,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_title_last_measurement" android:text="@string/label_title_last_measurement"
android:id="@+id/txtTitleLastMeasurment" android:id="@+id/txtTitleLastMeasurement"
android:autoText="false" android:autoText="false"
android:textSize="20dp" android:textSize="20dp"
android:typeface="monospace" /> android:typeface="monospace" />

2
android_app/app/src/main/res/layout/fragment_overview.xml
View File

@@ -66,7 +66,7 @@
<TextView <TextView
android:id="@+id/txtTitleLastMeasurment" android:id="@+id/txtTitleLastMeasurement"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autoText="false" android:autoText="false"

2
android_app/app/src/main/res/values/strings.xml
View File

@@ -156,7 +156,7 @@
<string name="label_ignoreOutOfRange">Ignore data that are out of range</string> <string name="label_ignoreOutOfRange">Ignore data that are out of range</string>
<string name="label_initial_weight">Initial weight</string> <string name="label_initial_weight">Initial weight</string>
<string name="label_regression_line">Regression weight line</string> <string name="label_regression_line">Regression weight line</string>
<string name="label_regression_line_degree">Regression polynom degree</string> <string name="label_regression_line_degree">Regression polynomial degree</string>
<string name="label_goal_line">Goal line</string> <string name="label_goal_line">Goal line</string>
<string name="label_help">Help</string> <string name="label_help">Help</string>