Commit graph

705 commits

Author SHA1 Message Date
Milos Kozak 929e3a9c7f Merge branch 'master' into dev 2022-05-02 18:28:54 +02:00
Milos Kozak 219bdba215 RS: Fix pumpcontrol 2022-05-02 18:03:52 +02:00
Milos Kozak 7e1988b2bc 3.0.0.1-dev-i 2022-04-04 22:05:03 +02:00
Milos Kozak 8b6bd17df5 eliminate flatDirs warning 2022-04-04 12:06:30 +02:00
Milos Kozak bc9ca2cf2d
Update build.gradle
3.0.0.1-dev-h
2022-03-26 22:27:20 +01:00
Milos Kozak 3fe1d2a0d1 3.0.0.1-dev-g 2022-03-17 22:16:53 +01:00
Milos Kozak b511cc147f
3.0.0.1-dev-f 2022-03-14 12:50:35 +01:00
jungsomyeong 7934851bf6 Eliminate warnings and fix bug 2022-03-04 17:46:56 +09:00
Milos Kozak 80a1e77017
3.0.0.1-dev-e 2022-03-02 23:51:51 +01:00
Milos Kozak 17fbd3f92f
3.0.0.1-dev-d 2022-03-01 09:07:31 +01:00
Milos Kozak 76f3e3e489 3.0.0.1-dev-c 2022-02-26 13:50:10 +01:00
Milos Kozak e924c28542 Material style for app 2022-02-23 19:05:55 +01:00
Milos Kozak 0aa34a3fb4 3.0.0.1-dev-a 2022-02-17 22:16:10 +01:00
Milos Kozak 070e95ef62 remove unused changes 2022-02-11 14:47:44 +01:00
Milos Kozak febe64b3c6
Merge branch 'dev' into eopatch2 2022-02-11 09:30:41 +01:00
jungsomyeong cfaf9f228e EOPatch2 support 2022-02-11 13:58:07 +09:00
Milos Kozak 668a5bbdb9 unify version naming 2022-02-10 17:13:42 +01:00
Milos Kozak 53ee64f6e1 bump 3.0.0.1 2022-02-01 18:49:39 +01:00
Milos Kozak 91ce436dcc AndroidAPS 3.0.0 2022-01-31 20:56:32 +01:00
Milos Kozak 061a39b271
2.8.2.20-dev 2022-01-16 22:07:46 +01:00
Milos Kozak 8c06d860e9 2.8.2.19-dev 2022-01-06 18:14:37 +01:00
Milos Kozak 1233f7003e 2.8.2.18-dev 2021-12-14 22:47:21 +01:00
Milos Kozak e58f31f7e2 2.8.2.17-dev 2021-12-13 01:01:47 +01:00
Milos Kozak a779ee74d8 2.8.2.16-dev 2021-12-12 13:34:36 +01:00
Milos Kozak d5c09cd535 2.8.2.15-dev 2021-12-11 11:46:58 +01:00
Milos Kozak 0a25fa3c9a share code between aap and wear 2021-12-10 08:58:23 +01:00
Milos Kozak a458ad5fd3 2.8.2.14-dev 2021-11-30 10:48:07 +01:00
Milos Kozak b38588cc8f 2.8.2.13-dev 2021-11-21 10:58:55 +01:00
Milos Kozak 8e527a9635 2.8.2.12-dev 2021-11-19 15:29:41 +01:00
Milos Kozak 0104e53632 2.8.2.11-dev 2021-11-16 17:10:49 +01:00
Milos Kozak c419c1f1e4 2.8.2.10-dev 2021-11-08 17:20:29 +01:00
Milos Kozak aea868ac6e 2.8.2.9-dev 2021-11-02 15:43:53 +01:00
Milos Kozak 1670840dfb 2.8.2.8-dev 2021-10-28 21:04:59 +02:00
Milos Kozak fb49c93104 2.8.2.7-dev 2021-10-19 21:34:16 +02:00
Milos Kozak a9f2b1c14a 2.8.2.6-dev 2021-10-17 19:13:10 +02:00
Milos Kozak c0f911ad14 minSdkVersion 28 2021-10-05 21:43:23 +02:00
Milos Kozak b55df715e6 2.8.2.4-dev 2021-10-05 11:37:29 +02:00
Milos Kozak 2c177b38bf 2.8.2.3-dev 2021-09-19 10:07:38 +02:00
TebbeUbben dbf1772397 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
 Conflicts:
	build.gradle
2021-08-20 19:42:59 +02:00
TebbeUbben 3aadb92250 Update Open Humans uploader for new database 2021-08-20 19:37:38 +02:00
Milos Kozak 4761a1a5ba kotlin-allopen, fixed tests 2021-08-16 13:47:14 +02:00
AdrianLxM a6fc9fee0f update jacoco and add global config 2021-07-09 20:02:22 +02:00
Milos Kozak 7bb03c4c13
Merge pull request #580 from nightscout/diaconn
Diaconn
2021-06-24 19:34:22 +02:00
Milos Kozak 33047e478d 2.8.2.2-dev 2021-06-23 22:43:18 +02:00
Milos Kozak 8e466be92c Diaconn support 2021-06-08 23:27:14 +02:00
Andy Rozman 766b2b4bea - changes after comments 2021-05-26 20:16:17 +01:00
Andy Rozman b40f8b79d1 - reverted change to remove check 2021-05-26 16:04:47 +01:00
Andy Rozman 029eb55f0e - changes according to comment in PR
- moved files from core to pump-common (which we could without major changes)
- removed DbObjectBase, and removed its deps in files (3)
- changed id for rileylink project (was the same as for pump-common)
2021-05-26 13:14:17 +01:00
Andy Rozman e24af3934f - refactorings kotlin !!
- moved 2 filed into pump-common module (newly created)
2021-05-24 16:57:54 +01:00
Andy Rozman 561d255c34 - removed mdt tag from branch 2021-05-22 10:46:13 +01:00
Andy Rozman 4dcc8dc46f - removed dropbox files 2021-05-22 10:26:32 +01:00
Andy Rozman 7738520a2d - dropbox dep 2021-05-05 16:58:37 +01:00
Andy Rozman 6b7efdcb95 - more kotlinize, MedtronicHistoryActivity not yet working 2021-04-20 16:45:29 +01:00
Milos Kozak e643399987 2.8.2.1-dev-e3 2021-04-13 18:36:15 +02:00
Milos Kozak 7b4ebbd440 2.8.2.1-dev-e2 2021-04-05 23:26:13 +02:00
Milos Kozak 7f0fe881b6 DetailedBolusInfo, MealLink UI 2021-03-25 17:48:07 +01:00
Milos Kozak 69f8195bbe 2.8.2.1-dev-e 2021-03-20 23:17:05 +01:00
Milos Kozak 8db8edc3f6 Careportal -> Room 2021-03-08 20:10:02 +01:00
Milos Kozak 658f565cf2 Notofocation -> kt 2021-03-07 17:46:21 +01:00
Milos Kozak 56daa82735 bump 2.8.2.1-dev-c 2021-03-01 23:39:34 +01:00
Milos Kozak 2fc3799153 use DateTime instead of Calendar 2021-02-24 09:49:02 +01:00
Milos Kozak aaa1ecea8d
Merge pull request #364 from bartsopers/dash
More Omnipod Dash preparation + some Eros fixes
2021-02-22 17:33:13 +01:00
Milos Kozak a0632f7753 automation module 2021-02-22 17:22:30 +01:00
Bart Sopers f52b11c78e Merge remote-tracking branch 'upstream/dev' into dash 2021-02-22 12:04:35 +01:00
Milos Kozak 0322dd48ac insight -> lib 2021-02-21 18:03:26 +01:00
Milos Kozak 32873e0730 combo -> new lib 2021-02-21 14:34:31 +01:00
Bart Sopers b56a3d8132 Merge remote-tracking branch 'upstream/dev' into dash 2021-02-20 18:48:06 +01:00
Milos Kozak 58f69dae6e cleanup native libs 2021-02-19 01:22:34 +01:00
Bart Sopers 2a38578439 Add empty omnipod-common module 2021-02-18 23:31:31 +01:00
Milos Kozak 94a7e708e3 simplify gradle files 2021-02-18 22:33:14 +01:00
Milos Kozak 6022bf8fb2 add jacoco to dana modules 2021-02-18 18:54:01 +01:00
Milos Kozak 73da2a1a3f add jacoco to core 2021-02-18 08:15:42 +01:00
Milos Kozak 1e95be1f34 jacoco.includeNoLocationClasses 2021-02-18 00:04:44 +01:00
Milos Kozak cae9588950 2.8.2.1-dev-b 2021-02-17 11:56:49 +01:00
AdrianLxM 7c8caa659b remove crashing library 2021-02-13 19:19:14 +01:00
Milos Kozak d1ba6dda73 2.8.2.1-dev-a 2021-02-11 23:57:11 +01:00
Milos Kozak d1a647830f update mockito 2021-02-11 23:33:22 +01:00
Milos Kozak 341bfdcdfa test libs update 2021-02-11 20:52:57 +01:00
Milos Kozak 7506c7e2ab remove findbug 2021-02-11 18:10:14 +01:00
Bart Sopers 1a866e970f Variable version in Omnipod Eros and Omnipod Dash build.gradle 2021-02-11 11:24:31 +01:00
Bart Sopers 91d0479cce Merge remote-tracking branch 'upstream/dev' into dash 2021-02-11 10:49:05 +01:00
AdrianLxM 5acdac3dc8 move jcenter to mavencentral, inline some dependencies, restrict jcenter to those we can be certain to update 2021-02-10 23:33:32 +01:00
Bart Sopers 43409eb864 Add empty Omnipod Dash module 2021-02-09 21:21:30 +01:00
Bart Sopers 8224f141ba Rename module omnipod to omnipod-eros 2021-02-09 19:37:27 +01:00
Milos Kozak b04862f602 database module 2021-02-04 18:22:58 +01:00
Milos Kozak 411fba5610 libs update 2021-02-04 12:57:35 +01:00
Milos Kozak d3310298b3 fix gradle dimension warning 2021-02-04 12:43:14 +01:00
Milos Kozak e16d661183 OverviewFragment -> jetpack 2021-02-04 12:03:34 +01:00
Milos Kozak 69554754b7 2.8.2.1-dev 2021-01-23 13:36:59 +01:00
Milos Kozak 62321c4e4a
bump 2.8.2 2021-01-23 11:53:50 +01:00
Milos Kozak 3f229dfa9b MainActivity -> jetpack 2021-01-22 11:34:28 +01:00
Milos Kozak 3682693c10 prevent NPE 2021-01-14 12:28:15 +01:00
Milos Kozak a3cbb663b9 2.8.1.1 2021-01-12 14:46:48 +01:00
Milos Kozak 4a5ef51d90 2.8.1.1-dev 2021-01-12 13:48:27 +01:00
Milos Kozak 414e2337ae
2.8.1 2021-01-10 22:39:20 +01:00
Milos Kozak 48084ff7bf add keys to crash report 2021-01-08 18:55:01 +01:00
Milos Kozak afb09418e5 2.8.0.1-dev 2021-01-02 11:43:44 +01:00
Milos Kozak f4c2ceffc2 minSdkVersion 26 - Android 8 2021-01-01 11:43:27 +01:00
Milos Kozak a8631866da 2.7.3-dev 2020-12-28 16:55:51 +01:00
Bart Sopers 4a33f877de Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-12-18 21:39:52 +01:00
Bart Sopers 6ac449d684 Fix subg_rfspy version check and add tests 2020-12-18 00:58:49 +01:00
Bart Sopers 55cc46c475 Revert "Update version for Omnipod"
This reverts commit 78616b1041.
2020-12-15 00:53:28 +01:00
Bart Sopers 78616b1041 Update version for Omnipod 2020-12-14 23:41:48 +01:00
Milos Kozak 4d02587bb7 AutomationEvent new options, automation jetpack bindings 2020-12-14 12:46:38 +01:00
Milos Kozak a87f879138 2.7.2-dev 2020-12-06 20:19:07 +01:00
Milos Kozak 2b0bfe0f7c upgrade libs 2020-11-30 08:54:47 +01:00
AdrianLxM 2f3406f6db move dependencies to core 2020-11-29 19:44:45 +01:00
Milos Kozak d6bc1ab400 2.7.1-dev 2020-11-12 15:26:26 +01:00
rICTx-T1D 84af1c963a
Merge branch 'dev' into rICTx-T1D_watchface01 2020-10-31 21:12:35 +01:00
Milos Kozak e46396c6d5 work libs update 2020-10-19 22:48:07 +02:00
Milos Kozak 7ac74f5a9e firebase libs update 2020-10-19 22:42:26 +02:00
Milos Kozak 955844f319 libs update 2020-10-19 21:51:13 +02:00
Bart Sopers 2e0161edf0 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2020-10-01 19:43:34 +02:00
Bart Sopers 8af6519687 Finish new Change Pod Wizard (and some other small changes) 2020-09-29 20:53:12 +02:00
Bart Sopers bc817d10f9 More WIP on new Omnipod wizard 2020-09-28 09:56:39 +02:00
Bart Sopers 779124f8b9 WIP on adding navigation between Omnipod fragments in replace Pod wizard 2020-09-26 20:01:09 +02:00
Bart Sopers ca4d809f41 WIP on adding navigation between Omnipod fragments in replace Pod wizard 2020-09-26 19:29:28 +02:00
Bart Sopers 168d3dee3a Change version 2020-09-25 20:18:49 +02:00
Bart Sopers 6e523066bb Merge remote-tracking branch 'upstream2/dev' into omnipod_eros_dev_upstream_merge 2020-09-25 16:33:32 +02:00
Bart Sopers 787fa0b305 Prepare Omnipod for upstream merge 2020-09-25 16:33:10 +02:00
Milos Kozak bc43a926f9
Merge pull request #4 from nightscout/dev
Build update
2020-09-25 09:06:19 +02:00
Dominik Dzienia e1e0244acf Ignore changes to codeStyles and stray files while ensuring build from master has no uncommited changes 2020-09-24 23:35:33 +02:00
Milos Kozak 089e22f9f1
2.7.0 2020-09-24 16:52:31 +02:00
Milos Kozak eb8203cba7 change test 2020-09-24 14:44:26 +02:00
Milos Kozak 8675db1039 2.7.0 2020-09-24 10:37:05 +02:00
Bart Sopers c7687aa6c7 Revert "Prepare Omnipod branch for upstream merge"
This reverts commit 02583c2612.
2020-09-13 18:51:10 +02:00
TebbeUbben 8171a94e0b Change app version code to dev 2020-09-04 21:07:19 +02:00
Geoffrey Hansen 2c2e01dee6 Merge remote-tracking branch 'origin/openhumans_old_db' into HEAD 2020-09-02 15:32:11 +02:00
Milos Kozak 984134ce58
2.7.0-rc5 2020-08-31 20:57:32 +02:00
Bart Sopers 7c82dbdf93 Prepare Omnipod for upstream merge 2020-08-22 11:06:33 +02:00
Bart Sopers 5973857c1d Remove duplicate version 2020-08-20 11:47:56 +02:00
Bart Sopers 7bc41b2281 Merge remote-tracking branch 'upstream/2.7.0-rc3' into omnipod_eros_dev_omnipod_module 2020-08-20 01:13:55 +02:00
Bart Sopers 2b10524217 Restore Omnipod wizard dependency in app/build.gradle 2020-08-17 22:56:01 +02:00
Bart Sopers b5c46e3bcf WIP on moving Omnipod to a separate module 2020-08-16 23:54:41 +02:00
Bart Sopers 17a2afb4b1 Update version in order to be able to distinguish in Firebase 2020-08-16 22:19:55 +02:00
Bart Sopers a3cb8ff648 Merge remote-tracking branch 'upstream/dev' into omnipod_eros_dev_merge_from_upstream 2020-08-16 12:37:28 +02:00
Milos Kozak a4b2ce32a5
2.7.0-rc3 2020-08-16 11:13:48 +02:00
Bart Sopers dd795463cf Update wizard pager dependency 2020-08-12 17:13:09 +02:00
Bart Sopers ef05654133 Update Wizardpager version in build.gradle 2020-08-11 21:04:58 +02:00
Andy Rozman ae86e7fc06 - change version 2020-08-11 00:40:26 +01:00
Andy Rozman 54d30cd8c4 - reverted some of my changes
- fixed problem that service doesn't start with AAPS, but with Tab click
2020-07-31 19:00:00 +01:00
Andy Rozman 20e2bf0b06 Merge branch 'dev' into medtronic_modules 2020-07-31 11:21:05 +01:00
Milos Kozak 3d7f2c5980 Gradle 6.1.1 2020-07-28 23:49:21 +02:00
Andy Rozman 996417bb47 Merge branch 'dev' into medtronic_modules 2020-07-25 00:44:09 +01:00
Dominik Dzienia 4068cd72ca Fix crash when preferences import list is opened for the second time (due to buggy implementation of ActivityResult and Contracts in early androidx)
* updated to newest version of fragments where bug is fixed
* catched exception and inform user with Toast
* refactor duplicated code in ImportExportPrefs
2020-07-23 12:59:42 +02:00
Andy Rozman 6e50c3651d Merge branch 'dev' into medtronic_modules 2020-07-12 20:21:03 +01:00
Andy Rozman ea80eb3c9b - created 2 modules: rileylink and medtronic
- refactored some classes
2020-07-12 20:15:11 +01:00
Milos Kozak c45de9af11 update libs 2020-07-04 21:58:51 +02:00
Milos Kozak 0e624a803f bump 2.6.7-dev 2020-06-11 23:20:36 +02:00
Milos Kozak 09de329934 libs update & cleanup 2020-05-31 11:27:12 +02:00