From e892b87d439d273db32bbe03f5d60b5daae817e2 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sat, 25 Nov 2017 18:18:42 +0100 Subject: [PATCH] Remove trailing whitespace --- .../bluetooth/BluetoothCustomOpenScale.java | 2 +- .../openscale/core/database/ScaleDatabase.java | 18 +++++++++--------- .../core/database/ScaleUserDatabase.java | 8 ++++---- .../com/health/openscale/gui/MainActivity.java | 12 ++++++------ .../gui/activities/DataEntryActivity.java | 2 +- .../gui/activities/UserSettingsActivity.java | 2 +- .../openscale/gui/fragments/GraphFragment.java | 8 ++++---- .../openscale/gui/fragments/TableFragment.java | 6 +++--- .../app/src/main/res/drawable/rect_normal.xml | 2 +- .../app/src/main/res/values-pl/strings.xml | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java index 386ca836..8220918e 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCustomOpenScale.java @@ -142,7 +142,7 @@ public class BluetoothCustomOpenScale extends BluetoothCommunication { btConnectThread = null; } } - + public void clearEEPROM() { sendBtData("9"); 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 a5777d00..8695f3c6 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 @@ -32,10 +32,10 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Locale; -public class ScaleDatabase extends SQLiteOpenHelper { +public class ScaleDatabase extends SQLiteOpenHelper { private static final int DATABASE_VERSION = 6; - private static final String DATABASE_NAME = "openScaleDatabase.db"; - + private static final String DATABASE_NAME = "openScaleDatabase.db"; + private static final String TABLE_NAME = "scaledata"; private static final String COLUMN_NAME_ID = "id"; private static final String COLUMN_NAME_USER_ID = "user_id"; @@ -50,15 +50,15 @@ public class ScaleDatabase extends SQLiteOpenHelper { private static final String COLUMN_NAME_HIP = "hip"; private static final String COLUMN_NAME_COMMENT = "comment"; private static final String COLUMN_NAME_ENABLE = "enable"; - - private static final String SQL_CREATE_ENTRIES = - "CREATE TABLE " + TABLE_NAME + " (" + + + private static final String SQL_CREATE_ENTRIES = + "CREATE TABLE " + TABLE_NAME + " (" + COLUMN_NAME_ID + " INTEGER PRIMARY KEY," + COLUMN_NAME_USER_ID + " INTEGER," + COLUMN_NAME_DATE_TIME + " TEXT," + COLUMN_NAME_WEIGHT + " REAL," + COLUMN_NAME_FAT + " REAL," + - COLUMN_NAME_WATER + " REAL," + + COLUMN_NAME_WATER + " REAL," + COLUMN_NAME_MUSCLE + " REAL," + COLUMN_NAME_LBW + " REAL," + COLUMN_NAME_BONE + " REAL," + @@ -125,7 +125,7 @@ public class ScaleDatabase extends SQLiteOpenHelper { db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN " + COLUMN_NAME_LBW + " REAL DEFAULT 0"); } } - + public void clearScaleData(int userId) { dbWrite.delete(TABLE_NAME, COLUMN_NAME_USER_ID + "=" + Integer.toString(userId), null); } @@ -395,7 +395,7 @@ public class ScaleDatabase extends SQLiteOpenHelper { } catch (SQLException ex) { Log.e("ScaleDatabase", "SQL exception occured while getting scale data list: " + ex.getMessage()); } - + return scaleDataList; } diff --git a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java index 4131a399..e7f7b83e 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java +++ b/android_app/app/src/main/java/com/health/openscale/core/database/ScaleUserDatabase.java @@ -97,10 +97,10 @@ public class ScaleUserDatabase extends SQLiteOpenHelper { db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN " + COLUMN_NAME_INITIAL_WEIGHT + " REAL DEFAULT 0"); } } - + public void clearDatabase() { SQLiteDatabase db = getWritableDatabase(); - + db.delete(TABLE_NAME, null, null); } @@ -196,12 +196,12 @@ public class ScaleUserDatabase extends SQLiteOpenHelper { while (!cursorScaleDB.isAfterLast()) { scaleUserDBEntries.add(readAtCursor(cursorScaleDB)); - + cursorScaleDB.moveToNext(); } cursorScaleDB.close(); - + return scaleUserDBEntries; } 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 39feed8b..b207ba41 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 @@ -54,7 +54,7 @@ import java.util.Locale; public class MainActivity extends ActionBarActivity implements ActionBar.TabListener { - + /** * The {@link android.support.v4.view.PagerAdapter} that will provide * fragments for each of the sections. We use a {@link FragmentPagerAdapter} @@ -81,7 +81,7 @@ public class MainActivity extends ActionBarActivity implements setContentView(R.layout.activity_main); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - + // Set up the action bar. final ActionBar actionBar = getSupportActionBar(); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); @@ -285,15 +285,15 @@ public class MainActivity extends ActionBarActivity implements * one of the sections/tabs/pages. */ public class SectionsPagerAdapter extends FragmentPagerAdapter { - + private OverviewFragment overviewFrag; private GraphFragment graphFrag; private TableFragment tableFrag; private StatisticsFragment statisticsFrag; - + public SectionsPagerAdapter(FragmentManager fm) { super(fm); - + overviewFrag = new OverviewFragment(); graphFrag = new GraphFragment(); tableFrag = new TableFragment(); @@ -305,7 +305,7 @@ public class MainActivity extends ActionBarActivity implements // getItem is called to instantiate the fragment for the given page. // Return a PlaceholderFragment (defined as a static inner class // below). - + switch (position) { case 0: return overviewFrag; diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java index f6d34b90..28fc5492 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java @@ -93,7 +93,7 @@ public class DataEntryActivity extends Activity { private long id; private Context context; - + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java index e7cd1af4..2303c1d3 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java @@ -64,7 +64,7 @@ public class UserSettingsActivity extends Activity { private DateFormat dateFormat = DateFormat.getDateInstance(); private Context context; - + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); 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 627281a9..8c63ad54 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 @@ -63,7 +63,7 @@ import lecho.lib.hellocharts.util.ChartUtils; import lecho.lib.hellocharts.view.ColumnChartView; import lecho.lib.hellocharts.view.LineChartView; -public class GraphFragment extends Fragment implements FragmentUpdateListener { +public class GraphFragment extends Fragment implements FragmentUpdateListener { private View graphView; private LineChartView chartBottom; private ColumnChartView chartTop; @@ -94,10 +94,10 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { graphView = inflater.inflate(R.layout.fragment_graph, container, false); - + chartBottom = (LineChartView) graphView.findViewById(R.id.chart_bottom); chartTop = (ColumnChartView) graphView.findViewById(R.id.chart_top); @@ -184,7 +184,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { return graphView; } - + @Override public void updateOnView(ArrayList scaleDataList) { 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 fb670ee0..04d7949c 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 @@ -85,9 +85,9 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { private int selectedSubpageNr; public TableFragment() { - + } - + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -131,7 +131,7 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { return tableView; } - + @Override public void updateOnView(ArrayList scaleDataList) { diff --git a/android_app/app/src/main/res/drawable/rect_normal.xml b/android_app/app/src/main/res/drawable/rect_normal.xml index 08cb20d6..c5c3b997 100644 --- a/android_app/app/src/main/res/drawable/rect_normal.xml +++ b/android_app/app/src/main/res/drawable/rect_normal.xml @@ -1,7 +1,7 @@ - + diff --git a/android_app/app/src/main/res/values-pl/strings.xml b/android_app/app/src/main/res/values-pl/strings.xml index 42f4f64d..56228709 100644 --- a/android_app/app/src/main/res/values-pl/strings.xml +++ b/android_app/app/src/main/res/values-pl/strings.xml @@ -35,7 +35,7 @@ Stosunek obwodu talii do obwodu bioder Masa kostna Inteligente przypisywanie użytkowników - + dni pomiarów Ostatnie 7 dni