From e269ede4621cc292f600bc7239fa2764e88e06f8 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sat, 14 Apr 2018 22:00:57 +0200 Subject: [PATCH] Convert some class members to local variables --- .../java/com/health/openscale/gui/MainActivity.java | 3 +-- .../openscale/gui/activities/DataEntryActivity.java | 3 +-- .../gui/activities/UserSettingsActivity.java | 6 +----- .../openscale/gui/fragments/GraphFragment.java | 3 +-- .../openscale/gui/fragments/OverviewFragment.java | 6 ++---- .../openscale/gui/fragments/StatisticsFragment.java | 13 ++++--------- .../gui/preferences/BackupPreferences.java | 7 ++----- .../gui/preferences/GeneralPreferences.java | 4 ---- .../gui/preferences/MeasurementPreferences.java | 3 +-- .../health/openscale/gui/views/MeasurementView.java | 2 +- 10 files changed, 14 insertions(+), 36 deletions(-) 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 2e7d2939..73c59255 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 @@ -84,7 +84,6 @@ public class MainActivity extends BaseAppCompatActivity private static final int ENABLE_BLUETOOTH_REQUEST = 102; private DrawerLayout drawerLayout; - private Toolbar toolbar; private NavigationView navDrawer; private BottomNavigationView navBottomDrawer; private ActionBarDrawerToggle drawerToggle; @@ -105,7 +104,7 @@ public class MainActivity extends BaseAppCompatActivity setContentView(R.layout.activity_main); // Set a Toolbar to replace the ActionBar. - toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setDisplayShowHomeEnabled(true); 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 d61abb1d..f8fead5e 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 @@ -55,7 +55,6 @@ public class DataEntryActivity extends BaseAppCompatActivity { private MeasurementView.MeasurementViewMode measurementViewMode; private List dataEntryMeasurements; - private TableLayout tableLayoutDataEntry; private TextView txtDataNr; private Button btnLeft; @@ -91,7 +90,7 @@ public class DataEntryActivity extends BaseAppCompatActivity { context = this; - tableLayoutDataEntry = (TableLayout) findViewById(R.id.tableLayoutDataEntry); + TableLayout tableLayoutDataEntry = findViewById(R.id.tableLayoutDataEntry); dataEntryMeasurements = MeasurementView.getMeasurementList( context, MeasurementView.DateTimeOrder.LAST); 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 4299beb6..b2e835f3 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 @@ -63,9 +63,6 @@ public class UserSettingsActivity extends BaseAppCompatActivity { private RadioGroup radioScaleUnit; private RadioGroup radioGender; - private MenuItem saveButton; - private MenuItem deleteButton; - private DateFormat dateFormat = DateFormat.getDateInstance(); private Context context; @@ -155,8 +152,7 @@ public class UserSettingsActivity extends BaseAppCompatActivity { item.setIcon(wrapped); } - saveButton = menu.findItem(R.id.saveButton); - deleteButton = menu.findItem(R.id.deleteButton); + MenuItem deleteButton = menu.findItem(R.id.deleteButton); if (getIntent().getExtras().getInt(EXTRA_MODE) == EDIT_USER_REQUEST) { editMode(); 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 65ca0527..06b05814 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 @@ -82,7 +82,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { private Button btnLeftYear; private Button btnRightYear; private LinearLayout floatingActionBar; - private ImageView optionMenu; private PopupMenu popup; private SharedPreferences prefs; @@ -139,7 +138,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { floatingActionBar = (LinearLayout) graphView.findViewById(R.id.floatingActionBar); - optionMenu = (ImageView) graphView.findViewById(R.id.optionMenu); + ImageView optionMenu = graphView.findViewById(R.id.optionMenu); optionMenu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { 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 0c2dbd34..b251f41d 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 @@ -69,8 +69,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener private TextView txtTitleUser; private TextView txtTitleLastMeasurement; - private TableLayout tableOverviewLayout; - private List measurementViews; private PieChartView pieChartLast; @@ -107,8 +105,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener txtTitleUser = (TextView) overviewView.findViewById(R.id.txtTitleUser); txtTitleLastMeasurement = (TextView) overviewView.findViewById(R.id.txtTitleLastMeasurment); - tableOverviewLayout = (TableLayout)overviewView.findViewById(R.id.tableLayoutMeasurements); - pieChartLast = (PieChartView) overviewView.findViewById(R.id.pieChartLast); lineChartLast = (LineChartView) overviewView.findViewById(R.id.lineChartLast); @@ -122,6 +118,8 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener measurementViews = MeasurementView.getMeasurementList( getContext(), MeasurementView.DateTimeOrder.NONE); + TableLayout tableOverviewLayout = overviewView.findViewById(R.id.tableLayoutMeasurements); + for (MeasurementView measurement : measurementViews) { tableOverviewLayout.addView(measurement); } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java index c1da5415..8a4020ab 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java @@ -62,11 +62,6 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen private TextView txtLabelGoalDiff; private TextView txtLabelDayLeft; - private TableLayout tableWeekAveragesLayoutColumnA; - private TableLayout tableWeekAveragesLayoutColumnB; - private TableLayout tableMonthAveragesLayoutColumnA; - private TableLayout tableMonthAveragesLayoutColumnB; - private ScaleUser currentScaleUser; private ScaleMeasurement lastScaleMeasurement; @@ -93,10 +88,10 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen txtLabelGoalDiff = (TextView) statisticsView.findViewById(R.id.txtLabelGoalDiff); txtLabelDayLeft = (TextView) statisticsView.findViewById(R.id.txtLabelDayLeft); - tableWeekAveragesLayoutColumnA = (TableLayout) statisticsView.findViewById(R.id.tableWeekAveragesLayoutColumnA); - tableWeekAveragesLayoutColumnB = (TableLayout) statisticsView.findViewById(R.id.tableWeekAveragesLayoutColumnB); - tableMonthAveragesLayoutColumnA = (TableLayout) statisticsView.findViewById(R.id.tableMonthAveragesLayoutColumnA); - tableMonthAveragesLayoutColumnB = (TableLayout) statisticsView.findViewById(R.id.tableMonthAveragesLayoutColumnB); + TableLayout tableWeekAveragesLayoutColumnA = statisticsView.findViewById(R.id.tableWeekAveragesLayoutColumnA); + TableLayout tableWeekAveragesLayoutColumnB = statisticsView.findViewById(R.id.tableWeekAveragesLayoutColumnB); + TableLayout tableMonthAveragesLayoutColumnA = statisticsView.findViewById(R.id.tableMonthAveragesLayoutColumnA); + TableLayout tableMonthAveragesLayoutColumnB = statisticsView.findViewById(R.id.tableMonthAveragesLayoutColumnB); viewMeasurementsListWeek = new ArrayList<>(); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java index f75693e8..fca37278 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java @@ -45,19 +45,16 @@ public class BackupPreferences extends PreferenceFragment { private static final String PREFERENCE_KEY_IMPORT_BACKUP = "importBackup"; private static final String PREFERENCE_KEY_EXPORT_BACKUP = "exportBackup"; - private Preference importBackup; - private Preference exportBackup; - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.backup_preferences); - importBackup = (Preference) findPreference(PREFERENCE_KEY_IMPORT_BACKUP); + Preference importBackup = findPreference(PREFERENCE_KEY_IMPORT_BACKUP); importBackup.setOnPreferenceClickListener(new onClickListenerImportBackup()); - exportBackup = (Preference) findPreference(PREFERENCE_KEY_EXPORT_BACKUP); + Preference exportBackup = findPreference(PREFERENCE_KEY_EXPORT_BACKUP); exportBackup.setOnPreferenceClickListener(new onClickListenerExportBackup()); initSummary(getPreferenceScreen()); 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 309401da..51af6c7b 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 @@ -33,16 +33,12 @@ import java.util.Set; public class GeneralPreferences extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { private static final String PREFERENCE_KEY_APP_THEME = "app_theme"; - private ListPreference appThemeList; - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.general_preferences); - appThemeList = (ListPreference)findPreference(PREFERENCE_KEY_APP_THEME); - initSummary(getPreferenceScreen()); } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java index 035a3711..cf7f65e0 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java @@ -55,7 +55,6 @@ public class MeasurementPreferences extends PreferenceFragment { public static final String PREFERENCE_KEY_RESET_ORDER = "resetOrder"; public static final String PREFERENCE_KEY_MEASUREMENTS = "measurements"; - private Preference deleteAll; private PreferenceCategory measurementCategory; @Override @@ -64,7 +63,7 @@ public class MeasurementPreferences extends PreferenceFragment { addPreferencesFromResource(R.xml.measurement_preferences); - deleteAll = findPreference(PREFERENCE_KEY_DELETE_ALL); + Preference deleteAll = findPreference(PREFERENCE_KEY_DELETE_ALL); deleteAll.setOnPreferenceClickListener(new onClickListenerDeleteAll()); measurementCategory = (PreferenceCategory) findPreference(PREFERENCE_KEY_MEASUREMENTS); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java index b7414074..1103240b 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java @@ -89,7 +89,7 @@ public abstract class MeasurementView extends TableLayout { public enum DateTimeOrder { FIRST, LAST, NONE } - public static final List getMeasurementList( + public static List getMeasurementList( Context context, DateTimeOrder dateTimeOrder) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);