caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:core:validators cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-25 13:28:15 +02:00
parent ea9132bbe3
commit b982afbb49
73 changed files with 189 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
import info.nightscout.automation.di.AutomationModule
import info.nightscout.core.validators.di.ValidatorsModule
import app.aaps.core.validators.di.ValidatorsModule
import info.nightscout.database.impl.DatabaseModule
import info.nightscout.implementation.di.ImplementationModule
import info.nightscout.insulin.di.InsulinModule

4
app/src/main/res/xml/pref_alerts.xml
View file

@ -13,7 +13,7 @@
android:key="@string/key_enable_missed_bg_readings_alert"
android:title="@string/enable_missed_bg_readings_alert" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="30"
android:dependency="@string/key_enable_missed_bg_readings_alert"
android:inputType="number"
@ -28,7 +28,7 @@
android:key="@string/key_enable_pump_unreachable_alert"
android:title="@string/enable_pump_unreachable_alert" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="30"
android:dependency="@string/key_enable_pump_unreachable_alert"
android:inputType="number"

2
app/src/main/res/xml/pref_general.xml
View file

@ -82,7 +82,7 @@
android:key="@string/key_bolus_pin"
android:title="@string/bolus_pin" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1"
android:digits="0123456789"
android:inputType="number"

2
core/validators/build.gradle
View file

@ -11,7 +11,7 @@ apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android {
namespace 'info.nightscout.core.validators'
namespace 'app.aaps.core.validators'
}

56
core/validators/src/main/java/info/nightscout/core/validators/DefaultEditTextValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/DefaultEditTextValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators
package app.aaps.core.validators
import android.content.Context
import android.text.Editable
@ -8,33 +8,33 @@ import android.widget.EditText
import app.aaps.core.interfaces.profile.ProfileUtil
import com.google.android.material.textfield.TextInputLayout
import dagger.android.HasAndroidInjector
import info.nightscout.core.validators.validators.AlphaNumericValidator
import info.nightscout.core.validators.validators.AlphaValidator
import info.nightscout.core.validators.validators.AndValidator
import info.nightscout.core.validators.validators.BgRangeValidator
import info.nightscout.core.validators.validators.CreditCardValidator
import info.nightscout.core.validators.validators.DateValidator
import info.nightscout.core.validators.validators.DomainValidator
import info.nightscout.core.validators.validators.DummyValidator
import info.nightscout.core.validators.validators.EmailValidator
import info.nightscout.core.validators.validators.EmptyValidator
import info.nightscout.core.validators.validators.FloatNumericRangeValidator
import info.nightscout.core.validators.validators.HttpsUrlValidator
import info.nightscout.core.validators.validators.IpAddressValidator
import info.nightscout.core.validators.validators.MinDigitLengthValidator
import info.nightscout.core.validators.validators.MultiPhoneValidator
import info.nightscout.core.validators.validators.MultiValidator
import info.nightscout.core.validators.validators.NotValidator
import info.nightscout.core.validators.validators.NumericRangeValidator
import info.nightscout.core.validators.validators.NumericValidator
import info.nightscout.core.validators.validators.OrValidator
import info.nightscout.core.validators.validators.PersonFullNameValidator
import info.nightscout.core.validators.validators.PersonNameValidator
import info.nightscout.core.validators.validators.PhoneValidator
import info.nightscout.core.validators.validators.PinStrengthValidator
import info.nightscout.core.validators.validators.RegexpValidator
import info.nightscout.core.validators.validators.Validator
import info.nightscout.core.validators.validators.WebUrlValidator
import app.aaps.core.validators.validators.AlphaNumericValidator
import app.aaps.core.validators.validators.AlphaValidator
import app.aaps.core.validators.validators.AndValidator
import app.aaps.core.validators.validators.BgRangeValidator
import app.aaps.core.validators.validators.CreditCardValidator
import app.aaps.core.validators.validators.DateValidator
import app.aaps.core.validators.validators.DomainValidator
import app.aaps.core.validators.validators.DummyValidator
import app.aaps.core.validators.validators.EmailValidator
import app.aaps.core.validators.validators.EmptyValidator
import app.aaps.core.validators.validators.FloatNumericRangeValidator
import app.aaps.core.validators.validators.HttpsUrlValidator
import app.aaps.core.validators.validators.IpAddressValidator
import app.aaps.core.validators.validators.MinDigitLengthValidator
import app.aaps.core.validators.validators.MultiPhoneValidator
import app.aaps.core.validators.validators.MultiValidator
import app.aaps.core.validators.validators.NotValidator
import app.aaps.core.validators.validators.NumericRangeValidator
import app.aaps.core.validators.validators.NumericValidator
import app.aaps.core.validators.validators.OrValidator
import app.aaps.core.validators.validators.PersonFullNameValidator
import app.aaps.core.validators.validators.PersonNameValidator
import app.aaps.core.validators.validators.PhoneValidator
import app.aaps.core.validators.validators.PinStrengthValidator
import app.aaps.core.validators.validators.RegexpValidator
import app.aaps.core.validators.validators.Validator
import app.aaps.core.validators.validators.WebUrlValidator
import javax.inject.Inject
@Suppress("SpellCheckingInspection")

4
core/validators/src/main/java/info/nightscout/core/validators/EditTextValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/EditTextValidator.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.core.validators
package app.aaps.core.validators
import android.content.Context
import android.text.TextWatcher
import info.nightscout.core.validators.validators.Validator
import app.aaps.core.validators.validators.Validator
/**
* Interface for encapsulating validation of an EditText control

2
core/validators/src/main/java/info/nightscout/core/validators/ValidatingEditTextPreference.kt → core/validators/src/main/kotlin/app/aaps/core/validators/ValidatingEditTextPreference.kt
View file

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

8
core/validators/src/main/java/info/nightscout/core/validators/di/ValidatorsModule.kt → core/validators/src/main/kotlin/app/aaps/core/validators/di/ValidatorsModule.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.core.validators.di
package app.aaps.core.validators.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.core.validators.DefaultEditTextValidator
import info.nightscout.core.validators.EditTextValidator
import info.nightscout.core.validators.ValidatingEditTextPreference
import app.aaps.core.validators.DefaultEditTextValidator
import app.aaps.core.validators.EditTextValidator
import app.aaps.core.validators.ValidatingEditTextPreference
@Module
@Suppress("unused")

2
core/validators/src/main/java/info/nightscout/core/validators/validators/AlphaNumericValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/AlphaNumericValidator.kt
View file

@ -1,3 +1,3 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
class AlphaNumericValidator(message: String?) : RegexpValidator(message, "[a-zA-Z0-9\u00C0-\u00FF \\./-\\?]*")

2
core/validators/src/main/java/info/nightscout/core/validators/validators/AlphaValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/AlphaValidator.kt
View file

@ -1,3 +1,3 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
class AlphaValidator(message: String?) : RegexpValidator(message, "[A-z\u00C0-\u00ff \\./-\\?]*")

2
core/validators/src/main/java/info/nightscout/core/validators/validators/AndValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/AndValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/BgRangeValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/BgRangeValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText
import app.aaps.core.interfaces.profile.ProfileUtil

2
core/validators/src/main/java/info/nightscout/core/validators/validators/CreditCardValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/CreditCardValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/DateValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/DateValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.annotation.SuppressLint
import android.text.TextUtils

2
core/validators/src/main/java/info/nightscout/core/validators/validators/DigitLengthRangeValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/DigitLengthRangeValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/DomainValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/DomainValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.util.Patterns

2
core/validators/src/main/java/info/nightscout/core/validators/validators/DummyValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/DummyValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/EmailValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/EmailValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.util.Patterns

2
core/validators/src/main/java/info/nightscout/core/validators/validators/EmptyValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/EmptyValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.text.TextUtils
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/FloatNumericRangeValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/FloatNumericRangeValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText
import app.aaps.core.interfaces.utils.SafeParse

2
core/validators/src/main/java/info/nightscout/core/validators/validators/HttpsUrlValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/HttpsUrlValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/IpAddressValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/IpAddressValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.util.Patterns

2
core/validators/src/main/java/info/nightscout/core/validators/validators/MinDigitLengthValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/MinDigitLengthValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/MultiPhoneValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/MultiPhoneValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.util.Patterns
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/MultiValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/MultiValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import java.util.Arrays

2
core/validators/src/main/java/info/nightscout/core/validators/validators/NotValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/NotValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/NumericRangeValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/NumericRangeValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/NumericValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/NumericValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.text.TextUtils
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/OrValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/OrValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/PatternValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/PatternValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText
import java.util.regex.Pattern

2
core/validators/src/main/java/info/nightscout/core/validators/validators/PersonFullNameValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/PersonFullNameValidator.kt
View file

@ -1,3 +1,3 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
class PersonFullNameValidator(message: String?) : RegexpValidator(message, "[\\p{L}- ]+")

2
core/validators/src/main/java/info/nightscout/core/validators/validators/PersonNameValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/PersonNameValidator.kt
View file

@ -1,3 +1,3 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
class PersonNameValidator(message: String?) : RegexpValidator(message, "[\\p{L}-]+")

2
core/validators/src/main/java/info/nightscout/core/validators/validators/PhoneValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/PhoneValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.util.Patterns

2
core/validators/src/main/java/info/nightscout/core/validators/validators/PinStrengthValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/PinStrengthValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/RegexpValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/RegexpValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import java.util.regex.Pattern

2
core/validators/src/main/java/info/nightscout/core/validators/validators/SameValueValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/SameValueValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.text.TextUtils
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/Validator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/Validator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.widget.EditText

2
core/validators/src/main/java/info/nightscout/core/validators/validators/WebUrlValidator.kt → core/validators/src/main/kotlin/app/aaps/core/validators/validators/WebUrlValidator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.core.validators.validators
package app.aaps.core.validators.validators
import android.util.Patterns

2
plugins/aps/src/main/res/xml/pref_autotune.xml
View file

@ -27,7 +27,7 @@
android:title="@string/autotune_tune_insulin_curve_title" />
-->
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="5"
android:key="@string/key_autotune_default_tune_days"
android:title="@string/autotune_default_tune_days_title"

2
plugins/aps/src/main/res/xml/pref_loop.xml
View file

@ -15,7 +15,7 @@
android:key="@string/key_aps_mode"
android:title="@string/aps_mode_title" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="20"
android:dialogMessage="@string/loop_open_mode_min_change_summary"
android:digits="0123456789"

12
plugins/aps/src/main/res/xml/pref_openapsama.xml
View file

@ -8,7 +8,7 @@
android:title="@string/openapsama"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1"
android:dialogMessage="@string/openapsma_max_basal_summary"
android:inputType="numberDecimal"
@ -18,7 +18,7 @@
validate:floatminNumber="0.1"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1.5"
android:dialogMessage="@string/openapsma_max_iob_summary"
android:inputType="numberDecimal"
@ -39,7 +39,7 @@
android:summary="@string/openapsama_autosens_adjust_targets_summary"
android:title="@string/openapsama_autosens_adjust_targets" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3.0"
android:dialogMessage="@string/openapsama_min_5m_carb_impact_summary"
android:inputType="numberDecimal"
@ -66,7 +66,7 @@
android:summary="@string/always_use_short_avg_summary"
android:title="@string/always_use_short_avg" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3"
android:dialogMessage="@string/openapsama_max_daily_safety_multiplier_summary"
android:digits="0123456789.,"
@ -79,7 +79,7 @@
validate:minNumber="1"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="4"
android:dialogMessage="@string/openapsama_current_basal_safety_multiplier_summary"
android:digits="0123456789.,"
@ -93,7 +93,7 @@
validate:floatminNumber="1"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="2"
android:dialogMessage="@string/openapsama_bolus_snooze_dia_divisor_summary"
android:digits="0123456789.,"

16
plugins/aps/src/main/res/xml/pref_openapssmb.xml
View file

@ -8,7 +8,7 @@
android:title="@string/openapssmb"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1"
android:dialogMessage="@string/openapsma_max_basal_summary"
android:inputType="numberDecimal"
@ -18,7 +18,7 @@
validate:floatminNumber="0.1"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3"
android:dialogMessage="@string/openapssmb_max_iob_summary"
android:inputType="numberDecimal"
@ -74,7 +74,7 @@
android:summary="@string/enable_smb_after_carbs_summary"
android:title="@string/enable_smb_after_carbs" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3"
android:digits="0123456789"
android:inputType="number"
@ -87,7 +87,7 @@
validate:minNumber="1"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="30"
android:digits="0123456789"
android:entries="@array/smbMaxMinutes"
@ -99,7 +99,7 @@
validate:minNumber="15"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="30"
android:dialogMessage="@string/uam_smb_max_minutes"
android:digits="0123456789"
@ -145,7 +145,7 @@
android:summary="@string/low_temptarget_lowers_sensitivity_summary"
android:title="@string/low_temptarget_lowers_sensitivity_title" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1"
android:dialogMessage="@string/carbs_req_threshold_summary"
android:digits="0123456789"
@ -176,7 +176,7 @@
android:summary="@string/always_use_short_avg_summary"
android:title="@string/always_use_short_avg" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3"
android:dialogMessage="@string/openapsama_max_daily_safety_multiplier_summary"
android:digits="0123456789.,"
@ -189,7 +189,7 @@
validate:minNumber="1"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="4"
android:dialogMessage="@string/openapsama_current_basal_safety_multiplier_summary"
android:digits="0123456789.,"

20
plugins/aps/src/main/res/xml/pref_openapssmbdynamicisf.xml
View file

@ -8,7 +8,7 @@
android:title="@string/openapssmb"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1"
android:dialogMessage="@string/openapsma_max_basal_summary"
android:inputType="numberDecimal"
@ -18,7 +18,7 @@
validate:floatminNumber="0.1"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3"
android:dialogMessage="@string/openapssmb_max_iob_summary"
android:inputType="numberDecimal"
@ -28,7 +28,7 @@
validate:floatminNumber="0"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="100"
android:enabled="true"
android:dialogMessage="@string/DynISFAdjust_summary"
@ -39,7 +39,7 @@
validate:floatminNumber="1"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="65"
android:inputType="numberDecimal"
android:dialogMessage="@string/lgs_threshold_summary"
@ -95,7 +95,7 @@
android:summary="@string/enable_smb_after_carbs_summary"
android:title="@string/enable_smb_after_carbs" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3"
android:digits="0123456789"
android:inputType="number"
@ -108,7 +108,7 @@
validate:minNumber="1"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="30"
android:digits="0123456789"
android:entries="@array/smbMaxMinutes"
@ -120,7 +120,7 @@
validate:minNumber="15"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="30"
android:dialogMessage="@string/uam_smb_max_minutes"
android:digits="0123456789"
@ -166,7 +166,7 @@
android:summary="@string/low_temptarget_lowers_sensitivity_summary"
android:title="@string/low_temptarget_lowers_sensitivity_title" />-->
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1"
android:dialogMessage="@string/carbs_req_threshold_summary"
android:digits="0123456789"
@ -197,7 +197,7 @@
android:summary="@string/always_use_short_avg_summary"
android:title="@string/always_use_short_avg" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3"
android:dialogMessage="@string/openapsama_max_daily_safety_multiplier_summary"
android:digits="0123456789.,"
@ -210,7 +210,7 @@
validate:minNumber="1"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="4"
android:dialogMessage="@string/openapsama_current_basal_safety_multiplier_summary"
android:digits="0123456789.,"

2
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt
View file

@ -39,7 +39,7 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) {
//Check for uninitialized profileName
if (inputProfileName.value == "") {
aapsLogger.error(LTag.AUTOMATION, "Selected profile not initialized")
callback.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.validators.R.string.error_field_must_not_be_empty)).run()
callback.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.validators.R.string.error_field_must_not_be_empty)).run()
return
}
if (profileFunction.getProfile() == null) {

2
plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt
View file

@ -23,7 +23,7 @@ class ActionProfileSwitchTest : ActionsTestBase() {
`when`(rh.gs(R.string.changengetoprofilename)).thenReturn("Change profile to %s")
`when`(context.getString(R.string.alreadyset)).thenReturn("Already set")
`when`(context.getString(app.aaps.core.ui.R.string.notexists)).thenReturn("not exists")
`when`(context.getString(info.nightscout.core.validators.R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty")
`when`(context.getString(app.aaps.core.validators.R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty")
`when`(context.getString(app.aaps.core.ui.R.string.noprofile)).thenReturn("No profile loaded from NS yet")
sut = ActionProfileSwitch(injector)

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

@ -38,7 +38,7 @@ class SWEditUrl(injector: HasAndroidInjector) : SWItem(injector, Type.URL) {
editText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
if (Patterns.WEB_URL.matcher(s).matches()) save(s.toString(), updateDelay) else rxBus.send(EventSWLabel(rh.gs(info.nightscout.core.validators.R.string.error_url_not_valid)))
if (Patterns.WEB_URL.matcher(s).matches()) save(s.toString(), updateDelay) else rxBus.send(EventSWLabel(rh.gs(app.aaps.core.validators.R.string.error_url_not_valid)))
}
override fun afterTextChanged(s: Editable) {}

2
plugins/configuration/src/main/res/xml/pref_datachoices.xml
View file

@ -13,7 +13,7 @@
android:summary="@string/allow_automated_crash_reporting"
android:title="@string/fabric_upload" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:dialogMessage="@string/summary_email_for_crash_report"
android:inputType="text"
android:key="@string/key_email_for_crash_report"

4
plugins/configuration/src/main/res/xml/pref_maintenance.xml
View file

@ -8,7 +8,7 @@
android:title="@string/maintenance_settings"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="logs@aaps.app"
android:dialogMessage="@string/maintenance_email"
android:inputType="textEmailAddress"
@ -17,7 +17,7 @@
android:title="@string/maintenance_email"
validate:testType="email"/>
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="2"
android:inputType="number"
android:key="@string/key_maintenance_logs_amount"

4
plugins/constraints/src/main/res/xml/pref_safety.xml
View file

@ -16,7 +16,7 @@
android:summary="@string/patient_age_summary"
android:title="@string/patient_type" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="3"
android:inputType="numberDecimal"
android:key="@string/key_treatmentssafety_maxbolus"
@ -25,7 +25,7 @@
validate:floatminNumber="0.1"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="48"
android:inputType="number"
android:key="@string/key_treatmentssafety_maxcarbs"

2
plugins/insulin/src/main/res/xml/pref_insulinoreffreepeak.xml
View file

@ -8,7 +8,7 @@
android:title="@string/insulin_oref_peak"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="75"
android:digits="0123456789"
android:inputType="number"

2
plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt
View file

@ -34,7 +34,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.shared.impl.rx.bus.RxBusImpl
import dagger.android.HasAndroidInjector
import app.aaps.core.ui.dialogs.OKDialog
import info.nightscout.core.validators.ValidatingEditTextPreference
import app.aaps.core.validators.ValidatingEditTextPreference
import info.nightscout.plugins.R
import info.nightscout.plugins.general.overview.notifications.NotificationStore
import info.nightscout.plugins.general.overview.notifications.NotificationWithAction

2
plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
View file

@ -54,7 +54,7 @@ import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.core.utils.receivers.DataWorkerStorage
import dagger.android.HasAndroidInjector
import info.nightscout.core.validators.ValidatingEditTextPreference
import app.aaps.core.validators.ValidatingEditTextPreference
import info.nightscout.database.entities.OfflineEvent
import info.nightscout.database.entities.TemporaryTarget
import info.nightscout.database.entities.UserEntry.Action

66
plugins/main/src/main/res/xml/pref_overview.xml
View file

@ -33,7 +33,7 @@
android:key="@string/key_show_insulin_button"
android:title="@string/configbuilder_insulin" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0.5"
android:dependency="@string/key_show_insulin_button"
android:dialogMessage="@string/insulin_increment_button_message"
@ -47,7 +47,7 @@
validate:floatminNumber="-5.0"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1.0"
android:dependency="@string/key_show_insulin_button"
android:dialogMessage="@string/insulin_increment_button_message"
@ -61,7 +61,7 @@
validate:floatminNumber="-5.0"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="2.0"
android:dependency="@string/key_show_insulin_button"
android:dialogMessage="@string/insulin_increment_button_message"
@ -80,7 +80,7 @@
android:key="@string/key_show_carbs_button"
android:title="@string/carbs" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="5"
android:dependency="@string/key_show_carbs_button"
android:dialogMessage="@string/carb_increment_button_message"
@ -94,7 +94,7 @@
validate:minNumber="-50"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="10"
android:dependency="@string/key_show_carbs_button"
android:dialogMessage="@string/carb_increment_button_message"
@ -108,7 +108,7 @@
validate:minNumber="-50"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="20"
android:dependency="@string/key_show_carbs_button"
android:dialogMessage="@string/carb_increment_button_message"
@ -146,7 +146,7 @@
android:key="@string/default_temptargets"
android:title="@string/default_temptargets">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="number"
android:key="@string/key_eatingsoon_duration"
@ -155,7 +155,7 @@
validate:minNumber="15"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="numberDecimal"
android:key="@string/key_eatingsoon_target"
@ -164,7 +164,7 @@
validate:floatminNumber="4.0"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="number"
android:key="@string/key_activity_duration"
@ -173,7 +173,7 @@
validate:minNumber="15"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="numberDecimal"
android:key="@string/key_activity_target"
@ -182,7 +182,7 @@
validate:floatminNumber="6.0"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="number"
android:key="@string/key_hypo_duration"
@ -191,7 +191,7 @@
validate:minNumber="15"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="numberDecimal"
android:key="@string/key_hypo_target"
@ -206,7 +206,7 @@
android:key="@string/fill_bolus_title"
android:title="@string/fill_bolus_title">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0.3"
android:inputType="numberDecimal"
android:key="fill_button1"
@ -215,7 +215,7 @@
validate:floatminNumber="0.05"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="numberDecimal"
android:key="fill_button2"
@ -224,7 +224,7 @@
validate:floatminNumber="0.05"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="numberDecimal"
android:key="fill_button3"
@ -240,7 +240,7 @@
android:summary="@string/prefs_range_summary"
android:title="@string/prefs_range_title">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="numberDecimal"
android:key="@string/key_low_mark"
@ -249,7 +249,7 @@
validate:floatminNumber="3"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0"
android:inputType="numberDecimal"
android:key="@string/key_high_mark"
@ -279,7 +279,7 @@
android:key="@string/key_show_statuslights"
android:title="@string/show_statuslights" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="48"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -292,7 +292,7 @@
validate:minNumber="24"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="72"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -305,7 +305,7 @@
validate:minNumber="24"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="72"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -318,7 +318,7 @@
validate:minNumber="24"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="144"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -331,7 +331,7 @@
validate:minNumber="24"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="216"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -344,7 +344,7 @@
validate:minNumber="24"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="240"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -357,7 +357,7 @@
validate:minNumber="24"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="25"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -370,7 +370,7 @@
validate:minNumber="0"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="5"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -383,7 +383,7 @@
validate:minNumber="0"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="216"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -396,7 +396,7 @@
validate:minNumber="24"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="240"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -409,7 +409,7 @@
validate:minNumber="24"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="80"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -422,7 +422,7 @@
validate:minNumber="0"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="10"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -435,7 +435,7 @@
validate:minNumber="0"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="25"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -448,7 +448,7 @@
validate:minNumber="0"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="5"
android:dependency="@string/key_show_statuslights"
android:inputType="numberSigned"
@ -469,7 +469,7 @@
</androidx.preference.PreferenceScreen>
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="100"
android:dialogMessage="@string/deliverpartofboluswizard"
android:inputType="number"
@ -482,7 +482,7 @@
validate:minNumber="10"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="16"
android:dialogMessage="@string/deliver_part_of_boluswizard_reset_time"
android:inputType="number"

6
plugins/main/src/main/res/xml/pref_smscommunicator.xml
View file

@ -8,7 +8,7 @@
android:title="@string/smscommunicator"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:key="@string/key_smscommunicator_allowednumbers"
android:summary="@string/smscommunicator_allowednumbers_summary"
android:title="@string/smscommunicator_allowednumbers"
@ -19,7 +19,7 @@
android:key="@string/key_smscommunicator_remote_commands_allowed"
android:title="@string/smscommunicator_remote_commands_allowed" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="15"
android:key="@string/key_smscommunicator_remote_bolus_min_distance"
android:summary="@string/smscommunicator_remote_bolus_min_distance_summary"
@ -28,7 +28,7 @@
validate:minNumber="3"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:dependency="@string/key_smscommunicator_remote_commands_allowed"
android:key="@string/key_smscommunicator_otp_password"
android:summary="@string/smscommunicator_otp_pin_summary"

8
plugins/sensitivity/src/main/res/xml/pref_absorption_aaps.xml
View file

@ -9,7 +9,7 @@
android:title="@string/absorption_settings_title"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="6"
android:dialogMessage="@string/absorption_max_time_summary"
android:digits="0123456789.,"
@ -22,7 +22,7 @@
validate:minNumber="4"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="24"
android:dialogMessage="@string/openapsama_autosens_period_summary"
android:digits="0123456789"
@ -40,7 +40,7 @@
android:key="absorption_aaps_advanced"
android:title="@string/advanced_settings_title">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1.2"
android:dialogMessage="@string/openapsama_autosens_max_summary"
android:digits="0123456789.,"
@ -54,7 +54,7 @@
validate:floatminNumber="0.5"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0.7"
android:dialogMessage="@string/openapsama_autosens_min_summary"
android:inputType="numberDecimal"

8
plugins/sensitivity/src/main/res/xml/pref_absorption_oref1.xml
View file

@ -9,7 +9,7 @@
android:title="@string/absorption_settings_title"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="8.0"
android:dialogMessage="@string/openapsama_min_5m_carb_impact_summary"
android:inputType="numberDecimal"
@ -22,7 +22,7 @@
validate:floatminNumber="0.1"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="6"
android:dialogMessage="@string/absorption_cutoff_summary"
android:digits="0123456789.,"
@ -39,7 +39,7 @@
android:key="absorption_oref1_advanced"
android:title="@string/advanced_settings_title">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="1.2"
android:dialogMessage="@string/openapsama_autosens_max_summary"
android:digits="0123456789.,"
@ -53,7 +53,7 @@
validate:floatminNumber="0.5"
validate:testType="floatNumericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="0.7"
android:dialogMessage="@string/openapsama_autosens_min_summary"
android:inputType="numberDecimal"

8
plugins/sync/src/main/res/xml/pref_ns_client.xml
View file

@ -8,7 +8,7 @@
android:title="@string/ns_client_internal_title"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="https://{YOUR-SITE}.azurewebsites.net/"
android:dialogMessage="@string/ns_client_url_dialog_message"
android:inputType="textUri"
@ -17,7 +17,7 @@
android:title="@string/ns_client_url_title"
validate:testType="httpsUrl" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:dialogMessage="@string/ns_client_secret_dialog_message"
android:dialogTitle="@string/ns_client_secret_dialog_title"
android:inputType="textPassword"
@ -109,7 +109,7 @@
android:key="@string/key_ns_announcements"
android:title="@string/ns_announcements" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="16"
android:digits="0123456789"
android:inputType="number"
@ -122,7 +122,7 @@
validate:minNumber="15"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="31"
android:digits="0123456789"
android:inputType="number"

8
plugins/sync/src/main/res/xml/pref_ns_client_v3.xml
View file

@ -8,7 +8,7 @@
android:title="@string/ns_client_internal_title"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="https://{YOUR-SITE}.azurewebsites.net"
android:dialogMessage="@string/ns_client_url_dialog_message"
android:inputType="textUri"
@ -17,7 +17,7 @@
android:title="@string/ns_client_url_title"
validate:testType="httpsUrl" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:dialogMessage="@string/nsclient_token_dialog_message"
android:dialogTitle="@string/nsclient_token_dialog_title"
android:inputType="textPassword"
@ -115,7 +115,7 @@
android:key="@string/key_ns_announcements"
android:title="@string/ns_announcements" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="16"
android:digits="0123456789"
android:inputType="number"
@ -128,7 +128,7 @@
validate:minNumber="15"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="31"
android:digits="0123456789"
android:inputType="number"

2
plugins/sync/src/main/res/xml/pref_tidepool.xml
View file

@ -8,7 +8,7 @@
android:title="@string/tidepool"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:key="@string/key_tidepool_username"
android:summary="@string/summary_tidepool_username"
android:title="@string/title_tidepool_username"

2
pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/base/Logger.kt
View file

@ -72,7 +72,7 @@ class StderrLoggerBackend : LoggerBackend {
(if (throwable != null) " (${throwable::class.qualifiedName}: \"${throwable.message}\")" else "") +
(if (message != null) " $message" else "")
System.err.println(fullMessage)
println(fullMessage)
}
}

4
pump/combov2/comboctl/src/jvmTest/kotlin/info/nightscout/comboctl/base/PairingSessionTest.kt
View file

@ -91,7 +91,7 @@ class PairingSessionTest {
override suspend fun send(dataToSend: List<Byte>) {
try {
val sequenceEntry = getNextSequenceEntry(PacketDirection.SEND)
System.err.println("Next sequence entry: $sequenceEntry")
println("Next sequence entry: $sequenceEntry")
val expectedPacketData = sequenceEntry.packet.toByteList()
assertEquals(expectedPacketData, dataToSend)
@ -129,7 +129,7 @@ class PairingSessionTest {
override suspend fun receive(): List<Byte> {
try {
val sequenceEntry = getNextSequenceEntry(PacketDirection.RECEIVE)
System.err.println("Next sequence entry: $sequenceEntry")
println("Next sequence entry: $sequenceEntry")
// Signal to the other, suspended coroutine that it can resume now.
barrier.trySend(Unit)

6
pump/combov2/comboctl/src/jvmTest/kotlin/info/nightscout/comboctl/base/TransportLayerTest.kt
View file

@ -265,7 +265,7 @@ class TransportLayerTest {
// Wait until an exception is thrown in the packet receiver
// and we get notified about it.
waitingForExceptionJob.join()
System.err.println(
println(
"Exception thrown by in packet receiver (this exception was expected by the test): $expectedError"
)
assertNotNull(expectedError)
@ -285,7 +285,7 @@ class TransportLayerTest {
// other create*PacketInfo function.
tpLayerIO.send(TransportLayer.createRequestPairingConnectionPacketInfo())
}
System.err.println(
println(
"Exception thrown by send() call (this exception was expected by the test): $exceptionThrownBySendCall"
)
assertIs<TransportLayer.ErrorResponseException>(exceptionThrownBySendCall.cause)
@ -293,7 +293,7 @@ class TransportLayerTest {
val exceptionThrownByReceiveCall = assertFailsWith<TransportLayer.PacketReceiverException> {
tpLayerIO.receive()
}
System.err.println(
println(
"Exception thrown by receive() call (this exception was expected by the test): $exceptionThrownByReceiveCall"
)
assertIs<TransportLayer.ErrorResponseException>(exceptionThrownByReceiveCall.cause)

4
pump/combov2/comboctl/src/jvmTest/kotlin/info/nightscout/comboctl/main/RTNavigationTest.kt
View file

@ -69,7 +69,7 @@ class RTNavigationTest {
init {
mainScope.launch {
while (true) {
System.err.println("Emitting test screen $currentParsedScreen")
println("Emitting test screen $currentParsedScreen")
parsedScreenChannel.send(currentParsedScreen)
delay(100)
if (automaticallyAdvanceScreens) {
@ -145,7 +145,7 @@ class RTNavigationTest {
override suspend fun shortPressButton(button: RTNavigationButton) {
// Simulate the consequences of user interaction by moving to the next screen.
currentParsedScreen = testParsedScreenListIter.next()
System.err.println("Moved to next screen $currentParsedScreen after short button press")
println("Moved to next screen $currentParsedScreen after short button press")
shortPressedRTButtons.add(button)
}
}

2
pump/danar/src/main/res/xml/pref_danar.xml
View file

@ -13,7 +13,7 @@
android:key="@string/key_danar_bt_name"
android:title="@string/danar_bt_name_title" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:inputType="numberPassword"
android:key="@string/key_danar_password"
android:title="@string/danar_password_title"

2
pump/danar/src/main/res/xml/pref_danarkorean.xml
View file

@ -13,7 +13,7 @@
android:key="@string/key_danar_bt_name"
android:title="@string/danar_bt_name_title" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:inputType="numberPassword"
android:key="@string/key_danar_password"
android:title="@string/danar_password_title"

2
pump/danar/src/main/res/xml/pref_danarv2.xml
View file

@ -13,7 +13,7 @@
android:key="@string/key_danar_bt_name"
android:title="@string/danar_bt_name_title" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:inputType="numberPassword"
android:key="@string/key_danar_password"
android:title="@string/danar_password_title"

12
pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt
View file

@ -11,8 +11,8 @@ import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.utils.hexStringToByteArray
import info.nightscout.core.validators.DefaultEditTextValidator
import info.nightscout.core.validators.EditTextValidator
import app.aaps.core.validators.DefaultEditTextValidator
import app.aaps.core.validators.EditTextValidator
import info.nightscout.pump.danars.DanaRSPlugin
import info.nightscout.pump.danars.databinding.DanarsEnterPinActivityBinding
import info.nightscout.pump.danars.services.BLEComm
@ -41,12 +41,12 @@ class EnterPinActivity : TranslatedDaggerAppCompatActivity() {
setContentView(binding.root)
val p1 = DefaultEditTextValidator(binding.rsV3Pin1, this)
.setTestErrorString(rh.gs(info.nightscout.core.validators.R.string.error_mustbe12hexadidits), this)
.setCustomRegexp(rh.gs(info.nightscout.core.validators.R.string.twelvehexanumber), this)
.setTestErrorString(rh.gs(app.aaps.core.validators.R.string.error_mustbe12hexadidits), this)
.setCustomRegexp(rh.gs(app.aaps.core.validators.R.string.twelvehexanumber), this)
.setTestType(EditTextValidator.TEST_REGEXP, this)
val p2 = DefaultEditTextValidator(binding.rsV3Pin2, this)
.setTestErrorString(rh.gs(info.nightscout.core.validators.R.string.error_mustbe8hexadidits), this)
.setCustomRegexp(rh.gs(info.nightscout.core.validators.R.string.eighthexanumber), this)
.setTestErrorString(rh.gs(app.aaps.core.validators.R.string.error_mustbe8hexadidits), this)
.setCustomRegexp(rh.gs(app.aaps.core.validators.R.string.eighthexanumber), this)
.setTestType(EditTextValidator.TEST_REGEXP, this)
binding.okcancel.ok.setOnClickListener {

2
pump/danars/src/main/res/xml/pref_danars.xml
View file

@ -15,7 +15,7 @@
<intent android:action="info.nightscout.pump.danars.activities.BLEScanActivity" />
</Preference>
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:inputType="numberPassword"
android:digits="0123456789ABCDEF"
android:key="@string/key_danars_password"

6
pump/medtronic/src/main/res/xml/pref_medtronic.xml
View file

@ -8,7 +8,7 @@
android:title="@string/medtronic_name"
app:initialExpandedChildrenCount="0">
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="000000"
android:key="@string/key_medtronic_serial"
android:selectAllOnFocus="true"
@ -33,7 +33,7 @@
android:selectable="true"
android:title="@string/medtronic_pump_frequency" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="35"
android:digits="0123456789."
android:inputType="number"
@ -45,7 +45,7 @@
validate:minNumber="1"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="25"
android:digits="0123456789."
android:inputType="number"

2
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
View file

@ -49,7 +49,7 @@ import app.aaps.core.interfaces.utils.TimeChangeType
import dagger.android.HasAndroidInjector
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.toast.ToastUtils
import info.nightscout.core.validators.ValidatingEditTextPreference
import app.aaps.core.validators.ValidatingEditTextPreference
import info.nightscout.pump.medtrum.comm.enums.MedtrumPumpState
import info.nightscout.pump.medtrum.services.MedtrumService
import info.nightscout.pump.medtrum.ui.MedtrumOverviewFragment

4
pump/medtrum/src/main/res/xml/pref_medtrum_pump.xml
View file

@ -27,7 +27,7 @@
android:entries="@array/alarmSettings"
android:entryValues="@array/alarmSettingsValues" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="25"
android:inputType="number"
android:key="@string/key_hourly_max_insulin"
@ -37,7 +37,7 @@
validate:minNumber="10"
validate:testType="numericRange" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="80"
android:inputType="number"
android:key="@string/key_daily_max_insulin"

6
pump/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
View file

@ -40,7 +40,7 @@
android:title="@string/omnipod_common_preferences_expiration_reminder_enabled"
android:summary="@string/omnipod_common_preferences_expiration_reminder_enabled_summary" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="4"
android:dependency="@string/key_omnipod_common_expiration_reminder_enabled"
android:digits="0123456789"
@ -57,7 +57,7 @@
android:title="@string/omnipod_common_preferences_expiration_alarm_enabled"
android:summary="@string/omnipod_common_preferences_expiration_alarm_enabled_summary" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="8"
android:dependency="@string/key_omnipod_common_expiration_alarm_enabled"
android:digits="0123456789"
@ -73,7 +73,7 @@
android:key="@string/key_omnipod_common_low_reservoir_alert_enabled"
android:title="@string/omnipod_common_preferences_low_reservoir_alert_enabled" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="20"
android:dependency="@string/key_omnipod_common_low_reservoir_alert_enabled"
android:digits="0123456789"

4
pump/omnipod-eros/src/main/res/xml/omnipod_eros_preferences.xml
View file

@ -71,7 +71,7 @@
android:key="@string/key_omnipod_common_expiration_reminder_enabled"
android:title="@string/omnipod_common_preferences_expiration_reminder_enabled" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="9"
android:dependency="@string/key_omnipod_common_expiration_reminder_enabled"
android:digits="0123456789"
@ -87,7 +87,7 @@
android:key="@string/key_omnipod_common_low_reservoir_alert_enabled"
android:title="@string/omnipod_common_preferences_low_reservoir_alert_enabled" />
<info.nightscout.core.validators.ValidatingEditTextPreference
<app.aaps.core.validators.ValidatingEditTextPreference
android:defaultValue="20"
android:dependency="@string/key_omnipod_common_low_reservoir_alert_enabled"
android:digits="0123456789"