eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 06:28:41 +00:00
Code Activity

feat: show all settings also before regatta is selected

Browse Source
This commit is contained in:
Robert Benedikt
2020-12-17 18:45:49 +01:00
parent e72cbfc571
commit 68c767aa03
3 changed files with 101 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/PreferenceActivity.java
+23 -25
View File
@@ -1,13 +1,5 @@
package com.sap.sailing.racecommittee.app.ui.activities;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.util.AppUtils;
import com.sap.sailing.domain.base.racegroup.RaceGroup;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.ui.fragments.MainPreferenceFragment;
import com.sap.sailing.racecommittee.app.ui.fragments.preference.RegattaPreferenceFragment;
import com.sap.sailing.racecommittee.app.utils.PreferenceHelper;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
@@ -15,12 +7,21 @@ import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.Window;
import android.view.WindowManager;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.util.AppUtils;
import com.sap.sailing.domain.base.racegroup.RaceGroup;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.ui.fragments.MainPreferenceFragment;
import com.sap.sailing.racecommittee.app.ui.fragments.preference.RegattaPreferenceFragment;
import com.sap.sailing.racecommittee.app.utils.PreferenceHelper;
public class PreferenceActivity extends AppCompatActivity {
public static final String SPECIFIC_REGATTA_PREFERENCES_NAME = "REGATTA_PREFERENCES_";
@@ -49,7 +50,7 @@ public class PreferenceActivity extends AppCompatActivity {
AppUtils.lockOrientation(this);
setContentView(R.layout.preference_view);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
Toolbar toolbar = findViewById(R.id.toolbar);
if (toolbar != null) {
setSupportActionBar(toolbar);
@@ -66,9 +67,11 @@ public class PreferenceActivity extends AppCompatActivity {
if (getIntent() != null && getIntent().getExtras() != null) {
Bundle bundle = getIntent().getExtras();
if (bundle.containsKey(EXTRA_SHOW_FRAGMENT)) {
String className = bundle.getString(EXTRA_SHOW_FRAGMENT);
final String className = bundle.getString(EXTRA_SHOW_FRAGMENT);
try {
fragment = (Fragment) Class.forName(className).newInstance();
if (className != null) {
fragment = (Fragment) Class.forName(className).newInstance();
}
} catch (InstantiationException ex) {
ExLog.ex(this, TAG, ex);
} catch (IllegalAccessException ex) {
@@ -81,7 +84,10 @@ public class PreferenceActivity extends AppCompatActivity {
if (info != null) {
String raceGroupName = info.getString(EXTRA_SPECIFIC_REGATTA_NAME);
String title = getString(R.string.preference_regatta_specific_title, raceGroupName);
getSupportActionBar().setTitle(title);
final ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(title);
}
if (fragment != null) {
fragment.setArguments(info);
}
@@ -114,26 +120,18 @@ public class PreferenceActivity extends AppCompatActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
if (item.getItemId() == android.R.id.home) {
onBackPressed();
return true;
default:
return super.onOptionsItemSelected(item);
}
return super.onOptionsItemSelected(item);
}
@Override
public void onBackPressed() {
if (getFragmentManager().getBackStackEntryCount() > 0) {
if (getSupportActionBar() != null) {
getSupportActionBar().setTitle(getString(R.string.settings_activity_title));
}
getFragmentManager().popBackStack();
getFragmentManager().beginTransaction().commit();
} else {
super.onBackPressed();
if (getSupportActionBar() != null) {
getSupportActionBar().setTitle(getString(R.string.settings_activity_title));
}
super.onBackPressed();
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginBackdrop.java
+1 -4
View File
@@ -47,7 +47,6 @@ import com.sap.sailing.racecommittee.app.ui.activities.BaseActivity;
import com.sap.sailing.racecommittee.app.ui.activities.LoginActivity;
import com.sap.sailing.racecommittee.app.ui.activities.PreferenceActivity;
import com.sap.sailing.racecommittee.app.ui.activities.SystemInformationActivity;
import com.sap.sailing.racecommittee.app.ui.fragments.preference.GeneralPreferenceFragment;
import com.sap.sailing.racecommittee.app.utils.QRHelper;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
@@ -196,9 +195,7 @@ public class LoginBackdrop extends Fragment implements BackPressListener {
}
private void openSettings() {
Intent intent = new Intent(getActivity(), PreferenceActivity.class);
intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, GeneralPreferenceFragment.class.getName());
startActivity(intent);
startActivity(new Intent(requireContext(), PreferenceActivity.class));
}
private void requestQRCodeScan() {
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/MainPreferenceFragment.java
+77 -87
View File
@@ -2,14 +2,15 @@ package com.sap.sailing.racecommittee.app.ui.fragments;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.GridLayoutManager;
@@ -17,7 +18,6 @@ import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;
@@ -69,71 +69,59 @@ public class MainPreferenceFragment extends LoggableFragment {
RegattaSpecificPreferenceFragment.class.getName()));
items.add(new PreferenceItem(getString(R.string.settings_category_course_designer),
R.drawable.ic_pin_drop_yellow_24dp, CourseDesignerPreferenceFragment.class.getName()));
items.add(new PreferenceItem(getString(R.string.reload_config), R.drawable.ic_autorenew_yellow_24dp,
new Runnable() {
@Override
public void run() {
String deviceConfigurationName = AppPreferences.on(getActivity()).getDeviceConfigurationName();
UUID deviceConfigurationUuid = AppPreferences.on(getActivity()).getDeviceConfigurationUuid();
LoaderManager.LoaderCallbacks<?> configurationLoader = DataManager.create(getActivity())
.createConfigurationLoader(deviceConfigurationName, deviceConfigurationUuid, new LoadClient<DeviceConfiguration>() {
items.add(new PreferenceItem(getString(R.string.reload_config), R.drawable.ic_autorenew_yellow_24dp, () -> {
String deviceConfigurationName = AppPreferences.on(getActivity()).getDeviceConfigurationName();
UUID deviceConfigurationUuid = AppPreferences.on(getActivity()).getDeviceConfigurationUuid();
LoaderManager.LoaderCallbacks<?> configurationLoader = DataManager.create(getActivity())
.createConfigurationLoader(deviceConfigurationName, deviceConfigurationUuid, new LoadClient<DeviceConfiguration>() {
@Override
public void onLoadFailed(int loaderId, Exception reason) {
if (reason instanceof FileNotFoundException) {
Toast.makeText(getActivity(),
getString(R.string.loading_configuration_not_found),
Toast.LENGTH_LONG).show();
ExLog.w(getActivity(), TAG, String.format(
"There seems to be no configuration for this device: %s",
reason.toString()));
} else {
Toast.makeText(getActivity(),
getString(R.string.loading_configuration_failed),
Toast.LENGTH_LONG).show();
ExLog.ex(getActivity(), TAG, reason);
}
}
@Override
public void onLoadSucceeded(int loaderId, DeviceConfiguration configuration,
boolean isCached) {
getLoaderManager().destroyLoader(0);
// this is our 'global' configuration, let's store it in app preferences
PreferencesDeviceConfigurationLoader
.wrap(configuration, AppPreferences.on(getActivity())).store();
Toast.makeText(getActivity(),
getString(R.string.loading_configuration_succeded),
Toast.LENGTH_LONG).show();
}
});
getLoaderManager().initLoader(0, null, configurationLoader).forceLoad();
}
}));
items.add(new PreferenceItem(getString(R.string.logout), R.drawable.ic_logout_yellow_24dp, new Runnable() {
@Override
public void run() {
new AlertDialog.Builder(requireContext())
.setTitle(R.string.logout_dialog_title)
.setMessage(getString(R.string.logout_dialog_message))
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
final Activity activity = requireActivity();
AppPreferences.on(activity).setAccessToken(null);
DataManager dataManager = (DataManager) DataManager.create(activity);
dataManager.resetAll();
RaceApplication.getInstance().restart();
@Override
public void onLoadFailed(int loaderId, Exception reason) {
if (reason instanceof FileNotFoundException) {
Toast.makeText(getActivity(),
getString(R.string.loading_configuration_not_found),
Toast.LENGTH_LONG).show();
ExLog.w(getActivity(), TAG, String.format(
"There seems to be no configuration for this device: %s",
reason.toString()));
} else {
Toast.makeText(getActivity(),
getString(R.string.loading_configuration_failed),
Toast.LENGTH_LONG).show();
ExLog.ex(getActivity(), TAG, reason);
}
}).setNegativeButton(android.R.string.cancel, null).show();
}
}
@Override
public void onLoadSucceeded(int loaderId, DeviceConfiguration configuration,
boolean isCached) {
getLoaderManager().destroyLoader(0);
// this is our 'global' configuration, let's store it in app preferences
PreferencesDeviceConfigurationLoader
.wrap(configuration, AppPreferences.on(getActivity())).store();
Toast.makeText(getActivity(),
getString(R.string.loading_configuration_succeded),
Toast.LENGTH_LONG).show();
}
});
getLoaderManager().initLoader(0, null, configurationLoader).forceLoad();
}));
recyclerView.addItemDecoration(new PreferenceMarginItemDecoration(getActivity(),
items.add(new PreferenceItem(getString(R.string.logout), R.drawable.ic_logout_yellow_24dp, () -> new AlertDialog.Builder(requireContext())
.setTitle(R.string.logout_dialog_title)
.setMessage(getString(R.string.logout_dialog_message))
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
final Activity activity = requireActivity();
AppPreferences.on(activity).setAccessToken(null);
DataManager dataManager = (DataManager) DataManager.create(activity);
dataManager.resetAll();
RaceApplication.getInstance().restart();
}).setNegativeButton(android.R.string.cancel, null).show()));
recyclerView.addItemDecoration(new PreferenceMarginItemDecoration(requireContext(),
getResources().getDimensionPixelSize(R.dimen.preference_margin)));
recyclerView.setLayoutManager(
new GridLayoutManager(getActivity(), getResources().getInteger(R.integer.preference_columns)));
@@ -145,16 +133,17 @@ public class MainPreferenceFragment extends LoggableFragment {
private class PreferenceAdapter extends RecyclerView.Adapter<PreferenceViewHolder> {
private Context mContext;
private List<PreferenceItem> mItems;
private final Context mContext;
private final List<PreferenceItem> mItems;
public PreferenceAdapter(Context context, List<PreferenceItem> items) {
mContext = context;
mItems = items;
}
@NonNull
@Override
public PreferenceViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public PreferenceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View layout = LayoutInflater.from(mContext).inflate(R.layout.pref_header, parent, false);
return new PreferenceViewHolder(layout);
}
@@ -185,27 +174,28 @@ public class MainPreferenceFragment extends LoggableFragment {
public PreferenceViewHolder(final View itemView) {
super(itemView);
textView = (TextView) itemView.findViewById(R.id.preference_title);
textView = itemView.findViewById(R.id.preference_title);
line = itemView.findViewById(R.id.preference_line);
itemView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (TextUtils.isEmpty(item.clazz)) {
Handler handler = new Handler();
handler.post(item.runnable);
} else {
try {
Fragment fragment = (Fragment) Class.forName(item.clazz).newInstance();
((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(item.title);
getFragmentManager().beginTransaction().replace(R.id.content_frame, fragment)
.addToBackStack(null).commit();
} catch (ClassNotFoundException ex) {
ExLog.ex(getActivity(), TAG, ex);
} catch (java.lang.InstantiationException ex) {
ExLog.ex(getActivity(), TAG, ex);
} catch (IllegalAccessException ex) {
ExLog.ex(getActivity(), TAG, ex);
itemView.setOnClickListener(v -> {
if (TextUtils.isEmpty(item.clazz)) {
Handler handler = new Handler();
handler.post(item.runnable);
} else {
try {
Fragment fragment = (Fragment) Class.forName(item.clazz).newInstance();
final ActionBar actionBar = ((AppCompatActivity) requireActivity()).getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(item.title);
}
requireFragmentManager().beginTransaction()
.replace(R.id.content_frame, fragment)
.commit();
} catch (ClassNotFoundException ex) {
ExLog.ex(getActivity(), TAG, ex);
} catch (java.lang.InstantiationException ex) {
ExLog.ex(getActivity(), TAG, ex);
} catch (IllegalAccessException ex) {
ExLog.ex(getActivity(), TAG, ex);
}
}
});
@@ -221,7 +211,7 @@ public class MainPreferenceFragment extends LoggableFragment {
private PreferenceItem(String title, @DrawableRes int drawable) {
this.title = title;
this.drawable = ContextCompat.getDrawable(getActivity(), drawable);
this.drawable = ContextCompat.getDrawable(requireContext(), drawable);
}
public PreferenceItem(String title, @DrawableRes int drawable, String clazz) {