caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into refactor

Browse source
This commit is contained in:
Milos Kozak 2023-09-19 09:03:31 +02:00
parent 8be62d4e3e 4af9012609
commit 49c44a52b9
10 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
View file

@ -9,7 +9,7 @@ import info.nightscout.interfaces.profile.Profile
* Every function has a param from previous chained call * Every function has a param from previous chained call
* Function can limit the value even more and add another reason of restriction * Function can limit the value even more and add another reason of restriction
* *
* see [info.nightscout.implementation.constraints.ConstraintsImpl] * see [info.nightscout.plugins.constraints.ConstraintsImpl]
* which iterates over all registered plugins with [Constraints] implemented * which iterates over all registered plugins with [Constraints] implemented
* *
* @return updated parameter * @return updated parameter

2
core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/ItemTouchHelperAdapter.kt → core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/ItemTouchHelperAdapter.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.dragHelpers package info.nightscout.core.ui.dragHelpers
interface ItemTouchHelperAdapter { interface ItemTouchHelperAdapter {

2
core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/OnStartDragListener.kt → core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/OnStartDragListener.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.dragHelpers package info.nightscout.core.ui.dragHelpers
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView

2
core/interfaces/src/main/java/info/nightscout/interfaces/dragHelpers/SimpleItemTouchHelperCallback.kt → core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.dragHelpers package info.nightscout.core.ui.dragHelpers
import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_DRAG import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_DRAG

6
plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt
View file

@ -36,9 +36,9 @@ import info.nightscout.core.utils.HtmlHelper
import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Action
import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.UserEntry.Sources
import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter import info.nightscout.core.ui.dragHelpers.ItemTouchHelperAdapter
import info.nightscout.interfaces.dragHelpers.OnStartDragListener import info.nightscout.core.ui.dragHelpers.OnStartDragListener
import info.nightscout.interfaces.dragHelpers.SimpleItemTouchHelperCallback import info.nightscout.core.ui.dragHelpers.SimpleItemTouchHelperCallback
import info.nightscout.interfaces.logging.UserEntryLogger import info.nightscout.interfaces.logging.UserEntryLogger
import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus import info.nightscout.rx.bus.RxBus

3
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt
View file

@ -5,6 +5,7 @@ import dagger.Module
import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
import info.nightscout.interfaces.constraints.Constraints import info.nightscout.interfaces.constraints.Constraints
import info.nightscout.interfaces.versionChecker.VersionCheckerUtils import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
import info.nightscout.plugins.constraints.ConstraintsImpl
import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
import info.nightscout.plugins.constraints.versionChecker.VersionCheckerUtilsImpl import info.nightscout.plugins.constraints.versionChecker.VersionCheckerUtilsImpl
@ -23,6 +24,6 @@ abstract class PluginsConstraintsModule {
@Binds fun bindVersionCheckerUtils(versionCheckerUtils: VersionCheckerUtilsImpl): VersionCheckerUtils @Binds fun bindVersionCheckerUtils(versionCheckerUtils: VersionCheckerUtilsImpl): VersionCheckerUtils
@Binds fun bindBgQualityCheck(bgQualityCheck: BgQualityCheckPlugin): BgQualityCheck @Binds fun bindBgQualityCheck(bgQualityCheck: BgQualityCheckPlugin): BgQualityCheck
@Binds fun bindsConstraints(constraintsImpl: info.nightscout.plugins.constraints.ConstraintsImpl): Constraints @Binds fun bindsConstraints(constraintsImpl: ConstraintsImpl): Constraints
} }
} }

2
core/interfaces/src/main/java/info/nightscout/interfaces/constraints/versionChecker/AllowedVersions.kt → plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersions.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.interfaces.constraints.versionChecker package info.nightscout.plugins.constraints.versionChecker
import org.joda.time.LocalDate import org.joda.time.LocalDate
import org.json.JSONArray import org.json.JSONArray

1
plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerUtilsImpl.kt
View file

@ -3,7 +3,6 @@ package info.nightscout.plugins.constraints.versionChecker
import android.os.Build import android.os.Build
import dagger.Lazy import dagger.Lazy
import info.nightscout.interfaces.Config import info.nightscout.interfaces.Config
import info.nightscout.interfaces.constraints.versionChecker.AllowedVersions
import info.nightscout.interfaces.notifications.Notification import info.nightscout.interfaces.notifications.Notification
import info.nightscout.interfaces.receivers.ReceiverStatusStore import info.nightscout.interfaces.receivers.ReceiverStatusStore
import info.nightscout.interfaces.ui.UiInteraction import info.nightscout.interfaces.ui.UiInteraction

2
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.plugins.constraints.versionChecker package info.nightscout.plugins.constraints.versionChecker
import info.nightscout.interfaces.constraints.versionChecker.AllowedVersions import info.nightscout.plugins.constraints.versionChecker.AllowedVersions
import org.joda.time.LocalDate import org.joda.time.LocalDate
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject

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

@ -22,9 +22,9 @@ import info.nightscout.core.utils.ActionModeHelper
import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.core.utils.fabric.FabricPrivacy
import info.nightscout.core.wizard.QuickWizard import info.nightscout.core.wizard.QuickWizard
import info.nightscout.core.wizard.QuickWizardEntry import info.nightscout.core.wizard.QuickWizardEntry
import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter import info.nightscout.core.ui.dragHelpers.ItemTouchHelperAdapter
import info.nightscout.interfaces.dragHelpers.OnStartDragListener import info.nightscout.core.ui.dragHelpers.OnStartDragListener
import info.nightscout.interfaces.dragHelpers.SimpleItemTouchHelperCallback import info.nightscout.core.ui.dragHelpers.SimpleItemTouchHelperCallback
import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.AapsSchedulers
import info.nightscout.rx.bus.RxBus import info.nightscout.rx.bus.RxBus
import info.nightscout.shared.extensions.toVisibility import info.nightscout.shared.extensions.toVisibility