caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

remove NoSplashActivity dependency

Browse source
This commit is contained in:
Milos Kozak 2022-11-27 17:08:46 +01:00
parent d5f2f147cc
commit e00a60e0a0
21 changed files with 79 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/AndroidManifest.xml
View file

@ -67,7 +67,8 @@
</activity>
<activity
android:name=".activities.PreferencesActivity"
android:exported="false" />
android:exported="false"
android:theme="@style/AppTheme"/>
<activity
android:name=".plugins.general.maintenance.activities.PrefImportListActivity"
android:exported="false"
@ -141,7 +142,8 @@
<activity
android:name=".plugins.general.maintenance.activities.LogSettingActivity"
android:exported="false" />
android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
<uses-library
android:name="org.apache.http.legacy"

5
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
View file

@ -26,6 +26,7 @@ import info.nightscout.interfaces.protection.ProtectionCheck
import info.nightscout.interfaces.protection.ProtectionCheck.Protection.PREFERENCES
import info.nightscout.interfaces.pump.PumpSync
import info.nightscout.interfaces.sync.DataSyncSelector
import info.nightscout.interfaces.ui.ActivityNames
import info.nightscout.interfaces.utils.HtmlHelper
import info.nightscout.pump.dana.database.DanaHistoryDatabase
import info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase
@ -36,7 +37,6 @@ import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.extensions.toVisibility
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.ui.activities.SingleFragmentActivity
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
@ -64,6 +64,7 @@ class MaintenanceFragment : DaggerFragment() {
@Inject lateinit var iobCobCalculator: IobCobCalculator
@Inject lateinit var overviewData: OverviewData
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var activityNames: ActivityNames
private val disposable = CompositeDisposable()
private var inMenu = false
@ -81,7 +82,7 @@ class MaintenanceFragment : DaggerFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val parentClass = this.activity?.let { it::class.java }
inMenu = parentClass == SingleFragmentActivity::class.java
inMenu = parentClass == activityNames.singleFragmentActivity
updateProtectedUi()
binding.logSend.setOnClickListener { maintenancePlugin.sendLogs() }
binding.logDelete.setOnClickListener {

4
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt
View file

@ -5,14 +5,14 @@ import android.view.View
import android.widget.CheckBox
import android.widget.LinearLayout
import android.widget.TextView
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.ActivityLogsettingBinding
import info.nightscout.core.activities.NoSplashAppCompatActivity
import info.nightscout.rx.interfaces.L
import info.nightscout.rx.interfaces.LogElement
import javax.inject.Inject
class LogSettingActivity : NoSplashAppCompatActivity() {
class LogSettingActivity : DaggerAppCompatActivity() {
@Inject lateinit var l: L

4
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingActivity.java
View file

@ -32,17 +32,17 @@ import java.util.List;
import javax.inject.Inject;
import dagger.android.support.DaggerAppCompatActivity;
import info.nightscout.androidaps.insight.R;
import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
import info.nightscout.androidaps.plugins.pump.insight.descriptors.InsightState;
import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
import info.nightscout.core.activities.NoSplashAppCompatActivity;
import info.nightscout.core.utils.extensions.BluetoothAdapterExtensionKt;
import info.nightscout.core.utils.extensions.IntentExtensionKt;
import info.nightscout.interfaces.pump.BlePreCheck;
import info.nightscout.interfaces.pump.PumpSync;
public class InsightPairingActivity extends NoSplashAppCompatActivity implements InsightConnectionService.StateCallback, View.OnClickListener, InsightConnectionService.ExceptionCallback {
public class InsightPairingActivity extends DaggerAppCompatActivity implements InsightConnectionService.StateCallback, View.OnClickListener, InsightConnectionService.ExceptionCallback {
@Inject BlePreCheck blePreCheck;
@Inject Context context;

4
insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightPairingInformationActivity.java
View file

@ -10,11 +10,11 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import dagger.android.support.DaggerAppCompatActivity;
import info.nightscout.androidaps.insight.R;
import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService;
import info.nightscout.core.activities.NoSplashAppCompatActivity;
public class InsightPairingInformationActivity extends NoSplashAppCompatActivity {
public class InsightPairingInformationActivity extends DaggerAppCompatActivity {
private InsightConnectionService connectionService;

2
plugins/main/build.gradle
View file

@ -47,7 +47,7 @@ dependencies {
//SmsCommunicator
api 'com.eatthepath:java-otp:0.3.1'
api 'com.eatthepath:java-otp:0.4.0'
api 'com.github.kenglxn.QRGen:android:2.6.0'
// Overview

3
plugins/main/src/main/AndroidManifest.xml
View file

@ -11,7 +11,8 @@
<application>
<activity
android:name=".general.smsCommunicator.activities.SmsCommunicatorOtpActivity"
android:exported="false">
android:exported="false"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity" />

8
plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
View file

@ -12,27 +12,29 @@ import android.view.View
import android.view.WindowManager
import com.google.common.primitives.Ints.min
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.ui.toast.ToastUtils
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.entities.UserEntry.Action
import info.nightscout.database.entities.UserEntry.Sources
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
import info.nightscout.plugins.R
import info.nightscout.plugins.databinding.SmscommunicatorActivityOtpBinding
import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePassword
import info.nightscout.plugins.general.smsCommunicator.otp.OneTimePasswordValidationResult
import info.nightscout.shared.interfaces.ResourceHelper
import net.glxn.qrgen.android.QRCode
import javax.inject.Inject
class SmsCommunicatorOtpActivity : NoSplashAppCompatActivity() {
class SmsCommunicatorOtpActivity : DaggerAppCompatActivity() {
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var smsCommunicator: SmsCommunicator
@Inject lateinit var otp: OneTimePassword
@Inject lateinit var uel: UserEntryLogger
@Inject lateinit var rh: ResourceHelper
private lateinit var binding: SmscommunicatorActivityOtpBinding

4
pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt
View file

@ -7,14 +7,14 @@ import androidx.annotation.LayoutRes
import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding
import androidx.lifecycle.ViewModelProvider
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchPluginQualifier
import info.nightscout.core.activities.NoSplashAppCompatActivity
import info.nightscout.core.ui.R
import info.nightscout.rx.AapsSchedulers
import io.reactivex.rxjava3.disposables.CompositeDisposable
import javax.inject.Inject
abstract class EoBaseActivity<B : ViewDataBinding> : NoSplashAppCompatActivity(), EoBaseNavigator {
abstract class EoBaseActivity<B : ViewDataBinding> : DaggerAppCompatActivity(), EoBaseNavigator {
@Inject
@EopatchPluginQualifier
lateinit var viewModelFactory: ViewModelProvider.Factory

4
pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt
View file

@ -3,10 +3,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.
import androidx.appcompat.app.AlertDialog
import androidx.navigation.NavController
import androidx.navigation.fragment.NavHostFragment
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.androidaps.plugins.pump.omnipod.common.R
import info.nightscout.core.activities.NoSplashAppCompatActivity
abstract class OmnipodWizardActivityBase : NoSplashAppCompatActivity() {
abstract class OmnipodWizardActivityBase : DaggerAppCompatActivity() {
override fun onBackPressed() = exitActivityAfterConfirmation()

8
pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt
View file

@ -11,6 +11,7 @@ import android.widget.Spinner
import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
@ -20,21 +21,24 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.History
import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult
import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult
import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord
import info.nightscout.core.activities.NoSplashAppCompatActivity
import info.nightscout.core.utils.DateTimeUtil
import info.nightscout.interfaces.pump.defs.PumpType
import info.nightscout.pump.common.defs.PumpHistoryEntryGroup
import info.nightscout.pump.common.utils.ProfileUtil
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.rx.logging.LTag
import info.nightscout.shared.interfaces.ResourceHelper
import java.util.Calendar
import java.util.GregorianCalendar
import javax.inject.Inject
class DashPodHistoryActivity : NoSplashAppCompatActivity() {
class DashPodHistoryActivity : DaggerAppCompatActivity() {
@Inject lateinit var dashHistory: DashHistory
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var aapsLogger: AAPSLogger
@Inject lateinit var rh: ResourceHelper
private var historyTypeSpinner: Spinner? = null
private var statusView: TextView? = null

8
pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
View file

@ -4,6 +4,7 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep
import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity
import info.nightscout.androidaps.plugins.pump.omnipod.dash.R
@ -12,20 +13,21 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity
import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity
import info.nightscout.core.activities.NoSplashAppCompatActivity
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.queue.Callback
import info.nightscout.interfaces.queue.CommandQueue
import info.nightscout.interfaces.ui.ActivityNames
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventQueueChanged
import info.nightscout.shared.extensions.toVisibility
import info.nightscout.shared.interfaces.ResourceHelper
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject
class DashPodManagementActivity : NoSplashAppCompatActivity() {
class DashPodManagementActivity : DaggerAppCompatActivity() {
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var commandQueue: CommandQueue
@ -34,6 +36,8 @@ class DashPodManagementActivity : NoSplashAppCompatActivity() {
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var podStateManager: OmnipodDashPodStateManager
@Inject lateinit var activityNames: ActivityNames
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var rxBus: RxBus
private var disposables: CompositeDisposable = CompositeDisposable()

4
pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.java
View file

@ -22,12 +22,12 @@ import java.util.List;
import javax.inject.Inject;
import dagger.android.support.DaggerAppCompatActivity;
import info.nightscout.androidaps.plugins.pump.omnipod.eros.R;
import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.PodHistoryEntryType;
import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory;
import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordEntity;
import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil;
import info.nightscout.core.activities.NoSplashAppCompatActivity;
import info.nightscout.interfaces.profile.Profile;
import info.nightscout.interfaces.pump.defs.PumpType;
import info.nightscout.pump.common.defs.PumpHistoryEntryGroup;
@ -37,7 +37,7 @@ import info.nightscout.rx.logging.AAPSLogger;
import info.nightscout.rx.logging.LTag;
import info.nightscout.shared.interfaces.ResourceHelper;
public class ErosPodHistoryActivity extends NoSplashAppCompatActivity {
public class ErosPodHistoryActivity extends DaggerAppCompatActivity {
@Inject AAPSLogger aapsLogger;
@Inject AapsOmnipodUtil aapsOmnipodUtil;

8
pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
View file

@ -6,6 +6,7 @@ import android.os.Bundle
import android.os.Handler
import android.os.HandlerThread
import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
@ -23,7 +24,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodE
import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandReadPulseLog
import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.ErosPodActivationWizardActivity
import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.ErosPodDeactivationWizardActivity
import info.nightscout.core.activities.NoSplashAppCompatActivity
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.interfaces.Config
@ -31,8 +31,10 @@ import info.nightscout.interfaces.queue.Callback
import info.nightscout.interfaces.queue.CommandQueue
import info.nightscout.interfaces.ui.ActivityNames
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventQueueChanged
import info.nightscout.shared.extensions.toVisibility
import info.nightscout.shared.interfaces.ResourceHelper
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject
@ -40,7 +42,7 @@ import javax.inject.Inject
/**
* Created by andy on 30/08/2019
*/
class ErosPodManagementActivity : NoSplashAppCompatActivity() {
class ErosPodManagementActivity : DaggerAppCompatActivity() {
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var commandQueue: CommandQueue
@ -54,6 +56,8 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var config: Config
@Inject lateinit var activityNames: ActivityNames
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var rxBus: RxBus
private var disposables: CompositeDisposable = CompositeDisposable()
private val handler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)

8
pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt
View file

@ -5,11 +5,15 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.viewpager2.adapter.FragmentStateAdapter
import com.google.android.material.tabs.TabLayoutMediator
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.databinding.RileylinkStatusBinding
import info.nightscout.core.activities.NoSplashAppCompatActivity
import info.nightscout.shared.interfaces.ResourceHelper
import javax.inject.Inject
class RileyLinkStatusActivity : NoSplashAppCompatActivity() {
class RileyLinkStatusActivity : DaggerAppCompatActivity() {
@Inject lateinit var rh: ResourceHelper
private lateinit var binding: RileylinkStatusBinding

6
ui/src/main/AndroidManifest.xml
View file

@ -38,11 +38,11 @@
<activity
android:name=".activities.SurveyActivity"
android:exported="false"
android:theme="@style/AppTheme" />
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.StatsActivity"
android:exported="false"
android:theme="@style/AppTheme" />
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.TreatmentsActivity"
android:exported="false"
@ -50,7 +50,7 @@
<activity
android:name=".activities.ProfileHelperActivity"
android:exported="false"
android:theme="@style/AppTheme" />
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.SingleFragmentActivity"
android:exported="false"

8
ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
View file

@ -8,7 +8,7 @@ import android.widget.ArrayAdapter
import android.widget.TextView
import com.google.android.material.tabs.TabLayout
import com.google.common.collect.Lists
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.core.profile.ProfileSealed
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.ui.toast.ToastUtils
@ -21,8 +21,10 @@ import info.nightscout.interfaces.profile.PureProfile
import info.nightscout.interfaces.stats.TddCalculator
import info.nightscout.interfaces.ui.ActivityNames
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventLocalProfileChanged
import info.nightscout.shared.extensions.toVisibility
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.utils.DateUtil
import info.nightscout.shared.utils.T
import info.nightscout.ui.R
@ -36,7 +38,7 @@ import io.reactivex.rxjava3.kotlin.plusAssign
import java.text.DecimalFormat
import javax.inject.Inject
class ProfileHelperActivity : NoSplashAppCompatActivity() {
class ProfileHelperActivity : DaggerAppCompatActivity() {
@Inject lateinit var tddCalculator: TddCalculator
@Inject lateinit var profileFunction: ProfileFunction
@ -47,6 +49,8 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
@Inject lateinit var repository: AppRepository
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var rxBus: RxBus
enum class ProfileType {
MOTOL_DEFAULT,

8
ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt
View file

@ -3,16 +3,17 @@ package info.nightscout.ui.activities
import android.annotation.SuppressLint
import android.os.Bundle
import android.widget.TextView
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.core.ui.dialogs.OKDialog
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.entities.UserEntry.Action
import info.nightscout.database.entities.UserEntry.Sources
import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.interfaces.stats.DexcomTirCalculator
import info.nightscout.interfaces.stats.TddCalculator
import info.nightscout.interfaces.stats.TirCalculator
import info.nightscout.rx.AapsSchedulers
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.ui.R
import info.nightscout.ui.activityMonitor.ActivityMonitor
import info.nightscout.ui.databinding.ActivityStatsBinding
@ -21,7 +22,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject
class StatsActivity : NoSplashAppCompatActivity() {
class StatsActivity : DaggerAppCompatActivity() {
@Inject lateinit var tddCalculator: TddCalculator
@Inject lateinit var tirCalculator: TirCalculator
@ -30,6 +31,7 @@ class StatsActivity : NoSplashAppCompatActivity() {
@Inject lateinit var uel: UserEntryLogger
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var rh: ResourceHelper
private lateinit var binding: ActivityStatsBinding
private val disposable = CompositeDisposable()

4
ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt
View file

@ -2,7 +2,7 @@ package info.nightscout.ui.activities
import android.os.Bundle
import android.widget.ArrayAdapter
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.core.ui.toast.ToastUtils
import info.nightscout.core.utils.fabric.InstanceId
import info.nightscout.interfaces.plugin.ActivePlugin
@ -15,7 +15,7 @@ import info.nightscout.ui.databinding.ActivitySurveyBinding
import info.nightscout.ui.defaultProfile.DefaultProfile
import javax.inject.Inject
class SurveyActivity : NoSplashAppCompatActivity() {
class SurveyActivity : DaggerAppCompatActivity() {
@Inject lateinit var activePlugin: ActivePlugin
@Inject lateinit var profileFunction: ProfileFunction

10
ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt
View file

@ -14,7 +14,7 @@ import android.widget.EditText
import android.widget.TableLayout
import android.widget.TableRow
import android.widget.TextView
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.core.main.R
import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.entities.TotalDailyDose
@ -25,9 +25,12 @@ import info.nightscout.interfaces.pump.defs.PumpType
import info.nightscout.interfaces.queue.Callback
import info.nightscout.interfaces.queue.CommandQueue
import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.events.EventDanaRSyncStatus
import info.nightscout.rx.events.EventPumpStatusChanged
import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.SafeParse
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP
import info.nightscout.shared.utils.T
import info.nightscout.ui.databinding.ActivityTddStatsBinding
@ -41,7 +44,7 @@ import javax.inject.Inject
import kotlin.math.min
import kotlin.math.roundToInt
class TDDStatsActivity : NoSplashAppCompatActivity() {
class TDDStatsActivity : DaggerAppCompatActivity() {
@Inject lateinit var sp: SP
@Inject lateinit var profileFunction: ProfileFunction
@ -50,6 +53,9 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
@Inject lateinit var repository: AppRepository
@Inject lateinit var fabricPrivacy: FabricPrivacy
@Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var rh: ResourceHelper
@Inject lateinit var rxBus: RxBus
@Inject lateinit var aapsLogger: AAPSLogger
private lateinit var binding: ActivityTddStatsBinding
private val disposable = CompositeDisposable()

6
ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt
View file

@ -5,10 +5,11 @@ import android.view.MenuItem
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentTransaction
import com.google.android.material.tabs.TabLayout
import info.nightscout.core.activities.NoSplashAppCompatActivity
import dagger.android.support.DaggerAppCompatActivity
import info.nightscout.interfaces.Config
import info.nightscout.interfaces.plugin.ActivePlugin
import info.nightscout.shared.extensions.toVisibility
import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.ui.R
import info.nightscout.ui.activities.fragments.TreatmentsBolusCarbsFragment
import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment
@ -20,10 +21,11 @@ import info.nightscout.ui.activities.fragments.TreatmentsUserEntryFragment
import info.nightscout.ui.databinding.TreatmentsFragmentBinding
import javax.inject.Inject
class TreatmentsActivity : NoSplashAppCompatActivity() {
class TreatmentsActivity : DaggerAppCompatActivity() {
@Inject lateinit var config: Config
@Inject lateinit var activePlugin: ActivePlugin
@Inject lateinit var rh: ResourceHelper
private lateinit var binding: TreatmentsFragmentBinding