From da0e9d5a09a784d24f24317adac1f5b8ce95317a Mon Sep 17 00:00:00 2001 From: tom79 Date: Wed, 11 Sep 2019 16:12:00 +0200 Subject: [PATCH] Prepares settings --- .../android/activities/BaseMainActivity.java | 3 --- .../android/activities/SettingsActivity.java | 2 -- .../fragments/ContentSettingsFragment.java | 23 +++++++++++++++++++ .../res/layout/fragment_settings_reveal.xml | 15 +++++------- app/src/main/res/values/strings.xml | 1 + 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 22fe8839e..e684f43ff 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -1654,7 +1654,6 @@ public abstract class BaseMainActivity extends BaseActivity public void onDestroy() { super.onDestroy(); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); - boolean backgroundProcess = sharedpreferences.getBoolean(Helper.SET_KEEP_BACKGROUND_PROCESS, true); boolean clearCacheExit = sharedpreferences.getBoolean(Helper.SET_CLEAR_CACHE_EXIT, false); WeakReference contextReference = new WeakReference<>(getApplicationContext()); if (clearCacheExit) { @@ -1676,8 +1675,6 @@ public abstract class BaseMainActivity extends BaseActivity } }); } - if (!backgroundProcess) - sendBroadcast(new Intent(getApplicationContext(), StopLiveNotificationReceiver.class)); if (hidde_menu != null) LocalBroadcastManager.getInstance(getApplicationContext()).unregisterReceiver(hidde_menu); if (update_topbar != null) diff --git a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java index 7468c7517..c84cf6fcc 100644 --- a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java @@ -183,14 +183,12 @@ public class SettingsActivity extends BaseActivity implements ViewAnimator.ViewA SlideMenuItem menuItemAdmin = new SlideMenuItem(ContentSettingsFragment.type.ADMIN, R.drawable.ic_security_admin_menu); SlideMenuItem menuItemInterface = new SlideMenuItem(ContentSettingsFragment.type.INTERFACE, R.drawable.ic_tablet_menu); SlideMenuItem menuItemEdit = new SlideMenuItem(ContentSettingsFragment.type.COMPOSE, R.drawable.ic_edit_black_menu); - SlideMenuItem menuItemBattery = new SlideMenuItem(ContentSettingsFragment.type.BATTERY, R.drawable.ic_battery_alert_menu); SlideMenuItem menuLanguage = new SlideMenuItem(ContentSettingsFragment.type.LANGUAGE, R.drawable.ic_translate_menu); SlideMenuItem menuMenu = new SlideMenuItem(ContentSettingsFragment.type.MENU, R.drawable.ic_menu_menu); list.add(menuItemClose); list.add(menuItemTimeline); list.add(menuItemNotification); list.add(menuItemInterface); - list.add(menuItemBattery); list.add(menuItemEdit); if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { list.add(menuMenu); diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java index eac171630..97124b108 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java @@ -1165,6 +1165,18 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable if( Helper.liveNotifType(context) == Helper.NOTIF_NONE){ live_notif_per_account.setVisibility(View.GONE); } + TextView set_live_type_indication = rootView.findViewById(R.id.set_live_type_indication); + switch (Helper.liveNotifType(context)){ + case Helper.NOTIF_LIVE: + set_live_type_indication.setText(R.string.live_notif_indication); + break; + case Helper.NOTIF_DELAYED: + set_live_type_indication.setText(R.string.set_live_type_indication); + break; + case Helper.NOTIF_NONE: + set_live_type_indication.setText(R.string.no_live_indication); + break; + } set_live_type.setSelection(Helper.liveNotifType(context)); set_live_type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override @@ -1191,6 +1203,17 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable editor.apply(); break; } + switch (Helper.liveNotifType(context)){ + case Helper.NOTIF_LIVE: + set_live_type_indication.setText(R.string.live_notif_indication); + break; + case Helper.NOTIF_DELAYED: + set_live_type_indication.setText(R.string.set_live_type_indication); + break; + case Helper.NOTIF_NONE: + set_live_type_indication.setText(R.string.no_live_indication); + break; + } } count2++; } diff --git a/app/src/main/res/layout/fragment_settings_reveal.xml b/app/src/main/res/layout/fragment_settings_reveal.xml index db7a973c9..c9ee0131d 100644 --- a/app/src/main/res/layout/fragment_settings_reveal.xml +++ b/app/src/main/res/layout/fragment_settings_reveal.xml @@ -544,20 +544,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal"> - - - - + Notifications will be delayed every 30 seconds. That will allow to drain less battery. Live notifications delayed No live notifications + Notifications will be fetched every 15 minutes. \ No newline at end of file