move treatments to upper right menu

app/src/main/AndroidManifest.xml

@@ -69,6 +69,7 @@
         </activity>
         <activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity" />
         <activity android:name=".historyBrowser.HistoryBrowseActivity" />
+        <activity android:name=".activities.TreatmentsActivity" />
         <activity android:name=".activities.SurveyActivity" />
         <activity android:name=".activities.ProfileHelperActivity"
             android:theme="@style/ProfileHelperAppTheme" />

app/src/main/java/info/nightscout/androidaps/MainActivity.kt

@@ -27,11 +27,7 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.joanzapata.iconify.Iconify
 import com.joanzapata.iconify.fonts.FontAwesomeModule
 import dev.doubledot.doki.ui.DokiActivity
-import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.activities.*
-import info.nightscout.androidaps.activities.PreferencesActivity
-import info.nightscout.androidaps.activities.ProfileHelperActivity
-import info.nightscout.androidaps.activities.SingleFragmentActivity
-import info.nightscout.androidaps.activities.StatsActivity
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.ActivityMainBinding
@@ -291,6 +287,11 @@ class MainActivity : NoSplashAppCompatActivity() {
                 return true
             }
 
+            R.id.nav_treatments -> {
+                startActivity(Intent(this, TreatmentsActivity::class.java))
+                return true
+            }
+
             R.id.nav_setupwizard -> {
                 protectionCheck.queryProtection(this, ProtectionCheck.Protection.PREFERENCES, {
                     startActivity(Intent(this, SetupWizardActivity::class.java))

app/src/main/java/info/nightscout/androidaps/activities/TreatmentsActivity.kt

@@ -1,53 +1,28 @@
-package info.nightscout.androidaps.plugins.treatments
+package info.nightscout.androidaps.activities
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
-import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.fragments.*
 import info.nightscout.androidaps.databinding.TreatmentsFragmentBinding
-import info.nightscout.androidaps.events.EventExtendedBolusChange
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.IobCobCalculator
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.treatments.fragments.*
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.extensions.toVisibility
-import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.buildHelper.BuildHelper
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 
-class TreatmentsFragment : DaggerFragment() {
+class TreatmentsActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var iobCobCalculator: IobCobCalculator
-    @Inject lateinit var aapsSchedulers: AapsSchedulers
     @Inject lateinit var buildHelper: BuildHelper
-    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var activePlugin: ActivePlugin
 
-    private val disposable = CompositeDisposable()
+    private lateinit var binding: TreatmentsFragmentBinding
 
-    private var _binding: TreatmentsFragmentBinding? = null
+    override fun onCreate(savedInstanceState: Bundle?) {
-
+        super.onCreate(savedInstanceState)
-    // This property is only valid between onCreateView and
+        binding = TreatmentsFragmentBinding.inflate(layoutInflater)
-    // onDestroyView.
+        setContentView(binding.root)
-    private val binding get() = _binding!!
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
-        TreatmentsFragmentBinding.inflate(inflater, container, false).also { _binding = it }.root
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
 
         binding.tempBasals.visibility = buildHelper.isEngineeringMode().toVisibility()
         binding.extendedBoluses.visibility = (buildHelper.isEngineeringMode() && !activePlugin.activePump.isFakingTempsByExtendedBoluses).toVisibility()
@@ -84,33 +59,10 @@ class TreatmentsFragment : DaggerFragment() {
         setBackgroundColorOnSelected(binding.treatments)
     }
 
-    @Synchronized
-    override fun onResume() {
-        super.onResume()
-        disposable += rxBus
-            .toObservable(EventExtendedBolusChange::class.java)
-            .observeOn(aapsSchedulers.main)
-            .subscribe({ updateGui() }, fabricPrivacy::logException)
-        updateGui()
-    }
-
-    @Synchronized
-    override fun onPause() {
-        super.onPause()
-        disposable.clear()
-    }
-
-    @Synchronized
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
     private fun setFragment(selectedFragment: Fragment) {
-        childFragmentManager.beginTransaction()
+        supportFragmentManager.beginTransaction()
-            .replace(R.id.fragment_container, selectedFragment) // f2_container is your FrameLayout container
+            .replace(R.id.fragment_container, selectedFragment)
-            .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+            .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
-            .addToBackStack(null)
             .commit()
     }
 
@@ -125,8 +77,4 @@ class TreatmentsFragment : DaggerFragment() {
         selected.setBackgroundColor(resourceHelper.gc(R.color.tabBgColorSelected))
     }
 
-    private fun updateGui() {
-        if (_binding == null) return
-        binding.extendedBoluses.visibility = (activePlugin.activePump.pumpDescription.isExtendedBolusCapable || iobCobCalculator.getExtendedBolus(dateUtil.now()) != null).toVisibility()
-    }
 }

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.treatments.fragments
+package info.nightscout.androidaps.activities.fragments
 
 import android.graphics.Paint
 import android.os.Bundle

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.treatments.fragments
+package info.nightscout.androidaps.activities.fragments
 
 import android.graphics.Paint
 import android.os.Bundle
@@ -25,7 +25,7 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.TherapyEventsViewHolder
+import info.nightscout.androidaps.activities.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.TherapyEventsViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.treatments.fragments
+package info.nightscout.androidaps.activities.fragments
 
 import android.annotation.SuppressLint
 import android.content.DialogInterface
@@ -30,7 +30,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsExtendedBolusesFragment.RecyclerViewAdapter.ExtendedBolusesViewHolder
+import info.nightscout.androidaps.activities.fragments.TreatmentsExtendedBolusesFragment.RecyclerViewAdapter.ExtendedBolusesViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.treatments.fragments
+package info.nightscout.androidaps.activities.fragments
 
 import android.graphics.Paint
 import android.os.Bundle
@@ -30,7 +30,7 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHi
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
 import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder
+import info.nightscout.androidaps.activities.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.treatments.fragments
+package info.nightscout.androidaps.activities.fragments
 
 import android.annotation.SuppressLint
 import android.content.DialogInterface
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.treatments.events.EventTreatmentUpdateGui
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsTempTargetFragment.RecyclerViewAdapter.TempTargetsViewHolder
+import info.nightscout.androidaps.activities.fragments.TreatmentsTempTargetFragment.RecyclerViewAdapter.TempTargetsViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.treatments.fragments
+package info.nightscout.androidaps.activities.fragments
 
 import android.content.DialogInterface
 import android.graphics.Paint
@@ -36,7 +36,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsTemporaryBasalsFragment.RecyclerViewAdapter.TempBasalsViewHolder
+import info.nightscout.androidaps.activities.fragments.TreatmentsTemporaryBasalsFragment.RecyclerViewAdapter.TempBasalsViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.T

app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt

@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.treatments.fragments
+package info.nightscout.androidaps.activities.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater

app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt

@@ -15,6 +15,7 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 @Suppress("unused")
 abstract class ActivitiesModule {
 
+    @ContributesAndroidInjector abstract fun contributesTreatmentsActivity(): TreatmentsActivity
     @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity
     @ContributesAndroidInjector abstract fun contributesLogSettingActivity(): LogSettingActivity
     @ContributesAndroidInjector abstract fun contributeMainActivity(): MainActivity

app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt

@@ -31,8 +31,7 @@ import info.nightscout.androidaps.plugins.insulin.InsulinFragment
 import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
 import info.nightscout.androidaps.plugins.source.BGSourceFragment
-import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment
+import info.nightscout.androidaps.activities.fragments.*
-import info.nightscout.androidaps.plugins.treatments.fragments.*
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 
 @Module
@@ -61,7 +60,6 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesWearFragment(): WearFragment
 
     @ContributesAndroidInjector abstract fun contributesTidepoolFragment(): TidepoolFragment
-    @ContributesAndroidInjector abstract fun contributesTreatmentsFragment(): TreatmentsFragment
     @ContributesAndroidInjector abstract fun contributesTreatmentsBolusFragment(): TreatmentsBolusCarbsFragment
     @ContributesAndroidInjector abstract fun contributesTreatmentsTemporaryBasalsFragment(): TreatmentsTemporaryBasalsFragment
     @ContributesAndroidInjector abstract fun contributesTreatmentsTempTargetFragment(): TreatmentsTempTargetFragment

app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java

@@ -67,7 +67,6 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.TREATMENT)
-                        .fragmentClass(TreatmentsFragment.class.getName())
                         .pluginIcon(R.drawable.ic_treatments)
                         .pluginName(R.string.treatments)
                         .shortName(R.string.treatments_shortname)

app/src/main/res/layout/localprofile_fragment.xml

@@ -239,7 +239,7 @@
                 android:layout_marginBottom="10dp"
                 android:orientation="vertical" />
 
-            <info.nightscout.androidaps.plugins.treatments.fragments.ProfileGraph
+            <info.nightscout.androidaps.utils.ui.ProfileGraph
                 android:id="@+id/basal_graph"
                 android:layout_width="match_parent"
                 android:layout_height="100dip"

app/src/main/res/layout/treatments_bolus_carbs_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".plugins.treatments.fragments.TreatmentsBolusCarbsFragment">
+    tools:context="info.nightscout.androidaps.activities.fragments.TreatmentsBolusCarbsFragment">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/treatments_careportal_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsCareportalFragment">
+    tools:context="info.nightscout.androidaps.activities.fragments.TreatmentsCareportalFragment">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/treatments_extendedbolus_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".plugins.treatments.fragments.TreatmentsExtendedBolusesFragment">
+    tools:context="info.nightscout.androidaps.activities.fragments.TreatmentsExtendedBolusesFragment">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/treatments_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".plugins.treatments.TreatmentsFragment">
+    tools:context="info.nightscout.androidaps.activities.TreatmentsActivity">
 
 
     <com.google.android.flexbox.FlexboxLayout

app/src/main/res/layout/treatments_profileswitch_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsProfileSwitchFragment">
+    tools:context="info.nightscout.androidaps.activities.fragments.TreatmentsProfileSwitchFragment">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/treatments_tempbasals_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsTemporaryBasalsFragment">
+    tools:context="info.nightscout.androidaps.activities.fragments.TreatmentsTemporaryBasalsFragment">
 
 
     <LinearLayout

app/src/main/res/layout/treatments_temptarget_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsTempTargetFragment">
+    tools:context="info.nightscout.androidaps.activities.fragments.TreatmentsTempTargetFragment">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/treatments_user_entry_fragment.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".plugins.treatments.fragments.TreatmentsUserEntryFragment">
+    tools:context="info.nightscout.androidaps.activities.fragments.TreatmentsUserEntryFragment">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/menu/menu_main.xml

@@ -10,6 +10,10 @@
         android:id="@+id/nav_plugin_preferences"
         app:showAsAction="never"
         android:title="@string/nav_plugin_preferences" />
+    <item
+        android:id="@+id/nav_treatments"
+        app:showAsAction="never"
+        android:title="@string/treatments" />
     <item
         android:id="@+id/nav_historybrowser"
         app:showAsAction="never"

core/src/main/java/info/nightscout/androidaps/utils/ui/ProfileGraph.kt

@@ -1,7 +1,6 @@
-package info.nightscout.androidaps.plugins.treatments.fragments
+package info.nightscout.androidaps.utils.ui
 
 import android.content.Context
-import android.graphics.Color
 import android.util.AttributeSet
 import com.jjoe64.graphview.GraphView
 import com.jjoe64.graphview.series.DataPoint
@@ -9,7 +8,7 @@ import com.jjoe64.graphview.series.LineGraphSeries
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.utils.Round
-import java.util.*
+import java.util.ArrayList
 import kotlin.math.max
 
 class ProfileGraph : GraphView {

core/src/main/res/layout/dialog_profileviewer.xml

@@ -371,7 +371,7 @@
 
         </LinearLayout>
 
-        <info.nightscout.androidaps.plugins.treatments.fragments.ProfileGraph
+        <info.nightscout.androidaps.utils.ui.ProfileGraph
             android:id="@+id/basal_graph"
             android:layout_width="match_parent"
             android:layout_height="100dip"

danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt

@@ -344,7 +344,7 @@ class BLEComm @Inject internal constructor(
         var packetIsValid = false
         var isProcessing: Boolean
         isProcessing = true
-        var inputBuffer: ByteArray? = null
+        var inputBuffer: ByteArray?
 
         // decrypt 2nd level after successful connection
         val incomingBuffer =