Merge pull request #2406 from nightscout/dev

Release 3.2.0.0

.circleci/config.yml

@@ -4,8 +4,8 @@ version: 2.1
 
 # Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
 orbs:
-  android: circleci/android@1.0.3
+  android: circleci/android@2.3.0
-  codecov: codecov/codecov@1.2.0
+  codecov: codecov/codecov@3.2.4
 
 jobs:
   # Below is the definition of your job to build and test your app, you can rename and customize it as you want.
@@ -13,22 +13,26 @@ jobs:
     # These next lines define the Android machine image executor: https://circleci.com/docs/2.0/executor-types/
     executor:
       name: android/android-machine
+      resource-class: large
+      tag: 2023.07.1
 
     steps:
-      # Checkout the code as the first step.
       - checkout
 
-      # The next step will run the unit tests
+      - android/change-java-version:
+          java-version: 17
+
+      - android/start-emulator-and-run-tests:
+          system-image: system-images;android-29;google_apis;x86
+          # Compile while the emulator starts to use the time.
+          post-emulator-launch-assemble-command: ./gradlew compileFullDebugUnitTestSources compileFullDebugAndroidTestSources
+          test-command: ./gradlew connectedFullDebugAndroidTest
+
       - android/run-tests:
           test-command: ./gradlew testFullDebugUnitTest
 
       - android/run-tests:
-          test-command: ./gradlew jacocoAllDebugReport
+          test-command: ./gradlew --stacktrace jacocoAllDebugReport
-
-      # Then start the emulator and run the Instrumentation tests!
-      #      - android/start-emulator-and-run-tests:
-      #          test-command: ./gradlew connectedDebugAndroidTest
-      #          system-image: system-images;android-25;google_apis;x86
 
       # And finally run the release build
       #      - run:
@@ -45,4 +49,4 @@ workflows:
   # For more details on extending your workflow, see the configuration docs: https://circleci.com/docs/2.0/configuration-reference/#workflows
   dotests:
     jobs:
-      - build-and-test
+      - build-and-test

.github/ISSUE_TEMPLATE/custom.md

@@ -15,5 +15,5 @@ Reporting bugs
   upper-right corner).
 - Obtain the app's log files, which can be found on the phone in
   _/storage/emulated/0/Android/data/info.nightscout.androidaps/_
-  See https://androidaps.readthedocs.io/en/latest/Usage/Accessing-logfiles.html
+  See https://wiki.aaps.app/en/latest/Usage/Accessing-logfiles.html
 - Open an issue at https://github.com/nightscout/AndroidAPS/issues/new

.idea/codeStyles/Project.xml

@@ -4,8 +4,6 @@
     <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
     <JetCodeStyleSettings>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="6" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="6" />
       <option name="BLANK_LINES_AROUND_BLOCK_WHEN_BRANCHES" value="1" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
@@ -13,6 +11,7 @@
       <option name="XML_TEXT_WRAP" value="0" />
     </XML>
     <codeStyleSettings language="JAVA">
+      <option name="RIGHT_MARGIN" value="200" />
       <option name="METHOD_ANNOTATION_WRAP" value="0" />
       <option name="FIELD_ANNOTATION_WRAP" value="0" />
     </codeStyleSettings>

.idea/dictionaries/project_dictionary.xml

@@ -2,12 +2,14 @@
   <dictionary name="project-dictionary">
     <words>
       <w>aaps</w>
+      <w>aapsclient</w>
       <w>abcdef</w>
       <w>accu</w>
       <w>acked</w>
       <w>actionstring</w>
       <w>aidex</w>
       <w>alarmack</w>
+      <w>alexpr</w>
       <w>allowednumbers</w>
       <w>androidaps</w>
       <w>autosens</w>
@@ -17,11 +19,13 @@
       <w>bage</w>
       <w>basaliob</w>
       <w>basals</w>
+      <w>batt</w>
       <w>bgcheck</w>
       <w>bgsource</w>
       <w>boluscalc</w>
       <w>bolusing</w>
       <w>boluswizard</w>
+      <w>boyda</w>
       <w>carb</w>
       <w>carbratio</w>
       <w>carbs</w>
@@ -30,6 +34,7 @@
       <w>cellnovo</w>
       <w>chek</w>
       <w>clearalarm</w>
+      <w>combov</w>
       <w>crashlytics</w>
       <w>danar</w>
       <w>danars</w>
@@ -43,28 +48,43 @@
       <w>dexcom</w>
       <w>dexdrip</w>
       <w>diaconn</w>
+      <w>dlvoy</w>
+      <w>dttm</w>
+      <w>ecarbs</w>
       <w>enteredby</w>
       <w>enteredinsulin</w>
+      <w>eoflow</w>
       <w>eopatch</w>
+      <w>epss</w>
       <w>eveningoutpost</w>
       <w>eversense</w>
       <w>extendedbolus</w>
+      <w>fiasp</w>
       <w>fileprovider</w>
       <w>firebase</w>
       <w>glimp</w>
       <w>glunovo</w>
+      <w>glycemia</w>
       <w>gson</w>
       <w>hmac</w>
+      <w>humalog</w>
       <w>iage</w>
+      <w>infinivocgm</w>
+      <w>instantiator</w>
       <w>insulet</w>
+      <w>intelligo</w>
       <w>iobtotal</w>
       <w>joda</w>
+      <w>joul</w>
       <w>libre</w>
       <w>listdelimiter</w>
       <w>localprofile</w>
+      <w>lyumjev</w>
       <w>mdtp</w>
       <w>medtronic</w>
+      <w>medtrum</w>
       <w>mgdl</w>
+      <w>miao</w>
       <w>misformatted</w>
       <w>mmol</w>
       <w>motol</w>
@@ -73,7 +93,10 @@
       <w>netratio</w>
       <w>nightscout</w>
       <w>notif</w>
+      <w>novolog</w>
+      <w>novorapid</w>
       <w>nsclient</w>
+      <w>oaps</w>
       <w>okcancel</w>
       <w>omnipod</w>
       <w>openaps</w>
@@ -81,6 +104,7 @@
       <w>oref</w>
       <w>otpauth</w>
       <w>passcode</w>
+      <w>pbage</w>
       <w>pdus</w>
       <w>philoul</w>
       <w>poctech</w>
@@ -88,22 +112,30 @@
       <w>profileswitch</w>
       <w>pumpbtcomm</w>
       <w>pumpcontrol</w>
+      <w>pumpdrivers</w>
       <w>quickwizard</w>
+      <w>rawbg</w>
       <w>readstatus</w>
       <w>realduration</w>
       <w>refresheventsfromnightscout</w>
+      <w>rfspy</w>
       <w>rileylink</w>
       <w>roboelectric</w>
       <w>rozman</w>
+      <w>sbat</w>
+      <w>setupwizard</w>
       <w>sgvs</w>
       <w>shortgramm</w>
       <w>sitechange</w>
+      <w>skippable</w>
       <w>smscommunicator</w>
       <w>sntp</w>
       <w>sooil</w>
       <w>soundid</w>
       <w>splitted</w>
       <w>ssid</w>
+      <w>statuslight</w>
+      <w>statuslights</w>
       <w>superbolus</w>
       <w>targethigh</w>
       <w>targetlow</w>
@@ -119,6 +151,7 @@
       <w>totp</w>
       <w>tunedays</w>
       <w>uart</w>
+      <w>unfinshed</w>
       <w>urgentalarm</w>
       <w>wizzardpage</w>
       <w>xdrip</w>

.run/Run all tests.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run all tests" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="testFullDebugUnitTest" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xmx6g -XX:+UseParallelGC" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <ForceTestExec>false</ForceTestExec>
+    <method v="2" />
+  </configuration>
+</component>

CONTRIBUTING.md

@@ -1,15 +1,15 @@
 This document speciffy hints and good practices for source code contributions.
 
-AndroidAPS is community effort and all contributions are welcome! If you wish help us improving AndroidAPS - please read and try to adhere to 
+AndroidAPS is community effort and all contributions are welcome! If you wish help us improving AAPS - please read and try to adhere to 
 this guidelines, to make the development and process of change aproval as smooth as possible :) 
 
 General rules
 =============
 
 * There are plenty of ways you can help, some of them are listed on wiki: 
-  https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/How-can-I-help.html
+  https://wiki.aaps.app/en/latest/Getting-Started/How-can-I-help.html
 * If you wish to help with documentation or translating: 
-  https://androidaps.readthedocs.io/en/latest/EN/translations.html
+  https://wiki.aaps.app/en/latest/translations.html
   
 Development guidelines
 ======================
@@ -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

ISSUE_TEMPLATE.md

@@ -6,5 +6,5 @@ Reporting bugs
   upper-right corner).
 - Obtain the app's log files, which can be found on the phone in
   _/storage/emulated/0/Android/data/info.nightscout.androidaps/_
-  See https://androidaps.readthedocs.io/en/latest/EN/Usage/Accessing-logfiles.html
+  See https://wiki.aaps.app/en/latest/Usage/Accessing-logfiles.html
 - Open an issue at https://github.com/nightscout/AndroidAPS/issues/new

README.md

@@ -1,18 +1,17 @@
-# AndroidAPS
+# AAPS
-* Check the wiki: https://androidaps.readthedocs.io
+* Check the wiki: https://wiki.aaps.app
-*  Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping  https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1
+*  Everyone who’s been looping with AAPS needs to fill out the form after 3 days of looping  https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1
 
 [![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/4fQUWHZ4Mw)
 
 [![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/androidaps/localized.svg)](https://translations.androidaps.org/project/androidaps)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/androidaps/localized.svg)](https://translations.aaps.app/project/androidaps)
-[![Documentation Status](https://readthedocs.org/projects/androidaps/badge/?version=latest)](https://androidaps.readthedocs.io/en/latest/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/androidaps/badge/?version=latest)](https://wiki.aaps.app/en/latest/?badge=latest)
-[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/master/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/master/graph/badge.svg?token=EmklfIV6bH)](https://codecov.io/gh/nightscout/AndroidAPS)
 
 DEV: 
 [![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/dev.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/dev)
-[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/dev/graph/badge.svg?token=EmklfIV6bH)](https://codecov.io/gh/nightscout/AndroidAPS/tree/dev)
-
 
 <img src="https://cdn.iconscout.com/icon/free/png-256/bitcoin-384-920569.png" srcset="https://cdn.iconscout.com/icon/free/png-512/bitcoin-384-920569.png 2x" alt="Bitcoin Icon" width="100">
 

_docs/icons/HourHand.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="Hour_hand">
+	<path fill="#FFFFFF" d="M11.999,4.906c-0.104,0-0.188,0.084-0.188,0.188V12c0,0.104,0.084,0.188,0.188,0.188
+		c0.104,0,0.188-0.084,0.188-0.188V5.094C12.186,4.99,12.102,4.906,11.999,4.906z M11.999,12.094c-0.047,0-0.086-0.038-0.086-0.086
+		s0.039-0.086,0.086-0.086c0.047,0,0.086,0.038,0.086,0.086S12.046,12.094,11.999,12.094z"/>
+</g>
+</svg>

_docs/icons/MinuteHand.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="Minute_hend">
+	<path fill="#FFFFFF" d="M11.999,1.406c-0.104,0-0.188,0.084-0.188,0.188V12c0,0.104,0.084,0.188,0.188,0.188
+		c0.104,0,0.188-0.084,0.188-0.188V1.594C12.186,1.49,12.102,1.406,11.999,1.406z M11.999,12.094c-0.047,0-0.086-0.038-0.086-0.086
+		s0.039-0.086,0.086-0.086c0.047,0,0.086,0.038,0.086,0.086S12.046,12.094,11.999,12.094z"/>
+</g>
+</svg>

_docs/icons/SecondHand.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="Second_hand">
+	<path fill="#FF1313" d="M12.198,11.462v-0.237c0-0.077-0.05-0.131-0.114-0.164V0.508c0-0.047-0.038-0.086-0.086-0.086
+		c-0.047,0-0.086,0.038-0.086,0.086v10.553c-0.063,0.033-0.114,0.087-0.114,0.164v0.238c-0.219,0.082-0.376,0.29-0.376,0.537
+		s0.157,0.455,0.376,0.537v0.92c0,0.11,0.089,0.2,0.2,0.2s0.2-0.089,0.2-0.2v-0.919c0.221-0.081,0.381-0.289,0.381-0.538
+		S12.419,11.543,12.198,11.462z M11.999,12.094c-0.047,0-0.086-0.038-0.086-0.086s0.039-0.086,0.086-0.086
+		c0.047,0,0.086,0.038,0.086,0.086S12.046,12.094,11.999,12.094z"/>
+</g>
+</svg>

_docs/icons/SimplifiedDial.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="Simplified_dial">
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="11.999" y1="0.008" x2="11.999" y2="2.708"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="11.999" y1="21.307" x2="11.999" y2="24.008"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="23.999" y1="12" x2="21.298" y2="12"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="2.699" y1="12" x2="-0.001" y2="12"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="5.999" y1="1.616" x2="7.349" y2="3.954"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="16.648" y1="20.061" x2="17.999" y2="22.4"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="22.387" y1="6.001" x2="20.048" y2="7.351"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="3.941" y1="16.651" x2="1.602" y2="18.001"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="1.606" y1="6.008" x2="3.945" y2="7.358"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="20.052" y1="16.658" x2="22.391" y2="18.008"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="17.992" y1="1.612" x2="16.642" y2="3.95"/>
+	<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.1417" stroke-miterlimit="10" x1="7.342" y1="20.057" x2="5.992" y2="22.396"/>
+</g>
+</svg>

_docs/icons/background.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="Background">
+	<rect x="0.103" width="24" height="24"/>
+</g>
+</svg>