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

Convert some class members to local variables

Browse Source
This commit is contained in:
Erik Johansson
2018-04-14 22:00:57 +02:00
parent 7e81de663d
commit e269ede462
10 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,6 @@ public class MainActivity extends BaseAppCompatActivity
private static final int ENABLE_BLUETOOTH_REQUEST = 102; private static final int ENABLE_BLUETOOTH_REQUEST = 102;
private DrawerLayout drawerLayout; private DrawerLayout drawerLayout;
private Toolbar toolbar;
private NavigationView navDrawer; private NavigationView navDrawer;
private BottomNavigationView navBottomDrawer; private BottomNavigationView navBottomDrawer;
private ActionBarDrawerToggle drawerToggle; private ActionBarDrawerToggle drawerToggle;
@@ -105,7 +104,7 @@ public class MainActivity extends BaseAppCompatActivity
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
// Set a Toolbar to replace the ActionBar. // Set a Toolbar to replace the ActionBar.
toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setDisplayShowHomeEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true);

3
android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
View File

@@ -55,7 +55,6 @@ public class DataEntryActivity extends BaseAppCompatActivity {
private MeasurementView.MeasurementViewMode measurementViewMode; private MeasurementView.MeasurementViewMode measurementViewMode;
private List<MeasurementView> dataEntryMeasurements; private List<MeasurementView> dataEntryMeasurements;
private TableLayout tableLayoutDataEntry;
private TextView txtDataNr; private TextView txtDataNr;
private Button btnLeft; private Button btnLeft;
@@ -91,7 +90,7 @@ public class DataEntryActivity extends BaseAppCompatActivity {
context = this; context = this;
tableLayoutDataEntry = (TableLayout) findViewById(R.id.tableLayoutDataEntry); TableLayout tableLayoutDataEntry = findViewById(R.id.tableLayoutDataEntry);
dataEntryMeasurements = MeasurementView.getMeasurementList( dataEntryMeasurements = MeasurementView.getMeasurementList(
context, MeasurementView.DateTimeOrder.LAST); context, MeasurementView.DateTimeOrder.LAST);

6
android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
View File

@@ -63,9 +63,6 @@ public class UserSettingsActivity extends BaseAppCompatActivity {
private RadioGroup radioScaleUnit; private RadioGroup radioScaleUnit;
private RadioGroup radioGender; private RadioGroup radioGender;
private MenuItem saveButton;
private MenuItem deleteButton;
private DateFormat dateFormat = DateFormat.getDateInstance(); private DateFormat dateFormat = DateFormat.getDateInstance();
private Context context; private Context context;
@@ -155,8 +152,7 @@ public class UserSettingsActivity extends BaseAppCompatActivity {
item.setIcon(wrapped); item.setIcon(wrapped);
} }
saveButton = menu.findItem(R.id.saveButton); MenuItem deleteButton = menu.findItem(R.id.deleteButton);
deleteButton = menu.findItem(R.id.deleteButton);
if (getIntent().getExtras().getInt(EXTRA_MODE) == EDIT_USER_REQUEST) { if (getIntent().getExtras().getInt(EXTRA_MODE) == EDIT_USER_REQUEST) {
editMode(); editMode();

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

@@ -82,7 +82,6 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
private Button btnLeftYear; private Button btnLeftYear;
private Button btnRightYear; private Button btnRightYear;
private LinearLayout floatingActionBar; private LinearLayout floatingActionBar;
private ImageView optionMenu;
private PopupMenu popup; private PopupMenu popup;
private SharedPreferences prefs; private SharedPreferences prefs;
@@ -139,7 +138,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
floatingActionBar = (LinearLayout) graphView.findViewById(R.id.floatingActionBar); 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() { optionMenu.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

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

@@ -69,8 +69,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
private TextView txtTitleUser; private TextView txtTitleUser;
private TextView txtTitleLastMeasurement; private TextView txtTitleLastMeasurement;
private TableLayout tableOverviewLayout;
private List<MeasurementView> measurementViews; private List<MeasurementView> measurementViews;
private PieChartView pieChartLast; private PieChartView pieChartLast;
@@ -107,8 +105,6 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
txtTitleUser = (TextView) overviewView.findViewById(R.id.txtTitleUser); txtTitleUser = (TextView) overviewView.findViewById(R.id.txtTitleUser);
txtTitleLastMeasurement = (TextView) overviewView.findViewById(R.id.txtTitleLastMeasurment); txtTitleLastMeasurement = (TextView) overviewView.findViewById(R.id.txtTitleLastMeasurment);
tableOverviewLayout = (TableLayout)overviewView.findViewById(R.id.tableLayoutMeasurements);
pieChartLast = (PieChartView) overviewView.findViewById(R.id.pieChartLast); pieChartLast = (PieChartView) overviewView.findViewById(R.id.pieChartLast);
lineChartLast = (LineChartView) overviewView.findViewById(R.id.lineChartLast); lineChartLast = (LineChartView) overviewView.findViewById(R.id.lineChartLast);
@@ -122,6 +118,8 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
measurementViews = MeasurementView.getMeasurementList( measurementViews = MeasurementView.getMeasurementList(
getContext(), MeasurementView.DateTimeOrder.NONE); getContext(), MeasurementView.DateTimeOrder.NONE);
TableLayout tableOverviewLayout = overviewView.findViewById(R.id.tableLayoutMeasurements);
for (MeasurementView measurement : measurementViews) { for (MeasurementView measurement : measurementViews) {
tableOverviewLayout.addView(measurement); tableOverviewLayout.addView(measurement);
} }

13
android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java
View File

@@ -62,11 +62,6 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
private TextView txtLabelGoalDiff; private TextView txtLabelGoalDiff;
private TextView txtLabelDayLeft; private TextView txtLabelDayLeft;
private TableLayout tableWeekAveragesLayoutColumnA;
private TableLayout tableWeekAveragesLayoutColumnB;
private TableLayout tableMonthAveragesLayoutColumnA;
private TableLayout tableMonthAveragesLayoutColumnB;
private ScaleUser currentScaleUser; private ScaleUser currentScaleUser;
private ScaleMeasurement lastScaleMeasurement; private ScaleMeasurement lastScaleMeasurement;
@@ -93,10 +88,10 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
txtLabelGoalDiff = (TextView) statisticsView.findViewById(R.id.txtLabelGoalDiff); txtLabelGoalDiff = (TextView) statisticsView.findViewById(R.id.txtLabelGoalDiff);
txtLabelDayLeft = (TextView) statisticsView.findViewById(R.id.txtLabelDayLeft); txtLabelDayLeft = (TextView) statisticsView.findViewById(R.id.txtLabelDayLeft);
tableWeekAveragesLayoutColumnA = (TableLayout) statisticsView.findViewById(R.id.tableWeekAveragesLayoutColumnA); TableLayout tableWeekAveragesLayoutColumnA = statisticsView.findViewById(R.id.tableWeekAveragesLayoutColumnA);
tableWeekAveragesLayoutColumnB = (TableLayout) statisticsView.findViewById(R.id.tableWeekAveragesLayoutColumnB); TableLayout tableWeekAveragesLayoutColumnB = statisticsView.findViewById(R.id.tableWeekAveragesLayoutColumnB);
tableMonthAveragesLayoutColumnA = (TableLayout) statisticsView.findViewById(R.id.tableMonthAveragesLayoutColumnA); TableLayout tableMonthAveragesLayoutColumnA = statisticsView.findViewById(R.id.tableMonthAveragesLayoutColumnA);
tableMonthAveragesLayoutColumnB = (TableLayout) statisticsView.findViewById(R.id.tableMonthAveragesLayoutColumnB); TableLayout tableMonthAveragesLayoutColumnB = statisticsView.findViewById(R.id.tableMonthAveragesLayoutColumnB);
viewMeasurementsListWeek = new ArrayList<>(); viewMeasurementsListWeek = new ArrayList<>();

7
android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java
View File

@@ -45,19 +45,16 @@ public class BackupPreferences extends PreferenceFragment {
private static final String PREFERENCE_KEY_IMPORT_BACKUP = "importBackup"; private static final String PREFERENCE_KEY_IMPORT_BACKUP = "importBackup";
private static final String PREFERENCE_KEY_EXPORT_BACKUP = "exportBackup"; private static final String PREFERENCE_KEY_EXPORT_BACKUP = "exportBackup";
private Preference importBackup;
private Preference exportBackup;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.backup_preferences); addPreferencesFromResource(R.xml.backup_preferences);
importBackup = (Preference) findPreference(PREFERENCE_KEY_IMPORT_BACKUP); Preference importBackup = findPreference(PREFERENCE_KEY_IMPORT_BACKUP);
importBackup.setOnPreferenceClickListener(new onClickListenerImportBackup()); importBackup.setOnPreferenceClickListener(new onClickListenerImportBackup());
exportBackup = (Preference) findPreference(PREFERENCE_KEY_EXPORT_BACKUP); Preference exportBackup = findPreference(PREFERENCE_KEY_EXPORT_BACKUP);
exportBackup.setOnPreferenceClickListener(new onClickListenerExportBackup()); exportBackup.setOnPreferenceClickListener(new onClickListenerExportBackup());
initSummary(getPreferenceScreen()); initSummary(getPreferenceScreen());

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

@@ -33,16 +33,12 @@ import java.util.Set;
public class GeneralPreferences extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { public class GeneralPreferences extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String PREFERENCE_KEY_APP_THEME = "app_theme"; private static final String PREFERENCE_KEY_APP_THEME = "app_theme";
private ListPreference appThemeList;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.general_preferences); addPreferencesFromResource(R.xml.general_preferences);
appThemeList = (ListPreference)findPreference(PREFERENCE_KEY_APP_THEME);
initSummary(getPreferenceScreen()); initSummary(getPreferenceScreen());
} }

3
android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java
View File

@@ -55,7 +55,6 @@ public class MeasurementPreferences extends PreferenceFragment {
public static final String PREFERENCE_KEY_RESET_ORDER = "resetOrder"; public static final String PREFERENCE_KEY_RESET_ORDER = "resetOrder";
public static final String PREFERENCE_KEY_MEASUREMENTS = "measurements"; public static final String PREFERENCE_KEY_MEASUREMENTS = "measurements";
private Preference deleteAll;
private PreferenceCategory measurementCategory; private PreferenceCategory measurementCategory;
@Override @Override
@@ -64,7 +63,7 @@ public class MeasurementPreferences extends PreferenceFragment {
addPreferencesFromResource(R.xml.measurement_preferences); addPreferencesFromResource(R.xml.measurement_preferences);
deleteAll = findPreference(PREFERENCE_KEY_DELETE_ALL); Preference deleteAll = findPreference(PREFERENCE_KEY_DELETE_ALL);
deleteAll.setOnPreferenceClickListener(new onClickListenerDeleteAll()); deleteAll.setOnPreferenceClickListener(new onClickListenerDeleteAll());
measurementCategory = (PreferenceCategory) findPreference(PREFERENCE_KEY_MEASUREMENTS); measurementCategory = (PreferenceCategory) findPreference(PREFERENCE_KEY_MEASUREMENTS);

2
android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
View File

@@ -89,7 +89,7 @@ public abstract class MeasurementView extends TableLayout {
public enum DateTimeOrder { FIRST, LAST, NONE } public enum DateTimeOrder { FIRST, LAST, NONE }
public static final List<MeasurementView> getMeasurementList( public static List<MeasurementView> getMeasurementList(
Context context, DateTimeOrder dateTimeOrder) { Context context, DateTimeOrder dateTimeOrder) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);