From 0ccc5bfdfcb7f3f17f18d47594a8b3f42ca1bcd4 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 12 Sep 2022 13:46:48 +0200 Subject: [PATCH] fix menu --- .../activities/PreferencesActivity.kt | 8 ++--- .../activities/SingleFragmentActivity.kt | 36 +++++++++++-------- .../activities/TreatmentsActivity.kt | 17 +++++---- .../plugins/source/BGSourceFragment.kt | 3 +- .../general/automation/AutomationFragment.kt | 2 +- .../activities/PrefImportListActivity.kt | 2 +- .../pump/common/ui/PumpBLEConfigActivity.kt | 2 +- .../dialog/RileyLinkBLEConfigActivity.kt | 2 +- 8 files changed, 42 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt index 7725617e88..88cafc15f3 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt @@ -69,13 +69,13 @@ class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompa super.attachBaseContext(LocaleHelper.wrap(newBase)) } - override fun onOptionsItemSelected(item: MenuItem): Boolean { + override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { android.R.id.home -> { onBackPressed() - return true + true } + + else -> super.onOptionsItemSelected(item) } - return super.onOptionsItemSelected(item) - } } \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt index 9421324b66..634720f0b4 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt @@ -27,25 +27,31 @@ class SingleFragmentActivity : DaggerAppCompatActivityWithResult() { supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayShowHomeEnabled(true) if (savedInstanceState == null) { - supportFragmentManager.beginTransaction().replace(R.id.frame_layout, - supportFragmentManager.fragmentFactory.instantiate(ClassLoader.getSystemClassLoader(), plugin?.pluginDescription?.fragmentClass!!)).commit() + supportFragmentManager.beginTransaction().replace( + R.id.frame_layout, + supportFragmentManager.fragmentFactory.instantiate(ClassLoader.getSystemClassLoader(), plugin?.pluginDescription?.fragmentClass!!) + ).commit() } } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - if (item.itemId == android.R.id.home) { - finish() - return true - } else if (item.itemId == R.id.nav_plugin_preferences) { - protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, Runnable { - val i = Intent(this, PreferencesActivity::class.java) - i.putExtra("id", plugin?.preferencesId) - startActivity(i) - }, null) - return true + override fun onOptionsItemSelected(item: MenuItem): Boolean = + when (item.itemId) { + android.R.id.home -> { + finish() + true + } + + R.id.nav_plugin_preferences -> { + protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, { + val i = Intent(this, PreferencesActivity::class.java) + i.putExtra("id", plugin?.preferencesId) + startActivity(i) + }, null) + true + } + + else -> super.onOptionsItemSelected(item) } - return false - } override fun onCreateOptionsMenu(menu: Menu): Boolean { if (plugin?.preferencesId != -1) menuInflater.inflate(R.menu.menu_single_fragment, menu) diff --git a/app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt index d8c71fa70f..c7b913753f 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt @@ -7,7 +7,13 @@ import androidx.fragment.app.FragmentTransaction import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout.OnTabSelectedListener import info.nightscout.androidaps.R -import info.nightscout.androidaps.activities.fragments.* +import info.nightscout.androidaps.activities.fragments.TreatmentsBolusCarbsFragment +import info.nightscout.androidaps.activities.fragments.TreatmentsCareportalFragment +import info.nightscout.androidaps.activities.fragments.TreatmentsExtendedBolusesFragment +import info.nightscout.androidaps.activities.fragments.TreatmentsProfileSwitchFragment +import info.nightscout.androidaps.activities.fragments.TreatmentsTempTargetFragment +import info.nightscout.androidaps.activities.fragments.TreatmentsTemporaryBasalsFragment +import info.nightscout.androidaps.activities.fragments.TreatmentsUserEntryFragment import info.nightscout.androidaps.databinding.TreatmentsFragmentBinding import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.interfaces.ActivePlugin @@ -25,7 +31,7 @@ class TreatmentsActivity : NoSplashAppCompatActivity() { super.onCreate(savedInstanceState) binding = TreatmentsFragmentBinding.inflate(layoutInflater) setContentView(binding.root) - + // Use index, TabItems crashes with an id val useFakeTempBasal = activePlugin.activePump.isFakingTempsByExtendedBoluses binding.treatmentsTabs.getTabAt(1)?.view?.visibility = useFakeTempBasal.toVisibility() @@ -55,16 +61,15 @@ class TreatmentsActivity : NoSplashAppCompatActivity() { }) } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - return when (item.itemId) { + override fun onOptionsItemSelected(item: MenuItem): Boolean = + when (item.itemId) { android.R.id.home -> { finish() true } - else -> false + else -> super.onOptionsItemSelected(item) } - } private fun setFragment(selectedFragment: Fragment) { supportFragmentManager.beginTransaction() diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt index 9da1348c48..1f9934e37d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt @@ -119,7 +119,8 @@ class BGSourceFragment : DaggerFragment(), MenuProvider { } override fun onMenuItemSelected(item: MenuItem) = - actionHelper.onOptionsItemSelected(item) + if (actionHelper.onOptionsItemSelected(item)) true + else super.onContextItemSelected(item) inner class RecyclerViewAdapter internal constructor(private var glucoseValues: List) : RecyclerView.Adapter() { diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt index b38aeded92..dbbb566b54 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt @@ -121,7 +121,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener, MenuProvider { true } - else -> false + else -> super.onContextItemSelected(item) } @SuppressLint("NotifyDataSetChanged") diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt index 2bc71881ef..33c753ec20 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt @@ -114,7 +114,7 @@ class PrefImportListActivity : DaggerAppCompatActivity() { finish() return true } - return false + return super.onOptionsItemSelected(item) } override fun attachBaseContext(newBase: Context) { diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt index db19107d75..a2fab202c3 100755 --- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt +++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt @@ -165,7 +165,7 @@ class PumpBLEConfigActivity : DaggerAppCompatActivity() { true } - else -> false + else -> super.onOptionsItemSelected(item) } override fun onResume() { diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt index 0dbbd0302b..f2c80cc3c9 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt @@ -155,7 +155,7 @@ class RileyLinkBLEConfigActivity : DaggerAppCompatActivity() { true } - else -> false + else -> super.onOptionsItemSelected(item) } private fun prepareForScanning() {