caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:ui cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 17:20:32 +02:00
parent d6281a5452
commit 2e3159fd60
70 changed files with 228 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,10 +134,6 @@
android:resource="@xml/filepaths" /> android:resource="@xml/filepaths" />
</provider> </provider>
<service
android:name="info.nightscout.ui.services.AlarmSoundService"
android:enabled="true"
android:exported="true" />
<uses-library <uses-library
android:name="org.apache.http.legacy" android:name="org.apache.http.legacy"
android:required="false" /> android:required="false" />

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

@ -71,10 +71,10 @@ import com.joanzapata.iconify.fonts.FontAwesomeModule
import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.BuildConfig
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.databinding.ActivityMainBinding import info.nightscout.androidaps.databinding.ActivityMainBinding
import info.nightscout.ui.activities.ProfileHelperActivity import app.aaps.ui.activities.ProfileHelperActivity
import info.nightscout.ui.activities.StatsActivity import app.aaps.ui.activities.StatsActivity
import info.nightscout.ui.activities.TreatmentsActivity import app.aaps.ui.activities.TreatmentsActivity
import info.nightscout.ui.tabs.TabPageAdapter import app.aaps.ui.tabs.TabPageAdapter
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 java.io.File import java.io.File

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

@ -49,8 +49,8 @@ import info.nightscout.androidaps.R
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.database.impl.transactions.VersionChangeTransaction import info.nightscout.database.impl.transactions.VersionChangeTransaction
import info.nightscout.ui.activityMonitor.ActivityMonitor import app.aaps.ui.activityMonitor.ActivityMonitor
import info.nightscout.ui.widget.Widget import app.aaps.ui.widget.Widget
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.exceptions.UndeliverableException import io.reactivex.rxjava3.exceptions.UndeliverableException
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign

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

@ -36,7 +36,7 @@ import info.nightscout.pump.danars.di.DanaRSModule
import info.nightscout.pump.diaconn.di.DiaconnG8Module import info.nightscout.pump.diaconn.di.DiaconnG8Module
import info.nightscout.pump.medtrum.di.MedtrumModule import info.nightscout.pump.medtrum.di.MedtrumModule
import info.nightscout.pump.virtual.di.VirtualPumpModule import info.nightscout.pump.virtual.di.VirtualPumpModule
import info.nightscout.ui.di.UiModule import app.aaps.ui.di.UiModule
import info.nightscout.workflow.di.WorkflowModule import info.nightscout.workflow.di.WorkflowModule
import javax.inject.Singleton import javax.inject.Singleton

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

@ -20,27 +20,27 @@ import app.aaps.plugins.configuration.activities.SingleFragmentActivity
import app.aaps.plugins.main.general.overview.notifications.NotificationWithAction import app.aaps.plugins.main.general.overview.notifications.NotificationWithAction
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.ui.activities.BolusProgressHelperActivity import app.aaps.ui.activities.BolusProgressHelperActivity
import info.nightscout.ui.activities.ErrorHelperActivity import app.aaps.ui.activities.ErrorHelperActivity
import info.nightscout.ui.activities.QuickWizardListActivity import app.aaps.ui.activities.QuickWizardListActivity
import info.nightscout.ui.activities.TDDStatsActivity import app.aaps.ui.activities.TDDStatsActivity
import info.nightscout.ui.dialogs.BolusProgressDialog import app.aaps.ui.dialogs.BolusProgressDialog
import info.nightscout.ui.dialogs.CalibrationDialog import app.aaps.ui.dialogs.CalibrationDialog
import info.nightscout.ui.dialogs.CarbsDialog import app.aaps.ui.dialogs.CarbsDialog
import info.nightscout.ui.dialogs.CareDialog import app.aaps.ui.dialogs.CareDialog
import info.nightscout.ui.dialogs.ExtendedBolusDialog import app.aaps.ui.dialogs.ExtendedBolusDialog
import info.nightscout.ui.dialogs.FillDialog import app.aaps.ui.dialogs.FillDialog
import info.nightscout.ui.dialogs.InsulinDialog import app.aaps.ui.dialogs.InsulinDialog
import info.nightscout.ui.dialogs.LoopDialog import app.aaps.ui.dialogs.LoopDialog
import info.nightscout.ui.dialogs.ProfileSwitchDialog import app.aaps.ui.dialogs.ProfileSwitchDialog
import info.nightscout.ui.dialogs.ProfileViewerDialog import app.aaps.ui.dialogs.ProfileViewerDialog
import info.nightscout.ui.dialogs.TempBasalDialog import app.aaps.ui.dialogs.TempBasalDialog
import info.nightscout.ui.dialogs.TempTargetDialog import app.aaps.ui.dialogs.TempTargetDialog
import info.nightscout.ui.dialogs.TreatmentDialog import app.aaps.ui.dialogs.TreatmentDialog
import info.nightscout.ui.dialogs.WizardDialog import app.aaps.ui.dialogs.WizardDialog
import info.nightscout.ui.services.AlarmSoundService import app.aaps.ui.services.AlarmSoundService
import info.nightscout.ui.services.AlarmSoundServiceHelper import app.aaps.ui.services.AlarmSoundServiceHelper
import info.nightscout.ui.widget.Widget import app.aaps.ui.widget.Widget
import javax.inject.Inject import javax.inject.Inject
class UiInteractionImpl @Inject constructor( class UiInteractionImpl @Inject constructor(

2
ui/build.gradle
View file

@ -11,7 +11,7 @@ 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 'info.nightscout.ui' namespace 'app.aaps.ui'
} }
dependencies { dependencies {

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

@ -29,7 +29,7 @@
android:exported="false" android:exported="false"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme" />
<activity <activity
android:name="info.nightscout.ui.activities.BolusProgressHelperActivity" android:name="app.aaps.ui.activities.BolusProgressHelperActivity"
android:exported="false" android:exported="false"
android:theme="@style/Theme.MaterialComponents.Translucent" /> android:theme="@style/Theme.MaterialComponents.Translucent" />
<activity <activity
@ -53,16 +53,21 @@
android:exported="false" android:exported="false"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme" />
<activity <activity
android:name="info.nightscout.ui.activities.QuickWizardListActivity" android:name="app.aaps.ui.activities.QuickWizardListActivity"
android:exported="false" android:exported="false"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<intent-filter> <intent-filter>
<action android:name="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" /> <action android:name="app.aaps.ui.activities.QuickWizardListActivity" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<service
android:name=".services.AlarmSoundService"
android:enabled="true"
android:exported="false" />
</application> </application>
</manifest> </manifest>

4
ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt → ui/src/main/kotlin/app/aaps/ui/activities/BolusProgressHelperActivity.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.ui.activities package app.aaps.ui.activities
import android.os.Bundle import android.os.Bundle
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import info.nightscout.ui.dialogs.BolusProgressDialog import app.aaps.ui.dialogs.BolusProgressDialog
class BolusProgressHelperActivity : TranslatedDaggerAppCompatActivity() { class BolusProgressHelperActivity : TranslatedDaggerAppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {

6
ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt → ui/src/main/kotlin/app/aaps/ui/activities/ErrorHelperActivity.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.ui.activities package app.aaps.ui.activities
import android.os.Bundle import android.os.Bundle
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
import info.nightscout.ui.alertDialogs.ErrorDialog import app.aaps.ui.alertDialogs.ErrorDialog
import info.nightscout.ui.services.AlarmSoundService import app.aaps.ui.services.AlarmSoundService
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

12
ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt → ui/src/main/kotlin/app/aaps/ui/activities/ProfileHelperActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities package app.aaps.ui.activities
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -27,11 +27,11 @@ import app.aaps.database.entities.EffectiveProfileSwitch
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import com.google.common.collect.Lists import com.google.common.collect.Lists
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.ActivityProfilehelperBinding import app.aaps.ui.databinding.ActivityProfilehelperBinding
import info.nightscout.ui.defaultProfile.DefaultProfile import app.aaps.ui.defaultProfile.DefaultProfile
import info.nightscout.ui.defaultProfile.DefaultProfileDPV import app.aaps.ui.defaultProfile.DefaultProfileDPV
import info.nightscout.ui.dialogs.ProfileViewerDialog import app.aaps.ui.dialogs.ProfileViewerDialog
import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign

12
ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt → ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities package app.aaps.ui.activities
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -31,11 +31,11 @@ import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter
import app.aaps.core.ui.dragHelpers.OnStartDragListener import app.aaps.core.ui.dragHelpers.OnStartDragListener
import app.aaps.core.ui.dragHelpers.SimpleItemTouchHelperCallback import app.aaps.core.ui.dragHelpers.SimpleItemTouchHelperCallback
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.ActivityQuickwizardListBinding import app.aaps.ui.databinding.ActivityQuickwizardListBinding
import info.nightscout.ui.databinding.QuickwizardListItemBinding import app.aaps.ui.databinding.QuickwizardListItemBinding
import info.nightscout.ui.dialogs.EditQuickWizardDialog import app.aaps.ui.dialogs.EditQuickWizardDialog
import info.nightscout.ui.events.EventQuickWizardChange import app.aaps.ui.events.EventQuickWizardChange
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

8
ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt → ui/src/main/kotlin/app/aaps/ui/activities/StatsActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities package app.aaps.ui.activities
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -17,9 +17,9 @@ 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 info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.activityMonitor.ActivityMonitor import app.aaps.ui.activityMonitor.ActivityMonitor
import info.nightscout.ui.databinding.ActivityStatsBinding import app.aaps.ui.databinding.ActivityStatsBinding
import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign

8
ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt → ui/src/main/kotlin/app/aaps/ui/activities/SurveyActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities package app.aaps.ui.activities
import android.os.Bundle import android.os.Bundle
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
@ -10,9 +10,9 @@ import app.aaps.core.interfaces.utils.SafeParse
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.ui.toast.ToastUtils
import app.aaps.core.utils.fabric.InstanceId import app.aaps.core.utils.fabric.InstanceId
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.ActivitySurveyBinding import app.aaps.ui.databinding.ActivitySurveyBinding
import info.nightscout.ui.defaultProfile.DefaultProfile import app.aaps.ui.defaultProfile.DefaultProfile
import javax.inject.Inject import javax.inject.Inject
class SurveyActivity : TranslatedDaggerAppCompatActivity() { class SurveyActivity : TranslatedDaggerAppCompatActivity() {

4
ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt → ui/src/main/kotlin/app/aaps/ui/activities/TDDStatsActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities package app.aaps.ui.activities
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Rect import android.graphics.Rect
@ -32,7 +32,7 @@ import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.database.entities.TotalDailyDose import app.aaps.database.entities.TotalDailyDose
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.ui.databinding.ActivityTddStatsBinding import app.aaps.ui.databinding.ActivityTddStatsBinding
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import java.text.DateFormat import java.text.DateFormat
import java.text.DecimalFormat import java.text.DecimalFormat

20
ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt → ui/src/main/kotlin/app/aaps/ui/activities/TreatmentsActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities package app.aaps.ui.activities
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
@ -9,15 +9,15 @@ import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.activities.fragments.TreatmentsBolusCarbsFragment import app.aaps.ui.activities.fragments.TreatmentsBolusCarbsFragment
import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment import app.aaps.ui.activities.fragments.TreatmentsCareportalFragment
import info.nightscout.ui.activities.fragments.TreatmentsExtendedBolusesFragment import app.aaps.ui.activities.fragments.TreatmentsExtendedBolusesFragment
import info.nightscout.ui.activities.fragments.TreatmentsProfileSwitchFragment import app.aaps.ui.activities.fragments.TreatmentsProfileSwitchFragment
import info.nightscout.ui.activities.fragments.TreatmentsTempTargetFragment import app.aaps.ui.activities.fragments.TreatmentsTempTargetFragment
import info.nightscout.ui.activities.fragments.TreatmentsTemporaryBasalsFragment import app.aaps.ui.activities.fragments.TreatmentsTemporaryBasalsFragment
import info.nightscout.ui.activities.fragments.TreatmentsUserEntryFragment import app.aaps.ui.activities.fragments.TreatmentsUserEntryFragment
import info.nightscout.ui.databinding.TreatmentsFragmentBinding import app.aaps.ui.databinding.TreatmentsFragmentBinding
import javax.inject.Inject import javax.inject.Inject
class TreatmentsActivity : TranslatedDaggerAppCompatActivity() { class TreatmentsActivity : TranslatedDaggerAppCompatActivity() {

12
ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt → ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities.fragments package app.aaps.ui.activities.fragments
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Paint import android.graphics.Paint
@ -47,11 +47,11 @@ import info.nightscout.database.impl.transactions.CutCarbsTransaction
import info.nightscout.database.impl.transactions.InvalidateBolusCalculatorResultTransaction import info.nightscout.database.impl.transactions.InvalidateBolusCalculatorResultTransaction
import info.nightscout.database.impl.transactions.InvalidateBolusTransaction import info.nightscout.database.impl.transactions.InvalidateBolusTransaction
import info.nightscout.database.impl.transactions.InvalidateCarbsTransaction import info.nightscout.database.impl.transactions.InvalidateCarbsTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.TreatmentsBolusCarbsFragmentBinding import app.aaps.ui.databinding.TreatmentsBolusCarbsFragmentBinding
import info.nightscout.ui.databinding.TreatmentsBolusCarbsItemBinding import app.aaps.ui.databinding.TreatmentsBolusCarbsItemBinding
import info.nightscout.ui.dialogs.WizardInfoDialog import app.aaps.ui.dialogs.WizardInfoDialog
import info.nightscout.ui.extensions.isPumpHistory import app.aaps.ui.extensions.isPumpHistory
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 java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

10
ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt → ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsCareportalFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities.fragments package app.aaps.ui.activities.fragments
import android.os.Bundle import android.os.Bundle
import android.util.SparseArray import android.util.SparseArray
@ -38,10 +38,10 @@ import dagger.android.support.DaggerFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InvalidateAAPSStartedTherapyEventTransaction import info.nightscout.database.impl.transactions.InvalidateAAPSStartedTherapyEventTransaction
import info.nightscout.database.impl.transactions.InvalidateTherapyEventTransaction import info.nightscout.database.impl.transactions.InvalidateTherapyEventTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.TherapyEventsViewHolder import app.aaps.ui.activities.fragments.TreatmentsCareportalFragment.RecyclerViewAdapter.TherapyEventsViewHolder
import info.nightscout.ui.databinding.TreatmentsCareportalFragmentBinding import app.aaps.ui.databinding.TreatmentsCareportalFragmentBinding
import info.nightscout.ui.databinding.TreatmentsCareportalItemBinding import app.aaps.ui.databinding.TreatmentsCareportalItemBinding
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 java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

10
ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt → ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities.fragments package app.aaps.ui.activities.fragments
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -40,10 +40,10 @@ import app.aaps.database.entities.interfaces.end
import dagger.android.support.DaggerFragment import dagger.android.support.DaggerFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InvalidateExtendedBolusTransaction import info.nightscout.database.impl.transactions.InvalidateExtendedBolusTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.activities.fragments.TreatmentsExtendedBolusesFragment.RecyclerViewAdapter.ExtendedBolusesViewHolder import app.aaps.ui.activities.fragments.TreatmentsExtendedBolusesFragment.RecyclerViewAdapter.ExtendedBolusesViewHolder
import info.nightscout.ui.databinding.TreatmentsExtendedbolusFragmentBinding import app.aaps.ui.databinding.TreatmentsExtendedbolusFragmentBinding
import info.nightscout.ui.databinding.TreatmentsExtendedbolusItemBinding import app.aaps.ui.databinding.TreatmentsExtendedbolusItemBinding
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 java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

12
ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt → ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities.fragments package app.aaps.ui.activities.fragments
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Paint import android.graphics.Paint
@ -44,11 +44,11 @@ import app.aaps.database.entities.ValueWithUnit
import dagger.android.support.DaggerFragment import dagger.android.support.DaggerFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InvalidateProfileSwitchTransaction import info.nightscout.database.impl.transactions.InvalidateProfileSwitchTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.activities.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder import app.aaps.ui.activities.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder
import info.nightscout.ui.databinding.TreatmentsProfileswitchFragmentBinding import app.aaps.ui.databinding.TreatmentsProfileswitchFragmentBinding
import info.nightscout.ui.databinding.TreatmentsProfileswitchItemBinding import app.aaps.ui.databinding.TreatmentsProfileswitchItemBinding
import info.nightscout.ui.dialogs.ProfileViewerDialog import app.aaps.ui.dialogs.ProfileViewerDialog
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

10
ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt → ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTempTargetFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities.fragments package app.aaps.ui.activities.fragments
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -45,10 +45,10 @@ import app.aaps.database.entities.interfaces.end
import dagger.android.support.DaggerFragment import dagger.android.support.DaggerFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InvalidateTemporaryTargetTransaction import info.nightscout.database.impl.transactions.InvalidateTemporaryTargetTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.activities.fragments.TreatmentsTempTargetFragment.RecyclerViewAdapter.TempTargetsViewHolder import app.aaps.ui.activities.fragments.TreatmentsTempTargetFragment.RecyclerViewAdapter.TempTargetsViewHolder
import info.nightscout.ui.databinding.TreatmentsTemptargetFragmentBinding import app.aaps.ui.databinding.TreatmentsTemptargetFragmentBinding
import info.nightscout.ui.databinding.TreatmentsTemptargetItemBinding import app.aaps.ui.databinding.TreatmentsTemptargetItemBinding
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 java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

10
ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt → ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities.fragments package app.aaps.ui.activities.fragments
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
@ -46,10 +46,10 @@ import dagger.android.support.DaggerFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InvalidateExtendedBolusTransaction import info.nightscout.database.impl.transactions.InvalidateExtendedBolusTransaction
import info.nightscout.database.impl.transactions.InvalidateTemporaryBasalTransaction import info.nightscout.database.impl.transactions.InvalidateTemporaryBasalTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.activities.fragments.TreatmentsTemporaryBasalsFragment.RecyclerViewAdapter.TempBasalsViewHolder import app.aaps.ui.activities.fragments.TreatmentsTemporaryBasalsFragment.RecyclerViewAdapter.TempBasalsViewHolder
import info.nightscout.ui.databinding.TreatmentsTempbasalsFragmentBinding import app.aaps.ui.databinding.TreatmentsTempbasalsFragmentBinding
import info.nightscout.ui.databinding.TreatmentsTempbasalsItemBinding import app.aaps.ui.databinding.TreatmentsTempbasalsItemBinding
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 java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit

8
ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt → ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsUserEntryFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activities.fragments package app.aaps.ui.activities.fragments
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -30,9 +30,9 @@ import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import dagger.android.support.DaggerFragment import dagger.android.support.DaggerFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.TreatmentsUserEntryFragmentBinding import app.aaps.ui.databinding.TreatmentsUserEntryFragmentBinding
import info.nightscout.ui.databinding.TreatmentsUserEntryItemBinding import app.aaps.ui.databinding.TreatmentsUserEntryItemBinding
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

4
ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt → ui/src/main/kotlin/app/aaps/ui/activityMonitor/ActivityMonitor.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.activityMonitor package app.aaps.ui.activityMonitor
import android.app.Activity import android.app.Activity
import android.app.Application import android.app.Application
@ -17,7 +17,7 @@ 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.SafeParse import app.aaps.core.interfaces.utils.SafeParse
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import info.nightscout.ui.R import app.aaps.ui.R
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

4
ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt → ui/src/main/kotlin/app/aaps/ui/alertDialogs/ErrorDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.alertDialogs package app.aaps.ui.alertDialogs
import android.content.res.Resources import android.content.res.Resources
import android.os.Bundle import android.os.Bundle
@ -17,7 +17,7 @@ import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
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 dagger.android.support.DaggerDialogFragment import dagger.android.support.DaggerDialogFragment
import info.nightscout.ui.databinding.DialogErrorBinding import app.aaps.ui.databinding.DialogErrorBinding
import javax.inject.Inject import javax.inject.Inject
class ErrorDialog : DaggerDialogFragment() { class ErrorDialog : DaggerDialogFragment() {

2
ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfile.kt → ui/src/main/kotlin/app/aaps/ui/defaultProfile/DefaultProfile.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.defaultProfile package app.aaps.ui.defaultProfile
import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.extensions.pureProfileFromJson
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit

2
ui/src/main/java/info/nightscout/ui/defaultProfile/DefaultProfileDPV.kt → ui/src/main/kotlin/app/aaps/ui/defaultProfile/DefaultProfileDPV.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.defaultProfile package app.aaps.ui.defaultProfile
import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.extensions.pureProfileFromJson
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit

72
ui/src/main/java/info/nightscout/ui/di/UiModule.kt → ui/src/main/kotlin/app/aaps/ui/di/UiModule.kt
View file

@ -1,42 +1,42 @@
package info.nightscout.ui.di package app.aaps.ui.di
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
import info.nightscout.ui.activities.BolusProgressHelperActivity import app.aaps.ui.activities.BolusProgressHelperActivity
import info.nightscout.ui.activities.ErrorHelperActivity import app.aaps.ui.activities.ErrorHelperActivity
import info.nightscout.ui.activities.ProfileHelperActivity import app.aaps.ui.activities.ProfileHelperActivity
import info.nightscout.ui.activities.QuickWizardListActivity import app.aaps.ui.activities.QuickWizardListActivity
import info.nightscout.ui.activities.StatsActivity import app.aaps.ui.activities.StatsActivity
import info.nightscout.ui.activities.SurveyActivity import app.aaps.ui.activities.SurveyActivity
import info.nightscout.ui.activities.TDDStatsActivity import app.aaps.ui.activities.TDDStatsActivity
import info.nightscout.ui.activities.TreatmentsActivity import app.aaps.ui.activities.TreatmentsActivity
import info.nightscout.ui.activities.fragments.TreatmentsBolusCarbsFragment import app.aaps.ui.activities.fragments.TreatmentsBolusCarbsFragment
import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment import app.aaps.ui.activities.fragments.TreatmentsCareportalFragment
import info.nightscout.ui.activities.fragments.TreatmentsExtendedBolusesFragment import app.aaps.ui.activities.fragments.TreatmentsExtendedBolusesFragment
import info.nightscout.ui.activities.fragments.TreatmentsProfileSwitchFragment import app.aaps.ui.activities.fragments.TreatmentsProfileSwitchFragment
import info.nightscout.ui.activities.fragments.TreatmentsTempTargetFragment import app.aaps.ui.activities.fragments.TreatmentsTempTargetFragment
import info.nightscout.ui.activities.fragments.TreatmentsTemporaryBasalsFragment import app.aaps.ui.activities.fragments.TreatmentsTemporaryBasalsFragment
import info.nightscout.ui.activities.fragments.TreatmentsUserEntryFragment import app.aaps.ui.activities.fragments.TreatmentsUserEntryFragment
import info.nightscout.ui.alertDialogs.ErrorDialog import app.aaps.ui.alertDialogs.ErrorDialog
import info.nightscout.ui.dialogs.BolusProgressDialog import app.aaps.ui.dialogs.BolusProgressDialog
import info.nightscout.ui.dialogs.CalibrationDialog import app.aaps.ui.dialogs.CalibrationDialog
import info.nightscout.ui.dialogs.CarbsDialog import app.aaps.ui.dialogs.CarbsDialog
import info.nightscout.ui.dialogs.CareDialog import app.aaps.ui.dialogs.CareDialog
import info.nightscout.ui.dialogs.EditQuickWizardDialog import app.aaps.ui.dialogs.EditQuickWizardDialog
import info.nightscout.ui.dialogs.ExtendedBolusDialog import app.aaps.ui.dialogs.ExtendedBolusDialog
import info.nightscout.ui.dialogs.FillDialog import app.aaps.ui.dialogs.FillDialog
import info.nightscout.ui.dialogs.InsulinDialog import app.aaps.ui.dialogs.InsulinDialog
import info.nightscout.ui.dialogs.LoopDialog import app.aaps.ui.dialogs.LoopDialog
import info.nightscout.ui.dialogs.ProfileSwitchDialog import app.aaps.ui.dialogs.ProfileSwitchDialog
import info.nightscout.ui.dialogs.ProfileViewerDialog import app.aaps.ui.dialogs.ProfileViewerDialog
import info.nightscout.ui.dialogs.TempBasalDialog import app.aaps.ui.dialogs.TempBasalDialog
import info.nightscout.ui.dialogs.TempTargetDialog import app.aaps.ui.dialogs.TempTargetDialog
import info.nightscout.ui.dialogs.TreatmentDialog import app.aaps.ui.dialogs.TreatmentDialog
import info.nightscout.ui.dialogs.WizardDialog import app.aaps.ui.dialogs.WizardDialog
import info.nightscout.ui.dialogs.WizardInfoDialog import app.aaps.ui.dialogs.WizardInfoDialog
import info.nightscout.ui.services.AlarmSoundService import app.aaps.ui.services.AlarmSoundService
import info.nightscout.ui.widget.Widget import app.aaps.ui.widget.Widget
import info.nightscout.ui.widget.WidgetConfigureActivity import app.aaps.ui.widget.WidgetConfigureActivity
@Module @Module
@Suppress("unused") @Suppress("unused")

4
ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/BolusProgressDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.os.Bundle import android.os.Bundle
import android.os.SystemClock import android.os.SystemClock
@ -22,7 +22,7 @@ import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
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 dagger.android.support.DaggerDialogFragment import dagger.android.support.DaggerDialogFragment
import info.nightscout.ui.databinding.DialogBolusprogressBinding import app.aaps.ui.databinding.DialogBolusprogressBinding
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

4
ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/CalibrationDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -17,7 +17,7 @@ import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import com.google.common.base.Joiner import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.ui.databinding.DialogCalibrationBinding import app.aaps.ui.databinding.DialogCalibrationBinding
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.LinkedList import java.util.LinkedList
import javax.inject.Inject import javax.inject.Inject

6
ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/CarbsDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -41,8 +41,8 @@ import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogCarbsBinding import app.aaps.ui.databinding.DialogCarbsBinding
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 java.text.DecimalFormat import java.text.DecimalFormat

6
ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/CareDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -29,8 +29,8 @@ import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogCareBinding import app.aaps.ui.databinding.DialogCareBinding
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 java.text.DecimalFormat import java.text.DecimalFormat

2
ui/src/main/java/info/nightscout/ui/dialogs/DialogFragmentWithDate.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/DialogFragmentWithDate.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.os.Bundle import android.os.Bundle
import android.text.format.DateFormat import android.text.format.DateFormat

8
ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/EditQuickWizardDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.os.Bundle import android.os.Bundle
import android.text.format.DateFormat import android.text.format.DateFormat
@ -21,9 +21,9 @@ import dagger.android.support.DaggerDialogFragment
import app.aaps.core.ui.extensions.selectedItemPosition import app.aaps.core.ui.extensions.selectedItemPosition
import app.aaps.core.ui.extensions.setEnableForChildren import app.aaps.core.ui.extensions.setEnableForChildren
import app.aaps.core.ui.extensions.setSelection import app.aaps.core.ui.extensions.setSelection
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogEditQuickwizardBinding import app.aaps.ui.databinding.DialogEditQuickwizardBinding
import info.nightscout.ui.events.EventQuickWizardChange import app.aaps.ui.events.EventQuickWizardChange
import org.json.JSONException import org.json.JSONException
import javax.inject.Inject import javax.inject.Inject

6
ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/ExtendedBolusDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -24,8 +24,8 @@ import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import com.google.common.base.Joiner import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogExtendedbolusBinding import app.aaps.ui.databinding.DialogExtendedbolusBinding
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.LinkedList import java.util.LinkedList
import javax.inject.Inject import javax.inject.Inject

6
ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/FillDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -29,8 +29,8 @@ import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogFillBinding import app.aaps.ui.databinding.DialogFillBinding
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 java.util.LinkedList import java.util.LinkedList

8
ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/InsulinDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -43,9 +43,9 @@ import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogInsulinBinding import app.aaps.ui.databinding.DialogInsulinBinding
import info.nightscout.ui.extensions.toSignedString import app.aaps.ui.extensions.toSignedString
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 java.text.DecimalFormat import java.text.DecimalFormat

6
ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/LoopDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -48,8 +48,8 @@ import dagger.android.support.DaggerDialogFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogLoopBinding import app.aaps.ui.databinding.DialogLoopBinding
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

6
ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/ProfileSwitchDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -32,8 +32,8 @@ import app.aaps.database.entities.ValueWithUnit
import com.google.common.base.Joiner import com.google.common.base.Joiner
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogProfileswitchBinding import app.aaps.ui.databinding.DialogProfileswitchBinding
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 java.text.DecimalFormat import java.text.DecimalFormat

4
ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/ProfileViewerDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.os.Bundle import android.os.Bundle
import android.text.Spanned import android.text.Spanned
@ -28,7 +28,7 @@ import app.aaps.database.ValueWrapper
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerDialogFragment import dagger.android.support.DaggerDialogFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.ui.databinding.DialogProfileviewerBinding import app.aaps.ui.databinding.DialogProfileviewerBinding
import org.json.JSONObject import org.json.JSONObject
import java.text.DecimalFormat import java.text.DecimalFormat
import javax.inject.Inject import javax.inject.Inject

6
ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/TempBasalDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -27,8 +27,8 @@ import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import com.google.common.base.Joiner import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogTempbasalBinding import app.aaps.ui.databinding.DialogTempbasalBinding
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.LinkedList import java.util.LinkedList
import javax.inject.Inject import javax.inject.Inject

6
ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/TempTargetDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -28,8 +28,8 @@ import com.google.common.collect.Lists
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogTemptargetBinding import app.aaps.ui.databinding.DialogTemptargetBinding
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 java.text.DecimalFormat import java.text.DecimalFormat

6
ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/TreatmentDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
@ -31,8 +31,8 @@ import app.aaps.database.entities.ValueWithUnit
import com.google.common.base.Joiner import com.google.common.base.Joiner
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogTreatmentBinding import app.aaps.ui.databinding.DialogTreatmentBinding
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.LinkedList import java.util.LinkedList
import javax.inject.Inject import javax.inject.Inject

6
ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -52,8 +52,8 @@ import app.aaps.database.ValueWrapper
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerDialogFragment import dagger.android.support.DaggerDialogFragment
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogWizardBinding import app.aaps.ui.databinding.DialogWizardBinding
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 java.text.DecimalFormat import java.text.DecimalFormat

6
ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt → ui/src/main/kotlin/app/aaps/ui/dialogs/WizardInfoDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.dialogs package app.aaps.ui.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -13,8 +13,8 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.database.entities.BolusCalculatorResult import app.aaps.database.entities.BolusCalculatorResult
import com.google.gson.Gson import com.google.gson.Gson
import dagger.android.support.DaggerDialogFragment import dagger.android.support.DaggerDialogFragment
import info.nightscout.ui.R import app.aaps.ui.R
import info.nightscout.ui.databinding.DialogWizardinfoBinding import app.aaps.ui.databinding.DialogWizardinfoBinding
import javax.inject.Inject import javax.inject.Inject
class WizardInfoDialog : DaggerDialogFragment() { class WizardInfoDialog : DaggerDialogFragment() {

2
ui/src/main/java/info/nightscout/ui/elements/EmptyRecyclerView.kt → ui/src/main/kotlin/app/aaps/ui/elements/EmptyRecyclerView.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.elements package app.aaps.ui.elements
import android.content.Context import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet

2
ui/src/main/java/info/nightscout/ui/events/EventQuickWizardChange.kt → ui/src/main/kotlin/app/aaps/ui/events/EventQuickWizardChange.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.events package app.aaps.ui.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event

2
ui/src/main/java/info/nightscout/ui/extensions/DoubleToSignedString.kt → ui/src/main/kotlin/app/aaps/ui/extensions/DoubleToSignedString.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.extensions package app.aaps.ui.extensions
import app.aaps.core.interfaces.pump.Pump import app.aaps.core.interfaces.pump.Pump
import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.DecimalFormatter

2
ui/src/main/java/info/nightscout/ui/extensions/InterfaceIDsExtension.kt → ui/src/main/kotlin/app/aaps/ui/extensions/InterfaceIDsExtension.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.extensions package app.aaps.ui.extensions
import app.aaps.database.entities.embedments.InterfaceIDs import app.aaps.database.entities.embedments.InterfaceIDs

2
ui/src/main/java/info/nightscout/ui/services/AlarmSoundService.kt → ui/src/main/kotlin/app/aaps/ui/services/AlarmSoundService.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.services package app.aaps.ui.services
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent

2
ui/src/main/java/info/nightscout/ui/services/AlarmSoundServiceHelper.kt → ui/src/main/kotlin/app/aaps/ui/services/AlarmSoundServiceHelper.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.services package app.aaps.ui.services
import android.content.ComponentName import android.content.ComponentName
import android.content.Context import android.content.Context

2
ui/src/main/java/info/nightscout/ui/tabs/TabPageAdapter.kt → ui/src/main/kotlin/app/aaps/ui/tabs/TabPageAdapter.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.tabs package app.aaps.ui.tabs
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment

4
ui/src/main/java/info/nightscout/ui/widget/Widget.kt → ui/src/main/kotlin/app/aaps/ui/widget/Widget.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.widget package app.aaps.ui.widget
import android.app.PendingIntent import android.app.PendingIntent
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
@ -38,7 +38,7 @@ import app.aaps.core.main.iob.displayText
import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.profile.ProfileSealed
import app.aaps.database.entities.interfaces.end import app.aaps.database.entities.interfaces.end
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.ui.R import app.aaps.ui.R
import java.util.Locale import java.util.Locale
import javax.inject.Inject import javax.inject.Inject
import kotlin.math.abs import kotlin.math.abs

4
ui/src/main/java/info/nightscout/ui/widget/WidgetConfigureActivity.kt → ui/src/main/kotlin/app/aaps/ui/widget/WidgetConfigureActivity.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.widget package app.aaps.ui.widget
import android.appwidget.AppWidgetManager import android.appwidget.AppWidgetManager
import android.content.Intent import android.content.Intent
@ -6,7 +6,7 @@ import android.os.Bundle
import android.widget.SeekBar import android.widget.SeekBar
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import dagger.android.DaggerActivity import dagger.android.DaggerActivity
import info.nightscout.ui.databinding.WidgetConfigureBinding import app.aaps.ui.databinding.WidgetConfigureBinding
import javax.inject.Inject import javax.inject.Inject
/** /**

2
ui/src/main/res/layout/activity_profilehelper.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context="info.nightscout.ui.activities.ProfileHelperActivity"> tools:context=".activities.ProfileHelperActivity">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
ui/src/main/res/layout/activity_quickwizard_list.xml
View file

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
tools:context="info.nightscout.plugins.info.nightscout.ui.activities.QuickWizardListActivity"> tools:context=".activities.QuickWizardListActivity">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview" android:id="@+id/recyclerview"

2
ui/src/main/res/layout/activity_stats.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context="info.nightscout.ui.activities.StatsActivity"> tools:context=".activities.StatsActivity">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
ui/src/main/res/layout/activity_tdd_stats.xml
View file

@ -6,7 +6,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="info.nightscout.ui.activities.TDDStatsActivity"> tools:context=".activities.TDDStatsActivity">
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"

2
ui/src/main/res/layout/dialog_carbs.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
tools:context="info.nightscout.ui.dialogs.CarbsDialog"> tools:context=".ui.dialogs.CarbsDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
ui/src/main/res/layout/dialog_edit_quickwizard.xml
View file

@ -4,7 +4,7 @@
style="@style/StyleDialog" style="@style/StyleDialog"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="info.nightscout.ui.dialogs.EditQuickWizardDialog"> tools:context=".dialogs.EditQuickWizardDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
ui/src/main/res/layout/dialog_wizard.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
tools:context="info.nightscout.ui.dialogs.InsulinDialog"> tools:context=".dialogs.InsulinDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
ui/src/main/res/layout/treatments_bolus_carbs_fragment.xml
View file

@ -23,7 +23,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.ui.elements.EmptyRecyclerView <app.aaps.ui.elements.EmptyRecyclerView
android:id="@+id/recyclerview" android:id="@+id/recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
ui/src/main/res/layout/treatments_careportal_fragment.xml
View file

@ -23,7 +23,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.ui.elements.EmptyRecyclerView <app.aaps.ui.elements.EmptyRecyclerView
android:id="@+id/recyclerview" android:id="@+id/recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
ui/src/main/res/layout/treatments_extendedbolus_fragment.xml
View file

@ -23,7 +23,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.ui.elements.EmptyRecyclerView <app.aaps.ui.elements.EmptyRecyclerView
android:id="@+id/recyclerview" android:id="@+id/recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
ui/src/main/res/layout/treatments_profileswitch_fragment.xml
View file

@ -23,7 +23,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.ui.elements.EmptyRecyclerView <app.aaps.ui.elements.EmptyRecyclerView
android:id="@+id/recyclerview" android:id="@+id/recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
ui/src/main/res/layout/treatments_tempbasals_fragment.xml
View file

@ -23,7 +23,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.ui.elements.EmptyRecyclerView <app.aaps.ui.elements.EmptyRecyclerView
android:id="@+id/recyclerview" android:id="@+id/recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
ui/src/main/res/layout/treatments_temptarget_fragment.xml
View file

@ -23,7 +23,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.ui.elements.EmptyRecyclerView <app.aaps.ui.elements.EmptyRecyclerView
android:id="@+id/recyclerview" android:id="@+id/recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
ui/src/main/res/layout/treatments_user_entry_fragment.xml
View file

@ -23,7 +23,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.ui.elements.EmptyRecyclerView <app.aaps.ui.elements.EmptyRecyclerView
android:id="@+id/recyclerview" android:id="@+id/recyclerview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
ui/src/main/res/xml/widget_info.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:configure="info.nightscout.ui.widget.WidgetConfigureActivity" android:configure=".widget.WidgetConfigureActivity"
android:description="@string/widget_description" android:description="@string/widget_description"
android:initialKeyguardLayout="@layout/widget_layout" android:initialKeyguardLayout="@layout/widget_layout"
android:initialLayout="@layout/widget_layout" android:initialLayout="@layout/widget_layout"

2
ui/src/test/java/info/nightscout/ui/defaultProfile/DefaultProfileTest.kt → ui/src/test/kotlin/app/aaps/ui/defaultProfile/DefaultProfileTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.defaultProfile package app.aaps.ui.defaultProfile
import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit

2
ui/src/test/java/info/nightscout/ui/extensions/InterfaceIDsExtensionKtTest.kt → ui/src/test/kotlin/app/aaps/ui/extensions/InterfaceIDsExtensionKtTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.ui.extensions package app.aaps.ui.extensions
import app.aaps.database.entities.embedments.InterfaceIDs import app.aaps.database.entities.embedments.InterfaceIDs
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase