caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:plugins:configuration cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 12:44:36 +02:00
parent 101c528870
commit 9c6030ce0b
55 changed files with 204 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/kotlin/app/aaps/MainActivity.kt
View file

@ -31,9 +31,6 @@ import androidx.core.view.MenuProvider
import androidx.viewpager2.widget.ViewPager2 import androidx.viewpager2.widget.ViewPager2
import app.aaps.activities.HistoryBrowseActivity import app.aaps.activities.HistoryBrowseActivity
import app.aaps.activities.PreferencesActivity import app.aaps.activities.PreferencesActivity
import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.configuration.activities.SingleFragmentActivity
import app.aaps.configuration.setupwizard.SetupWizardActivity
import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
@ -62,6 +59,9 @@ import app.aaps.core.ui.toast.ToastUtils
import app.aaps.core.utils.isRunningRealPumpTest import app.aaps.core.utils.isRunningRealPumpTest
import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.plugins.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.plugins.configuration.activities.SingleFragmentActivity
import app.aaps.plugins.configuration.setupwizard.SetupWizardActivity
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.tabs.TabLayoutMediator import com.google.android.material.tabs.TabLayoutMediator
import com.google.firebase.crashlytics.FirebaseCrashlytics import com.google.firebase.crashlytics.FirebaseCrashlytics
@ -209,8 +209,8 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
R.id.nav_about -> { R.id.nav_about -> {
var message = "Build: ${BuildConfig.BUILDVERSION}\n" var message = "Build: ${BuildConfig.BUILDVERSION}\n"
message += "Flavor: ${BuildConfig.FLAVOR}${BuildConfig.BUILD_TYPE}\n" message += "Flavor: ${BuildConfig.FLAVOR}${BuildConfig.BUILD_TYPE}\n"
message += "${rh.gs(app.aaps.configuration.R.string.configbuilder_nightscoutversion_label)} ${activePlugin.activeNsClient?.detectedNsVersion() ?: rh.gs(info.nightscout.plugins.R.string.not_available_full)}" message += "${rh.gs(app.aaps.plugins.configuration.R.string.configbuilder_nightscoutversion_label)} ${activePlugin.activeNsClient?.detectedNsVersion() ?: rh.gs(info.nightscout.plugins.R.string.not_available_full)}"
if (config.isEngineeringMode()) message += "\n${rh.gs(app.aaps.configuration.R.string.engineering_mode_enabled)}" if (config.isEngineeringMode()) message += "\n${rh.gs(app.aaps.plugins.configuration.R.string.engineering_mode_enabled)}"
if (config.isUnfinishedMode()) message += "\nUnfinished mode enabled" if (config.isUnfinishedMode()) message += "\nUnfinished mode enabled"
if (!fabricPrivacy.fabricEnabled()) message += "\n${rh.gs(app.aaps.core.ui.R.string.fabric_upload_disabled)}" if (!fabricPrivacy.fabricEnabled()) message += "\n${rh.gs(app.aaps.core.ui.R.string.fabric_upload_disabled)}"
message += rh.gs(app.aaps.core.ui.R.string.about_link_urls) message += rh.gs(app.aaps.core.ui.R.string.about_link_urls)
@ -309,7 +309,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
} }
private fun startWizard(): Boolean = private fun startWizard(): Boolean =
!sp.getBoolean(app.aaps.configuration.R.string.key_setupwizard_processed, false) !sp.getBoolean(app.aaps.plugins.configuration.R.string.key_setupwizard_processed, false)
override fun onPostCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) { override fun onPostCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
super.onPostCreate(savedInstanceState, persistentState) super.onPostCreate(savedInstanceState, persistentState)

4
app/src/main/kotlin/app/aaps/MainApp.kt
View file

@ -225,8 +225,8 @@ class MainApp : DaggerApplication() {
} }
if (!sp.contains(info.nightscout.plugins.sync.R.string.key_ns_log_app_started_event)) if (!sp.contains(info.nightscout.plugins.sync.R.string.key_ns_log_app_started_event))
sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_log_app_started_event, config.APS) sp.putBoolean(info.nightscout.plugins.sync.R.string.key_ns_log_app_started_event, config.APS)
if (sp.getString(app.aaps.configuration.R.string.key_maintenance_logs_email, "") == "logs@androidaps.org") if (sp.getString(app.aaps.plugins.configuration.R.string.key_maintenance_logs_email, "") == "logs@androidaps.org")
sp.putString(app.aaps.configuration.R.string.key_maintenance_logs_email, "logs@aaps.app") sp.putString(app.aaps.plugins.configuration.R.string.key_maintenance_logs_email, "logs@aaps.app")
// fix values for theme switching // fix values for theme switching
sp.putString(info.nightscout.plugins.R.string.value_dark_theme, "dark") sp.putString(info.nightscout.plugins.R.string.value_dark_theme, "dark")
sp.putString(info.nightscout.plugins.R.string.value_light_theme, "light") sp.putString(info.nightscout.plugins.R.string.value_light_theme, "light")

10
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -15,7 +15,6 @@ import androidx.preference.PreferenceGroup
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import androidx.preference.size import androidx.preference.size
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.nsclient.NSSettingsStatus import app.aaps.core.interfaces.nsclient.NSSettingsStatus
import app.aaps.core.interfaces.plugin.PluginBase import app.aaps.core.interfaces.plugin.PluginBase
@ -39,6 +38,7 @@ import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import app.aaps.plugins.automation.AutomationPlugin import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import dagger.android.support.AndroidSupportInjection import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
@ -226,7 +226,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
addPreferencesFromResourceIfEnabled(wearPlugin, rootKey) addPreferencesFromResourceIfEnabled(wearPlugin, rootKey)
addPreferencesFromResourceIfEnabled(statusLinePlugin, rootKey) addPreferencesFromResourceIfEnabled(statusLinePlugin, rootKey)
addPreferencesFromResource(R.xml.pref_alerts, rootKey) addPreferencesFromResource(R.xml.pref_alerts, rootKey)
addPreferencesFromResource(app.aaps.configuration.R.xml.pref_datachoices, rootKey) addPreferencesFromResource(app.aaps.plugins.configuration.R.xml.pref_datachoices, rootKey)
addPreferencesFromResourceIfEnabled(maintenancePlugin, rootKey) addPreferencesFromResourceIfEnabled(maintenancePlugin, rootKey)
addPreferencesFromResourceIfEnabled(openHumansUploaderPlugin, rootKey) addPreferencesFromResourceIfEnabled(openHumansUploaderPlugin, rootKey)
} }
@ -252,7 +252,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
} }
if (key == rh.gs(info.nightscout.core.utils.R.string.key_use_autosens) && sp.getBoolean(info.nightscout.core.utils.R.string.key_use_autosens, false)) { if (key == rh.gs(info.nightscout.core.utils.R.string.key_use_autosens) && sp.getBoolean(info.nightscout.core.utils.R.string.key_use_autosens, false)) {
activity?.let { activity?.let {
OKDialog.show(it, rh.gs(app.aaps.configuration.R.string.configbuilder_sensitivity), rh.gs(R.string.sensitivity_warning)) OKDialog.show(it, rh.gs(app.aaps.plugins.configuration.R.string.configbuilder_sensitivity), rh.gs(R.string.sensitivity_warning))
} }
} }
checkForBiometricFallback(key) checkForBiometricFallback(key)
@ -278,7 +278,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
activity?.let { activity?.let {
val title = rh.gs(app.aaps.core.ui.R.string.unsecure_fallback_biometric) val title = rh.gs(app.aaps.core.ui.R.string.unsecure_fallback_biometric)
val message = val message =
rh.gs(app.aaps.configuration.R.string.master_password_missing, rh.gs(app.aaps.configuration.R.string.configbuilder_general), rh.gs(app.aaps.configuration.R.string.protection)) rh.gs(app.aaps.plugins.configuration.R.string.master_password_missing, rh.gs(app.aaps.plugins.configuration.R.string.configbuilder_general), rh.gs(app.aaps.plugins.configuration.R.string.protection))
OKDialog.show(it, title = title, message = message) OKDialog.show(it, title = title, message = message)
} }
} }
@ -439,7 +439,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
context?.let { context -> context?.let { context ->
when (preference.key) { when (preference.key) {
rh.gs(info.nightscout.core.utils.R.string.key_master_password) -> { rh.gs(info.nightscout.core.utils.R.string.key_master_password) -> {
passwordCheck.queryPassword(context, app.aaps.configuration.R.string.current_master_password, info.nightscout.core.utils.R.string.key_master_password, { passwordCheck.queryPassword(context, app.aaps.plugins.configuration.R.string.current_master_password, info.nightscout.core.utils.R.string.key_master_password, {
passwordCheck.setPassword(context, app.aaps.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password) passwordCheck.setPassword(context, app.aaps.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password)
}) })
true true

4
app/src/main/kotlin/app/aaps/activities/PreferencesActivity.kt
View file

@ -8,7 +8,7 @@ import androidx.appcompat.widget.SearchView
import androidx.core.view.MenuProvider import androidx.core.view.MenuProvider
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceScreen import androidx.preference.PreferenceScreen
import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult import app.aaps.plugins.configuration.activities.DaggerAppCompatActivityWithResult
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.ActivityPreferencesBinding import info.nightscout.androidaps.databinding.ActivityPreferencesBinding
@ -25,7 +25,7 @@ class PreferencesActivity : DaggerAppCompatActivityWithResult(), PreferenceFragm
binding = ActivityPreferencesBinding.inflate(layoutInflater) binding = ActivityPreferencesBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
title = rh.gs(app.aaps.configuration.R.string.nav_preferences) title = rh.gs(app.aaps.plugins.configuration.R.string.nav_preferences)
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowHomeEnabled(true) supportActionBar?.setDisplayShowHomeEnabled(true)
myPreferenceFragment = MyPreferenceFragment() myPreferenceFragment = MyPreferenceFragment()

2
app/src/main/kotlin/app/aaps/di/AppComponent.kt
View file

@ -1,12 +1,12 @@
package app.aaps.di package app.aaps.di
import app.aaps.MainApp import app.aaps.MainApp
import app.aaps.configuration.di.ConfigurationModule
import app.aaps.core.main.di.CoreModule import app.aaps.core.main.di.CoreModule
import app.aaps.core.validators.di.ValidatorsModule import app.aaps.core.validators.di.ValidatorsModule
import app.aaps.implementation.di.ImplementationModule import app.aaps.implementation.di.ImplementationModule
import app.aaps.plugins.aps.di.ApsModule import app.aaps.plugins.aps.di.ApsModule
import app.aaps.plugins.automation.di.AutomationModule import app.aaps.plugins.automation.di.AutomationModule
import app.aaps.plugins.configuration.di.ConfigurationModule
import app.aaps.shared.impl.di.SharedImplModule import app.aaps.shared.impl.di.SharedImplModule
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component

4
app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
View file

@ -1,7 +1,5 @@
package app.aaps.di package app.aaps.di
import app.aaps.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.core.interfaces.plugin.PluginBase import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.plugins.aps.autotune.AutotunePlugin import app.aaps.plugins.aps.autotune.AutotunePlugin
import app.aaps.plugins.aps.loop.LoopPlugin import app.aaps.plugins.aps.loop.LoopPlugin
@ -9,6 +7,8 @@ import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import app.aaps.plugins.automation.AutomationPlugin import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.multibindings.IntKey import dagger.multibindings.IntKey

6
app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt
View file

@ -10,15 +10,15 @@ import app.aaps.MainActivity
import app.aaps.activities.HistoryBrowseActivity import app.aaps.activities.HistoryBrowseActivity
import app.aaps.activities.MyPreferenceFragment import app.aaps.activities.MyPreferenceFragment
import app.aaps.activities.PreferencesActivity import app.aaps.activities.PreferencesActivity
import app.aaps.configuration.activities.SingleFragmentActivity
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.interfaces.notifications.Notification import app.aaps.core.interfaces.notifications.Notification
import app.aaps.core.interfaces.nsclient.NSAlarm import app.aaps.core.interfaces.nsclient.NSAlarm
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.ui.toast.ToastUtils
import app.aaps.plugins.configuration.activities.SingleFragmentActivity
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import app.aaps.core.ui.toast.ToastUtils
import info.nightscout.plugins.general.overview.notifications.NotificationWithAction import info.nightscout.plugins.general.overview.notifications.NotificationWithAction
import info.nightscout.ui.activities.BolusProgressHelperActivity import info.nightscout.ui.activities.BolusProgressHelperActivity
import info.nightscout.ui.activities.ErrorHelperActivity import info.nightscout.ui.activities.ErrorHelperActivity

6
app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt
View file

@ -9,9 +9,6 @@ import androidx.work.WorkManager
import androidx.work.WorkQuery import androidx.work.WorkQuery
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import androidx.work.workDataOf import androidx.work.workDataOf
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.core.interfaces.alerts.LocalAlertUtils import app.aaps.core.interfaces.alerts.LocalAlertUtils
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
@ -27,6 +24,9 @@ import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.ListenableFuture
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository

2
app/src/test/kotlin/app/aaps/configuration/maintenance/MaintenancePluginTest.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance package app.aaps.plugins.configuration.maintenance
import android.content.Context import android.content.Context
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config

3
plugins/configuration/build.gradle
View file

@ -11,8 +11,9 @@ apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android { android {
namespace 'app.aaps.configuration' namespace 'app.aaps.plugins.configuration'
} }

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/AndroidPermissionImpl.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration package app.aaps.plugins.configuration
import android.Manifest import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
@ -13,7 +13,6 @@ import android.os.PowerManager
import android.provider.Settings import android.provider.Settings
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.notifications.Notification import app.aaps.core.interfaces.notifications.Notification
@ -22,6 +21,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.ui.toast.ToastUtils
import app.aaps.plugins.configuration.activities.DaggerAppCompatActivityWithResult
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

10
plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/activities/DaggerAppCompatActivityWithResult.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.activities package app.aaps.plugins.configuration.activities
import android.Manifest import android.Manifest
import android.content.Context import android.content.Context
@ -6,18 +6,18 @@ import android.content.pm.PackageManager
import android.os.Bundle import android.os.Bundle
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import app.aaps.configuration.R
import app.aaps.configuration.maintenance.CustomWatchfaceFileContract
import app.aaps.configuration.maintenance.PrefsFileContract
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.maintenance.ImportExportPrefs import app.aaps.core.interfaces.maintenance.ImportExportPrefs
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventThemeSwitch import app.aaps.core.interfaces.rx.events.EventThemeSwitch
import dagger.android.support.DaggerAppCompatActivity
import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.locale.LocaleHelper import app.aaps.core.ui.locale.LocaleHelper
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.maintenance.CustomWatchfaceFileContract
import app.aaps.plugins.configuration.maintenance.PrefsFileContract
import dagger.android.support.DaggerAppCompatActivity
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import javax.inject.Inject import javax.inject.Inject

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/OptimizationPermissionContract.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/activities/OptimizationPermissionContract.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.activities package app.aaps.plugins.configuration.activities
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent

6
plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/activities/SingleFragmentActivity.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.activities package app.aaps.plugins.configuration.activities
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
@ -6,11 +6,11 @@ import android.view.Menu
import android.view.MenuInflater import android.view.MenuInflater
import android.view.MenuItem import android.view.MenuItem
import androidx.core.view.MenuProvider import androidx.core.view.MenuProvider
import app.aaps.configuration.R
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.plugin.PluginBase import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.protection.ProtectionCheck
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.plugins.configuration.R
import javax.inject.Inject import javax.inject.Inject
class SingleFragmentActivity : DaggerAppCompatActivityWithResult() { class SingleFragmentActivity : DaggerAppCompatActivityWithResult() {
@ -52,7 +52,7 @@ class SingleFragmentActivity : DaggerAppCompatActivityWithResult() {
R.id.nav_plugin_preferences -> { R.id.nav_plugin_preferences -> {
protectionCheck.queryProtection(this@SingleFragmentActivity, ProtectionCheck.Protection.PREFERENCES, { protectionCheck.queryProtection(this@SingleFragmentActivity, ProtectionCheck.Protection.PREFERENCES, {
val i = Intent(this@SingleFragmentActivity, uiInteraction.preferencesActivity) val i = Intent(this@SingleFragmentActivity, uiInteraction.preferencesActivity)
.setAction("app.aaps.configuration.activities.SingleFragmentActivity") .setAction("app.aaps.plugins.configuration.activities.SingleFragmentActivity")
.putExtra("id", plugin?.preferencesId) .putExtra("id", plugin?.preferencesId)
startActivity(i) startActivity(i)
}, null) }, null)

10
plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/ConfigBuilderFragment.kt
View file

@ -1,13 +1,9 @@
package app.aaps.configuration.configBuilder package app.aaps.plugins.configuration.configBuilder
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import app.aaps.configuration.R
import app.aaps.configuration.configBuilder.events.EventConfigBuilderUpdateGui
import app.aaps.configuration.databinding.ConfigbuilderFragmentBinding
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.configuration.ConfigBuilder import app.aaps.core.interfaces.configuration.ConfigBuilder
import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.extensions.toVisibility
@ -18,6 +14,10 @@ import app.aaps.core.interfaces.protection.ProtectionCheck.Protection.PREFERENCE
import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.configBuilder.events.EventConfigBuilderUpdateGui
import app.aaps.plugins.configuration.databinding.ConfigbuilderFragmentBinding
import dagger.android.support.DaggerFragment import dagger.android.support.DaggerFragment
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign

6
plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/ConfigBuilderPlugin.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.configBuilder package app.aaps.plugins.configuration.configBuilder
import android.content.Intent import android.content.Intent
import android.view.LayoutInflater import android.view.LayoutInflater
@ -13,8 +13,6 @@ import androidx.annotation.StringRes
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import app.aaps.configuration.R
import app.aaps.configuration.configBuilder.events.EventConfigBuilderUpdateGui
import app.aaps.core.interfaces.aps.APS import app.aaps.core.interfaces.aps.APS
import app.aaps.core.interfaces.aps.Sensitivity import app.aaps.core.interfaces.aps.Sensitivity
import app.aaps.core.interfaces.configuration.ConfigBuilder import app.aaps.core.interfaces.configuration.ConfigBuilder
@ -45,6 +43,8 @@ import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.configBuilder.events.EventConfigBuilderUpdateGui
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import java.security.InvalidParameterException import java.security.InvalidParameterException
import javax.inject.Inject import javax.inject.Inject

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/RunningConfigurationImpl.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/RunningConfigurationImpl.kt
View file

@ -1,6 +1,5 @@
package app.aaps.configuration.configBuilder package app.aaps.plugins.configuration.configBuilder
import app.aaps.configuration.R
import app.aaps.core.interfaces.aps.Sensitivity import app.aaps.core.interfaces.aps.Sensitivity
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.configuration.ConfigBuilder import app.aaps.core.interfaces.configuration.ConfigBuilder
@ -20,6 +19,7 @@ import app.aaps.core.interfaces.smoothing.Smoothing
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.nssdk.interfaces.RunningConfiguration import app.aaps.core.nssdk.interfaces.RunningConfiguration
import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus
import app.aaps.plugins.configuration.R
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/events/EventConfigBuilderUpdateGui.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/events/EventConfigBuilderUpdateGui.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.configBuilder.events package app.aaps.plugins.configuration.configBuilder.events
import app.aaps.core.interfaces.rx.events.EventUpdateGui import app.aaps.core.interfaces.rx.events.EventUpdateGui

28
plugins/configuration/src/main/kotlin/app/aaps/configuration/di/ConfigurationModule.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/di/ConfigurationModule.kt
View file

@ -1,25 +1,25 @@
package app.aaps.configuration.di package app.aaps.plugins.configuration.di
import app.aaps.configuration.AndroidPermissionImpl
import app.aaps.configuration.activities.SingleFragmentActivity
import app.aaps.configuration.configBuilder.ConfigBuilderFragment
import app.aaps.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.configuration.configBuilder.RunningConfigurationImpl
import app.aaps.configuration.maintenance.ImportExportPrefsImpl
import app.aaps.configuration.maintenance.MaintenanceFragment
import app.aaps.configuration.maintenance.PrefFileListProviderImpl
import app.aaps.configuration.maintenance.activities.CustomWatchfaceImportListActivity
import app.aaps.configuration.maintenance.activities.LogSettingActivity
import app.aaps.configuration.maintenance.activities.PrefImportListActivity
import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat
import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.core.interfaces.configuration.ConfigBuilder import app.aaps.core.interfaces.configuration.ConfigBuilder
import app.aaps.core.interfaces.maintenance.ImportExportPrefs import app.aaps.core.interfaces.maintenance.ImportExportPrefs
import app.aaps.core.interfaces.maintenance.PrefFileListProvider import app.aaps.core.interfaces.maintenance.PrefFileListProvider
import app.aaps.core.nssdk.interfaces.RunningConfiguration
import app.aaps.plugins.configuration.AndroidPermissionImpl
import app.aaps.plugins.configuration.activities.SingleFragmentActivity
import app.aaps.plugins.configuration.configBuilder.ConfigBuilderFragment
import app.aaps.plugins.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.plugins.configuration.configBuilder.RunningConfigurationImpl
import app.aaps.plugins.configuration.maintenance.ImportExportPrefsImpl
import app.aaps.plugins.configuration.maintenance.MaintenanceFragment
import app.aaps.plugins.configuration.maintenance.PrefFileListProviderImpl
import app.aaps.plugins.configuration.maintenance.activities.CustomWatchfaceImportListActivity
import app.aaps.plugins.configuration.maintenance.activities.LogSettingActivity
import app.aaps.plugins.configuration.maintenance.activities.PrefImportListActivity
import app.aaps.plugins.configuration.maintenance.formats.EncryptedPrefsFormat
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
import app.aaps.core.nssdk.interfaces.RunningConfiguration
@Module( @Module(
includes = [ includes = [

38
plugins/configuration/src/main/kotlin/app/aaps/configuration/di/SetupWizardModule.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/di/SetupWizardModule.kt
View file

@ -1,23 +1,23 @@
package app.aaps.configuration.di package app.aaps.plugins.configuration.di
import app.aaps.configuration.setupwizard.SWEventListener import app.aaps.plugins.configuration.setupwizard.SWEventListener
import app.aaps.configuration.setupwizard.SWScreen import app.aaps.plugins.configuration.setupwizard.SWScreen
import app.aaps.configuration.setupwizard.SetupWizardActivity import app.aaps.plugins.configuration.setupwizard.SetupWizardActivity
import app.aaps.configuration.setupwizard.elements.SWBreak import app.aaps.plugins.configuration.setupwizard.elements.SWBreak
import app.aaps.configuration.setupwizard.elements.SWButton import app.aaps.plugins.configuration.setupwizard.elements.SWButton
import app.aaps.configuration.setupwizard.elements.SWEditEncryptedPassword import app.aaps.plugins.configuration.setupwizard.elements.SWEditEncryptedPassword
import app.aaps.configuration.setupwizard.elements.SWEditIntNumber import app.aaps.plugins.configuration.setupwizard.elements.SWEditIntNumber
import app.aaps.configuration.setupwizard.elements.SWEditNumber import app.aaps.plugins.configuration.setupwizard.elements.SWEditNumber
import app.aaps.configuration.setupwizard.elements.SWEditNumberWithUnits import app.aaps.plugins.configuration.setupwizard.elements.SWEditNumberWithUnits
import app.aaps.configuration.setupwizard.elements.SWEditString import app.aaps.plugins.configuration.setupwizard.elements.SWEditString
import app.aaps.configuration.setupwizard.elements.SWEditUrl import app.aaps.plugins.configuration.setupwizard.elements.SWEditUrl
import app.aaps.configuration.setupwizard.elements.SWFragment import app.aaps.plugins.configuration.setupwizard.elements.SWFragment
import app.aaps.configuration.setupwizard.elements.SWHtmlLink import app.aaps.plugins.configuration.setupwizard.elements.SWHtmlLink
import app.aaps.configuration.setupwizard.elements.SWInfoText import app.aaps.plugins.configuration.setupwizard.elements.SWInfoText
import app.aaps.configuration.setupwizard.elements.SWItem import app.aaps.plugins.configuration.setupwizard.elements.SWItem
import app.aaps.configuration.setupwizard.elements.SWPlugin import app.aaps.plugins.configuration.setupwizard.elements.SWPlugin
import app.aaps.configuration.setupwizard.elements.SWPreference import app.aaps.plugins.configuration.setupwizard.elements.SWPreference
import app.aaps.configuration.setupwizard.elements.SWRadioButton import app.aaps.plugins.configuration.setupwizard.elements.SWRadioButton
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/CustomWatchfaceFileContract.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/CustomWatchfaceFileContract.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance package app.aaps.plugins.configuration.maintenance
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -20,6 +20,6 @@ class CustomWatchfaceFileContract : ActivityResultContract<Void?, Unit?>() {
} }
override fun createIntent(context: Context, input: Void?): Intent { override fun createIntent(context: Context, input: Void?): Intent {
return Intent(context, app.aaps.configuration.maintenance.activities.CustomWatchfaceImportListActivity::class.java) return Intent(context, app.aaps.plugins.configuration.maintenance.activities.CustomWatchfaceImportListActivity::class.java)
} }
} }

20
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/ImportExportPrefsImpl.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance package app.aaps.plugins.configuration.maintenance
import android.Manifest import android.Manifest
import android.bluetooth.BluetoothManager import android.bluetooth.BluetoothManager
@ -18,15 +18,6 @@ import androidx.work.OneTimeWorkRequest
import androidx.work.WorkManager import androidx.work.WorkManager
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import androidx.work.workDataOf import androidx.work.workDataOf
import app.aaps.configuration.R
import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.configuration.maintenance.data.PrefFileNotFoundError
import app.aaps.configuration.maintenance.data.PrefIOError
import app.aaps.configuration.maintenance.data.Prefs
import app.aaps.configuration.maintenance.data.PrefsFormat
import app.aaps.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.configuration.maintenance.dialogs.PrefImportSummaryDialog
import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat
import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.db.PersistenceLayer
@ -61,6 +52,15 @@ import app.aaps.core.ui.toast.ToastUtils
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.plugins.configuration.maintenance.data.PrefFileNotFoundError
import app.aaps.plugins.configuration.maintenance.data.PrefIOError
import app.aaps.plugins.configuration.maintenance.data.Prefs
import app.aaps.plugins.configuration.maintenance.data.PrefsFormat
import app.aaps.plugins.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.plugins.configuration.maintenance.dialogs.PrefImportSummaryDialog
import app.aaps.plugins.configuration.maintenance.formats.EncryptedPrefsFormat
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import java.io.File import java.io.File

8
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/MaintenanceFragment.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance package app.aaps.plugins.configuration.maintenance
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
@ -6,9 +6,6 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.text.toSpanned import androidx.core.text.toSpanned
import app.aaps.configuration.R
import app.aaps.configuration.databinding.MaintenanceFragmentBinding
import app.aaps.configuration.maintenance.activities.LogSettingActivity
import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.db.PersistenceLayer
import app.aaps.core.interfaces.extensions.runOnUiThread import app.aaps.core.interfaces.extensions.runOnUiThread
import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.extensions.toVisibility
@ -34,6 +31,9 @@ import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.utils.HtmlHelper import app.aaps.core.utils.HtmlHelper
import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.databinding.MaintenanceFragmentBinding
import app.aaps.plugins.configuration.maintenance.activities.LogSettingActivity
import dagger.android.support.DaggerFragment import dagger.android.support.DaggerFragment
import io.reactivex.rxjava3.core.Completable import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/MaintenancePlugin.kt
View file

@ -1,10 +1,9 @@
package app.aaps.configuration.maintenance package app.aaps.plugins.configuration.maintenance
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import app.aaps.configuration.R
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LoggerUtils import app.aaps.core.interfaces.logging.LoggerUtils
@ -15,6 +14,7 @@ import app.aaps.core.interfaces.plugin.PluginDescription
import app.aaps.core.interfaces.plugin.PluginType import app.aaps.core.interfaces.plugin.PluginType
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.plugins.configuration.R
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import java.io.BufferedInputStream import java.io.BufferedInputStream
import java.io.BufferedOutputStream import java.io.BufferedOutputStream

10
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/PrefFileListProviderImpl.kt
View file

@ -1,12 +1,8 @@
package app.aaps.configuration.maintenance package app.aaps.plugins.configuration.maintenance
import android.content.Context import android.content.Context
import android.os.Environment import android.os.Environment
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.configuration.R
import app.aaps.configuration.maintenance.data.PrefMetadataMap
import app.aaps.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.maintenance.PrefFileListProvider import app.aaps.core.interfaces.maintenance.PrefFileListProvider
import app.aaps.core.interfaces.maintenance.PrefMetadata import app.aaps.core.interfaces.maintenance.PrefMetadata
@ -21,6 +17,10 @@ import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.storage.Storage import app.aaps.core.interfaces.storage.Storage
import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.maintenance.data.PrefMetadataMap
import app.aaps.plugins.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.plugins.configuration.maintenance.formats.EncryptedPrefsFormat
import dagger.Lazy import dagger.Lazy
import dagger.Reusable import dagger.Reusable
import org.joda.time.DateTime import org.joda.time.DateTime

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsFileContract.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/PrefsFileContract.kt
View file

@ -1,12 +1,12 @@
package app.aaps.configuration.maintenance package app.aaps.plugins.configuration.maintenance
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import androidx.activity.result.contract.ActivityResultContract import androidx.activity.result.contract.ActivityResultContract
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import app.aaps.configuration.maintenance.activities.PrefImportListActivity
import app.aaps.core.interfaces.maintenance.PrefsFile import app.aaps.core.interfaces.maintenance.PrefsFile
import app.aaps.core.utils.extensions.safeGetParcelableExtra import app.aaps.core.utils.extensions.safeGetParcelableExtra
import app.aaps.plugins.configuration.maintenance.activities.PrefImportListActivity
class PrefsFileContract : ActivityResultContract<Void?, PrefsFile?>() { class PrefsFileContract : ActivityResultContract<Void?, PrefsFile?>() {

6
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefsMetadataKeyImpl.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/PrefsMetadataKeyImpl.kt
View file

@ -1,11 +1,11 @@
package app.aaps.configuration.maintenance package app.aaps.plugins.configuration.maintenance
import android.content.Context import android.content.Context
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.annotation.StringRes import androidx.annotation.StringRes
import app.aaps.configuration.R
import app.aaps.configuration.maintenance.data.PrefsFormat
import app.aaps.core.interfaces.maintenance.PrefsMetadataKey import app.aaps.core.interfaces.maintenance.PrefsMetadataKey
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.maintenance.data.PrefsFormat
enum class PrefsMetadataKeyImpl(override val key: String, @DrawableRes override val icon: Int, @StringRes override val label: Int) : PrefsMetadataKey { enum class PrefsMetadataKeyImpl(override val key: String, @DrawableRes override val icon: Int, @StringRes override val label: Int) : PrefsMetadataKey {

8
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance.activities package app.aaps.plugins.configuration.maintenance.activities
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
@ -7,9 +7,6 @@ import android.view.ViewGroup
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import app.aaps.configuration.R
import app.aaps.configuration.databinding.CustomWatchfaceImportListActivityBinding
import app.aaps.configuration.databinding.CustomWatchfaceImportListItemBinding
import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.maintenance.PrefFileListProvider import app.aaps.core.interfaces.maintenance.PrefFileListProvider
@ -31,6 +28,9 @@ import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.databinding.CustomWatchfaceImportListActivityBinding
import app.aaps.plugins.configuration.databinding.CustomWatchfaceImportListItemBinding
import javax.inject.Inject import javax.inject.Inject
class CustomWatchfaceImportListActivity : TranslatedDaggerAppCompatActivity() { class CustomWatchfaceImportListActivity : TranslatedDaggerAppCompatActivity() {

6
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/activities/LogSettingActivity.kt
View file

@ -1,16 +1,16 @@
package app.aaps.configuration.maintenance.activities package app.aaps.plugins.configuration.maintenance.activities
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.widget.CheckBox import android.widget.CheckBox
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import app.aaps.configuration.R
import app.aaps.configuration.databinding.ActivityLogsettingBinding
import app.aaps.core.interfaces.logging.L import app.aaps.core.interfaces.logging.L
import app.aaps.core.interfaces.logging.LogElement import app.aaps.core.interfaces.logging.LogElement
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.databinding.ActivityLogsettingBinding
import javax.inject.Inject import javax.inject.Inject
class LogSettingActivity : TranslatedDaggerAppCompatActivity() { class LogSettingActivity : TranslatedDaggerAppCompatActivity() {

14
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/activities/PrefImportListActivity.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance.activities package app.aaps.plugins.configuration.maintenance.activities
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
@ -8,16 +8,16 @@ import android.view.ViewGroup
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import app.aaps.configuration.R
import app.aaps.configuration.databinding.MaintenanceImportListActivityBinding
import app.aaps.configuration.databinding.MaintenanceImportListItemBinding
import app.aaps.configuration.maintenance.PrefsFileContract
import app.aaps.configuration.maintenance.PrefsMetadataKeyImpl
import app.aaps.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.core.interfaces.maintenance.PrefFileListProvider import app.aaps.core.interfaces.maintenance.PrefFileListProvider
import app.aaps.core.interfaces.maintenance.PrefsFile import app.aaps.core.interfaces.maintenance.PrefsFile
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.databinding.MaintenanceImportListActivityBinding
import app.aaps.plugins.configuration.databinding.MaintenanceImportListItemBinding
import app.aaps.plugins.configuration.maintenance.PrefsFileContract
import app.aaps.plugins.configuration.maintenance.PrefsMetadataKeyImpl
import app.aaps.plugins.configuration.maintenance.data.PrefsStatusImpl
import javax.inject.Inject import javax.inject.Inject
class PrefImportListActivity : TranslatedDaggerAppCompatActivity() { class PrefImportListActivity : TranslatedDaggerAppCompatActivity() {

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/data/PrefsFormat.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/data/PrefsFormat.kt
View file

@ -1,10 +1,10 @@
package app.aaps.configuration.maintenance.data package app.aaps.plugins.configuration.maintenance.data
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import app.aaps.configuration.R
import app.aaps.core.interfaces.maintenance.PrefMetadata import app.aaps.core.interfaces.maintenance.PrefMetadata
import app.aaps.core.interfaces.maintenance.PrefsMetadataKey import app.aaps.core.interfaces.maintenance.PrefsMetadataKey
import app.aaps.core.interfaces.maintenance.PrefsStatus import app.aaps.core.interfaces.maintenance.PrefsStatus
import app.aaps.plugins.configuration.R
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
import java.io.File import java.io.File

10
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance.dialogs package app.aaps.plugins.configuration.maintenance.dialogs
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -16,12 +16,12 @@ import androidx.annotation.DrawableRes
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.annotation.StyleRes import androidx.annotation.StyleRes
import androidx.appcompat.view.ContextThemeWrapper import androidx.appcompat.view.ContextThemeWrapper
import app.aaps.configuration.R
import app.aaps.configuration.maintenance.data.Prefs
import app.aaps.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.core.interfaces.extensions.runOnUiThread import app.aaps.core.interfaces.extensions.runOnUiThread
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.ui.toast.ToastUtils
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.maintenance.data.Prefs
import app.aaps.plugins.configuration.maintenance.data.PrefsStatusImpl
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import java.util.LinkedList import java.util.LinkedList
object PrefImportSummaryDialog { object PrefImportSummaryDialog {

20
plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormat.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/formats/EncryptedPrefsFormat.kt
View file

@ -1,14 +1,5 @@
package app.aaps.configuration.maintenance.formats package app.aaps.plugins.configuration.maintenance.formats
import app.aaps.configuration.R
import app.aaps.configuration.maintenance.PrefsMetadataKeyImpl
import app.aaps.configuration.maintenance.data.PrefFileNotFoundError
import app.aaps.configuration.maintenance.data.PrefFormatError
import app.aaps.configuration.maintenance.data.PrefIOError
import app.aaps.configuration.maintenance.data.PrefMetadataMap
import app.aaps.configuration.maintenance.data.Prefs
import app.aaps.configuration.maintenance.data.PrefsFormat
import app.aaps.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.core.interfaces.maintenance.PrefMetadata import app.aaps.core.interfaces.maintenance.PrefMetadata
import app.aaps.core.interfaces.maintenance.PrefsMetadataKey import app.aaps.core.interfaces.maintenance.PrefsMetadataKey
import app.aaps.core.interfaces.maintenance.PrefsStatus import app.aaps.core.interfaces.maintenance.PrefsStatus
@ -17,6 +8,15 @@ import app.aaps.core.interfaces.storage.Storage
import app.aaps.core.main.utils.CryptoUtil import app.aaps.core.main.utils.CryptoUtil
import app.aaps.core.utils.hexStringToByteArray import app.aaps.core.utils.hexStringToByteArray
import app.aaps.core.utils.toHex import app.aaps.core.utils.toHex
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.maintenance.PrefsMetadataKeyImpl
import app.aaps.plugins.configuration.maintenance.data.PrefFileNotFoundError
import app.aaps.plugins.configuration.maintenance.data.PrefFormatError
import app.aaps.plugins.configuration.maintenance.data.PrefIOError
import app.aaps.plugins.configuration.maintenance.data.PrefMetadataMap
import app.aaps.plugins.configuration.maintenance.data.Prefs
import app.aaps.plugins.configuration.maintenance.data.PrefsFormat
import app.aaps.plugins.configuration.maintenance.data.PrefsStatusImpl
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import java.io.File import java.io.File

30
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SWDefinition.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard package app.aaps.plugins.configuration.setupwizard
import android.Manifest import android.Manifest
import android.content.Context import android.content.Context
@ -6,20 +6,6 @@ import android.content.Intent
import android.net.Uri import android.net.Uri
import android.provider.Settings import android.provider.Settings
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import app.aaps.configuration.R
import app.aaps.configuration.setupwizard.elements.SWBreak
import app.aaps.configuration.setupwizard.elements.SWButton
import app.aaps.configuration.setupwizard.elements.SWEditEncryptedPassword
import app.aaps.configuration.setupwizard.elements.SWEditIntNumber
import app.aaps.configuration.setupwizard.elements.SWEditNumber
import app.aaps.configuration.setupwizard.elements.SWEditNumberWithUnits
import app.aaps.configuration.setupwizard.elements.SWEditString
import app.aaps.configuration.setupwizard.elements.SWFragment
import app.aaps.configuration.setupwizard.elements.SWHtmlLink
import app.aaps.configuration.setupwizard.elements.SWInfoText
import app.aaps.configuration.setupwizard.elements.SWPlugin
import app.aaps.configuration.setupwizard.elements.SWPreference
import app.aaps.configuration.setupwizard.elements.SWRadioButton
import app.aaps.core.interfaces.androidPermissions.AndroidPermission import app.aaps.core.interfaces.androidPermissions.AndroidPermission
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
@ -47,6 +33,20 @@ import app.aaps.core.interfaces.utils.HardLimits
import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.CryptoUtil import app.aaps.core.main.utils.CryptoUtil
import app.aaps.core.utils.isRunningTest import app.aaps.core.utils.isRunningTest
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.setupwizard.elements.SWBreak
import app.aaps.plugins.configuration.setupwizard.elements.SWButton
import app.aaps.plugins.configuration.setupwizard.elements.SWEditEncryptedPassword
import app.aaps.plugins.configuration.setupwizard.elements.SWEditIntNumber
import app.aaps.plugins.configuration.setupwizard.elements.SWEditNumber
import app.aaps.plugins.configuration.setupwizard.elements.SWEditNumberWithUnits
import app.aaps.plugins.configuration.setupwizard.elements.SWEditString
import app.aaps.plugins.configuration.setupwizard.elements.SWFragment
import app.aaps.plugins.configuration.setupwizard.elements.SWHtmlLink
import app.aaps.plugins.configuration.setupwizard.elements.SWInfoText
import app.aaps.plugins.configuration.setupwizard.elements.SWPlugin
import app.aaps.plugins.configuration.setupwizard.elements.SWPreference
import app.aaps.plugins.configuration.setupwizard.elements.SWRadioButton
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWEventListener.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SWEventListener.kt
View file

@ -1,13 +1,13 @@
package app.aaps.configuration.setupwizard package app.aaps.plugins.configuration.setupwizard
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.view.View import android.view.View
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import app.aaps.configuration.setupwizard.elements.SWItem
import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.events.EventStatus import app.aaps.core.interfaces.rx.events.EventStatus
import app.aaps.plugins.configuration.setupwizard.elements.SWItem
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWScreen.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SWScreen.kt
View file

@ -1,7 +1,7 @@
package app.aaps.configuration.setupwizard package app.aaps.plugins.configuration.setupwizard
import app.aaps.configuration.setupwizard.elements.SWItem
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.plugins.configuration.setupwizard.elements.SWItem
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import javax.inject.Inject import javax.inject.Inject

20
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SetupWizardActivity.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard package app.aaps.plugins.configuration.setupwizard
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
@ -9,11 +9,6 @@ import android.view.View
import android.widget.TextView import android.widget.TextView
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.core.view.MenuProvider import androidx.core.view.MenuProvider
import app.aaps.configuration.R
import app.aaps.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.configuration.databinding.ActivitySetupwizardBinding
import app.aaps.configuration.setupwizard.elements.SWItem
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.events.EventProfileStoreChanged import app.aaps.core.interfaces.rx.events.EventProfileStoreChanged
import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged import app.aaps.core.interfaces.rx.events.EventProfileSwitchChanged
@ -23,9 +18,14 @@ import app.aaps.core.interfaces.rx.events.EventSWSyncStatus
import app.aaps.core.interfaces.rx.events.EventSWUpdate import app.aaps.core.interfaces.rx.events.EventSWUpdate
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import dagger.android.HasAndroidInjector import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.locale.LocaleHelper.update import app.aaps.core.ui.locale.LocaleHelper.update
import app.aaps.plugins.configuration.R
import app.aaps.plugins.configuration.activities.DaggerAppCompatActivityWithResult
import app.aaps.plugins.configuration.databinding.ActivitySetupwizardBinding
import app.aaps.plugins.configuration.setupwizard.elements.SWItem
import dagger.android.HasAndroidInjector
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject import javax.inject.Inject
@ -166,7 +166,7 @@ class SetupWizardActivity : DaggerAppCompatActivityWithResult() {
@Suppress("UNUSED_PARAMETER") @Suppress("UNUSED_PARAMETER")
fun showNextPage(view: View?) { fun showNextPage(view: View?) {
finish() finish()
val intent = Intent(this, SetupWizardActivity::class.java).setAction("app.aaps.configuration.setupwizard.SetupWizardActivity") val intent = Intent(this, SetupWizardActivity::class.java).setAction("app.aaps.plugins.configuration.setupwizard.SetupWizardActivity")
intent.putExtra(intentMessage, nextPage(null)) intent.putExtra(intentMessage, nextPage(null))
startActivity(intent) startActivity(intent)
} }
@ -174,7 +174,7 @@ class SetupWizardActivity : DaggerAppCompatActivityWithResult() {
@Suppress("UNUSED_PARAMETER") @Suppress("UNUSED_PARAMETER")
fun showPreviousPage(view: View?) { fun showPreviousPage(view: View?) {
finish() finish()
val intent = Intent(this, SetupWizardActivity::class.java).setAction("app.aaps.configuration.setupwizard.SetupWizardActivity") val intent = Intent(this, SetupWizardActivity::class.java).setAction("app.aaps.plugins.configuration.setupwizard.SetupWizardActivity")
intent.putExtra(intentMessage, previousPage(null)) intent.putExtra(intentMessage, previousPage(null))
startActivity(intent) startActivity(intent)
} }
@ -183,7 +183,7 @@ class SetupWizardActivity : DaggerAppCompatActivityWithResult() {
@Suppress("UNUSED_PARAMETER") @Suppress("UNUSED_PARAMETER")
fun finishSetupWizard(view: View?) { fun finishSetupWizard(view: View?) {
sp.putBoolean(R.string.key_setupwizard_processed, true) sp.putBoolean(R.string.key_setupwizard_processed, true)
val intent = Intent(this, uiInteraction.mainActivity).setAction("app.aaps.configuration.setupwizard.SetupWizardActivity") val intent = Intent(this, uiInteraction.mainActivity).setAction("app.aaps.plugins.configuration.setupwizard.SetupWizardActivity")
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
startActivity(intent) startActivity(intent)
finish() finish()

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWBreak.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWBreak.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.view.View import android.view.View
import android.widget.LinearLayout import android.widget.LinearLayout

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWButton.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWButton.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.view.View import android.view.View
import android.widget.Button import android.widget.Button

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWEditEncryptedPassword.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.graphics.Typeface import android.graphics.Typeface
import android.text.Editable import android.text.Editable
@ -9,8 +9,8 @@ import android.widget.Button
import android.widget.EditText import android.widget.EditText
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import app.aaps.core.main.utils.CryptoUtil
import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.core.main.utils.CryptoUtil
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
class SWEditEncryptedPassword(injector: HasAndroidInjector, private val cryptoUtil: CryptoUtil) : SWItem(injector, Type.STRING) { class SWEditEncryptedPassword(injector: HasAndroidInjector, private val cryptoUtil: CryptoUtil) : SWItem(injector, Type.STRING) {

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWEditIntNumber.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.graphics.Typeface import android.graphics.Typeface
import android.text.Editable import android.text.Editable
@ -7,8 +7,8 @@ import android.view.View
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.SafeParse
import dagger.android.HasAndroidInjector
import app.aaps.core.ui.elements.NumberPicker import app.aaps.core.ui.elements.NumberPicker
import dagger.android.HasAndroidInjector
import java.text.DecimalFormat import java.text.DecimalFormat
class SWEditIntNumber(injector: HasAndroidInjector, private val init: Int, private val min: Int, private val max: Int) : SWItem(injector, Type.NUMBER) { class SWEditIntNumber(injector: HasAndroidInjector, private val init: Int, private val min: Int, private val max: Int) : SWItem(injector, Type.NUMBER) {

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWEditNumber.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.graphics.Typeface import android.graphics.Typeface
import android.text.Editable import android.text.Editable
@ -7,8 +7,8 @@ import android.view.View
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.SafeParse
import dagger.android.HasAndroidInjector
import app.aaps.core.ui.elements.NumberPicker import app.aaps.core.ui.elements.NumberPicker
import dagger.android.HasAndroidInjector
import java.text.DecimalFormat import java.text.DecimalFormat
class SWEditNumber(injector: HasAndroidInjector, private val init: Double, private val min: Double, private val max: Double) : SWItem(injector, Type.DECIMAL_NUMBER) { class SWEditNumber(injector: HasAndroidInjector, private val init: Double, private val min: Double, private val max: Double) : SWItem(injector, Type.DECIMAL_NUMBER) {

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWEditNumberWithUnits.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.graphics.Typeface import android.graphics.Typeface
import android.text.Editable import android.text.Editable
@ -10,8 +10,8 @@ import app.aaps.core.interfaces.configuration.Constants
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.profile.ProfileUtil
import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.SafeParse
import dagger.android.HasAndroidInjector
import app.aaps.core.ui.elements.NumberPicker import app.aaps.core.ui.elements.NumberPicker
import dagger.android.HasAndroidInjector
import java.text.DecimalFormat import java.text.DecimalFormat
import javax.inject.Inject import javax.inject.Inject

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditString.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWEditString.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.graphics.Typeface import android.graphics.Typeface
import android.text.Editable import android.text.Editable

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditUrl.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWEditUrl.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.graphics.Typeface import android.graphics.Typeface
import android.text.Editable import android.text.Editable
@ -9,7 +9,7 @@ import android.view.View
import android.widget.EditText import android.widget.EditText
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import app.aaps.configuration.setupwizard.events.EventSWLabel import app.aaps.plugins.configuration.setupwizard.events.EventSWLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
class SWEditUrl(injector: HasAndroidInjector) : SWItem(injector, Type.URL) { class SWEditUrl(injector: HasAndroidInjector) : SWItem(injector, Type.URL) {

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWFragment.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWFragment.kt
View file

@ -1,8 +1,8 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import app.aaps.configuration.setupwizard.SWDefinition import app.aaps.plugins.configuration.setupwizard.SWDefinition
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
class SWFragment(injector: HasAndroidInjector, private var definition: SWDefinition) : SWItem(injector, Type.FRAGMENT) { class SWFragment(injector: HasAndroidInjector, private var definition: SWDefinition) : SWItem(injector, Type.FRAGMENT) {

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWHtmlLink.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWHtmlLink.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.text.util.Linkify import android.text.util.Linkify
import android.view.View import android.view.View

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWInfoText.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWInfoText.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.view.View import android.view.View
import android.widget.LinearLayout import android.widget.LinearLayout

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWItem.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWItem.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.content.Context import android.content.Context
import android.content.ContextWrapper import android.content.ContextWrapper

8
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPlugin.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWPlugin.kt
View file

@ -1,15 +1,15 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.StringRes import androidx.annotation.StringRes
import app.aaps.configuration.configBuilder.events.EventConfigBuilderUpdateGui
import app.aaps.configuration.setupwizard.SWDefinition
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.configuration.ConfigBuilder import app.aaps.core.interfaces.configuration.ConfigBuilder
import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.plugin.PluginType import app.aaps.core.interfaces.plugin.PluginType
import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.configuration.configBuilder.events.EventConfigBuilderUpdateGui
import app.aaps.plugins.configuration.setupwizard.SWDefinition
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign

4
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWPreference.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWPreference.kt
View file

@ -1,10 +1,10 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.os.Bundle import android.os.Bundle
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import app.aaps.configuration.setupwizard.SWDefinition
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.plugins.configuration.setupwizard.SWDefinition
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import javax.inject.Inject import javax.inject.Inject

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWRadioButton.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWRadioButton.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.elements package app.aaps.plugins.configuration.setupwizard.elements
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup

2
plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/events/EventSWLabel.kt → plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/events/EventSWLabel.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.setupwizard.events package app.aaps.plugins.configuration.setupwizard.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event

14
plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/EncryptedPrefsFormatTest.kt
View file

@ -1,13 +1,13 @@
package app.aaps.configuration.maintenance.formats package app.aaps.plugins.configuration.maintenance.formats
import app.aaps.configuration.maintenance.PrefsMetadataKeyImpl
import app.aaps.configuration.maintenance.data.PrefFormatError
import app.aaps.configuration.maintenance.data.Prefs
import app.aaps.configuration.maintenance.data.PrefsFormat
import app.aaps.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.core.main.utils.CryptoUtil
import app.aaps.core.interfaces.maintenance.PrefMetadata import app.aaps.core.interfaces.maintenance.PrefMetadata
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.main.utils.CryptoUtil
import app.aaps.plugins.configuration.maintenance.PrefsMetadataKeyImpl
import app.aaps.plugins.configuration.maintenance.data.PrefFormatError
import app.aaps.plugins.configuration.maintenance.data.Prefs
import app.aaps.plugins.configuration.maintenance.data.PrefsFormat
import app.aaps.plugins.configuration.maintenance.data.PrefsStatusImpl
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import com.google.common.truth.TruthJUnit.assume import com.google.common.truth.TruthJUnit.assume

2
plugins/configuration/src/test/kotlin/app/aaps/configuration/maintenance/formats/SingleStringStorage.kt
View file

@ -1,4 +1,4 @@
package app.aaps.configuration.maintenance.formats package app.aaps.plugins.configuration.maintenance.formats
import app.aaps.core.interfaces.storage.Storage import app.aaps.core.interfaces.storage.Storage
import java.io.File import java.io.File