diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2f474bf11f..2723505db5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ Coding convetions 1. Use Android Studio with default indents (4 chars, use spaces) 2. Use autoformat feature CTRL-ALT-L in every changed file before commit -Commiting Changes / Pull Requests +Committing Changes / Pull Requests --------------------------------- 1. Make fork of repository on github diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc57e3e06f..62cda2d4a7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -395,7 +395,7 @@ patient_name I_understand Glimp - %1$s needs battery optimalization whitelisting for proper performance + %1$s needs battery optimization whitelisting for proper performance Loop suspended Suspended (%1$d m) Suspend loop for 1h @@ -857,7 +857,7 @@ == ∑ %1$s U dexcom_lognssensorchange Log sensor change to NS - Create event \"Sensor Change\" in NS automaticaly on sensor start + Create event \"Sensor Change\" in NS automatically on sensor start Tomato (MiaoMiao) Tomato tidepool_username @@ -1008,7 +1008,7 @@ 3. Test One-Time-Password Reset Authenticators On each follower phone install Authenticator app that support RFC 6238 TOTP tokens. Popular free apps are:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator - By reseting authenticator you make all already provisioned authenticators invalid. You will need to set up them again! + By resetting authenticator you make all already provisioned authenticators invalid. You will need to set up them again! Predictions Treatments Deviation slope diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt index 7e738711a3..8609be343b 100644 --- a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt +++ b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculator.kt @@ -85,7 +85,7 @@ interface IobCobCalculator { fun getExtendedBolus(timestamp: Long): ExtendedBolus? /** - * Calculate IOB of base basal insulin (usualy not accounted towards IOB) + * Calculate IOB of base basal insulin (usually not accounted towards IOB) * * @param toTime * @return IobTotal @@ -106,4 +106,4 @@ interface IobCobCalculator { * @return IobTotal */ fun calculateIobFromTempBasalsIncludingConvertedExtended(): IobTotal -} \ No newline at end of file +} diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt index c62250c04a..f57d71315b 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensDataStore.kt @@ -84,7 +84,7 @@ class AutosensDataStore { } /** - * Provide last GlucoseValue or null if none exists withing last 9 minutes + * Provide last GlucoseValue or null if none exists within the last 9 minutes * * @return GlucoseValue or null */ @@ -354,4 +354,4 @@ class AutosensDataStore { } return if (count != 0) sum / count else 0.0 } -} \ No newline at end of file +} diff --git a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/ValueWithUnitMapper.kt b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/ValueWithUnitMapper.kt index 88b8270df9..152d824a08 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/ValueWithUnitMapper.kt +++ b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/ValueWithUnitMapper.kt @@ -6,7 +6,7 @@ import info.nightscout.androidaps.database.entities.TemporaryTarget import info.nightscout.androidaps.database.entities.TherapyEvent import info.nightscout.androidaps.database.entities.ValueWithUnit -sealed class ValueWithUnitMapper { //I use a sealed class because of StringResource that containts a listOf as second parameter +sealed class ValueWithUnitMapper { //I use a sealed class because of StringResource that contains a listOf as second parameter object UNKNOWN : ValueWithUnitMapper() // formerly None used as fallback @@ -89,4 +89,4 @@ sealed class ValueWithUnitMapper { //I use a sealed class because of St else -> null } } -} \ No newline at end of file +} diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 7fad7686c7..03690a4142 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -597,8 +597,8 @@ | %1$4.4s | %2$3.3f |\t%3$3.3f |\n |\t%1$02.0f\t| %2$3.3f |%3$3.3f\t| %5$.0f%% / %4$d\n |\t∑\t|\t%1$3.1f |\t%2$3.1f |\n - Autotune runned without profile switch - Autotune runned and profile automatically switched + Autotune ran without profile switch + Autotune ran and profile automatically switched Error during last Autotune run Another run of Autotune is detected, run cancelled Application needs bluetooth permission diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java index 10c8b58fa2..883572425e 100644 --- a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java +++ b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java @@ -302,7 +302,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin { return result; } - // Now set new extended, no need to to stop previous (if running) because it's replaced + // Now set new extended, no need to stop previous (if running) because it's replaced double extendedAmount = extendedRateToSet / 2 * durationInHalfHours; aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting extended: " + extendedAmount + "U half hours: " + durationInHalfHours); result = setExtendedBolus(extendedAmount, durationInMinutes); diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt index 9f41cfde1b..b4f5c87768 100644 --- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt +++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt @@ -35,7 +35,7 @@ class AppConfirmSettingResponsePacket( failed = true return } - // The bolus progress diallog opens only when the confirm result is successfull + // The bolus progress dialog opens only when the confirm result is successful if(diaconnG8Pump.bolusConfirmMessage == 0x07.toByte()) { diaconnG8Pump.isReadyToBolus = true } @@ -44,4 +44,4 @@ class AppConfirmSettingResponsePacket( override fun getFriendlyName(): String { return "PUMP_APP_CONFIRM_SETTING_RESPONSE" } -} \ No newline at end of file +} diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt index 530c127a4e..8d21266920 100644 --- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt +++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/driver/ble/PumpBLESelector.kt @@ -13,7 +13,7 @@ interface PumpBLESelector { fun onResume() /** - * Called on destory + * Called on destroy */ fun onDestroy() @@ -44,7 +44,7 @@ interface PumpBLESelector { fun onStopLeDeviceScan(context: Context) /** - * operations when scan was stopped manualy (press on button) + * operations when scan was stopped manually (press on button) */ fun onManualStopLeDeviceScan(context: Context) diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java index 3a6bee96b6..d71916418b 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java @@ -30,7 +30,7 @@ public enum RileyLinkServiceState { // error PumpConnectorReady(R.string.rileylink_state_connected), // (OK) RileyLink Ready for Pump Communication - // Initializing, // get all parameters required for connection (if not possible -> Disabled, if sucessful -> + // Initializing, // get all parameters required for connection (if not possible -> Disabled, if successful -> // EnableBluetooth) // EnableBlueTooth, // enable BT (if error no BT interface -> Disabled, BT not enabled -> BluetoothError) diff --git a/shared/src/main/java/info/nightscout/androidaps/interfaces/ResourceHelper.kt b/shared/src/main/java/info/nightscout/androidaps/interfaces/ResourceHelper.kt index f6c8fda0a5..4e34c10355 100644 --- a/shared/src/main/java/info/nightscout/androidaps/interfaces/ResourceHelper.kt +++ b/shared/src/main/java/info/nightscout/androidaps/interfaces/ResourceHelper.kt @@ -36,7 +36,7 @@ interface ResourceHelper { */ @ColorInt fun gac(context: Context?, @AttrRes attributeId: Int): Int /** - * Get themed context -->> context dependend on light or darkmode + * Get themed context -->> context dependent on light or darkmode */ fun getThemedCtx(context: Context): Context } diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml index b87fdd26f6..d97cab5974 100644 --- a/wear/src/main/res/values/strings.xml +++ b/wear/src/main/res/values/strings.xml @@ -103,7 +103,7 @@ Preset 1 Preset 2 Preset 3 - Free amount + Free amount CONFIRM timeshift Bolus