Commit graph

716 commits

Author SHA1 Message Date
jacques
a0aa8471c9 optimize import 2022-03-27 18:10:36 +02:00
jacques
891368f5d7 add 2 columns 2022-03-27 18:09:52 +02:00
jacques
7f89c9b5aa Create singleton to access to database 2022-03-27 18:09:19 +02:00
jacques
d6bd1590e8 change a method new;
use singleton for the database access.
2022-03-27 18:08:41 +02:00
jacques
dfaed88a56 New schema 2022-03-27 18:06:30 +02:00
jacques
de22e3e756 fixing debug code 2022-03-23 19:54:14 +01:00
jacques
2ed407ba9c MainActivity is a bad idea, but move preparation code in onStart()
Add understood dialog
Add check isScheduled in onPause()
2022-03-23 09:19:11 +01:00
jacques
3199a0abdc Add isScheduled method to avoid schedule notification on each onPause of DrugListActivity. 2022-03-23 09:16:47 +01:00
jacques
8879c6a2ce remove unused code 2022-03-23 09:15:38 +01:00
jacques
821b065397 Add strings for understood 2022-03-23 09:15:19 +01:00
jacques
f80bc97330 Add UnderStood prefs. 2022-03-23 09:14:54 +01:00
jacques
083954e709 Fix error found in code analysis 2022-03-23 09:14:18 +01:00
jacques
e279ef1191 Remove unnecessary cast and optimize import 2022-03-19 10:54:16 +01:00
jacques
df68ee96fe optimize import 2022-03-17 18:32:41 +01:00
jacques
b2f54a81c4 Use drugs tablename 2022-03-17 18:32:41 +01:00
jacques
7f43b84b2e Launch tutorial only in production release 2022-03-17 18:32:41 +01:00
jacques
a8377f6395 Fix typos 2022-03-17 18:32:41 +01:00
jacques
303f849f50 Change Medicine schema 2022-03-17 18:32:41 +01:00
jacques
5572cdcf67 remove TODO annotations 2022-03-17 18:32:41 +01:00
jacques
7b76992998 Refactoring using Medicine and Prescription Room Databases 2022-03-17 18:32:41 +01:00
jacques
a40dd5fe20 Add Medicine Room access 2022-03-17 18:32:41 +01:00
jacques
dcff425d9e add convert method between Medicine and Prescription 2022-03-17 18:32:41 +01:00
jacques
bb173ce762 rename Room Database 2022-03-17 18:32:41 +01:00
jacques
d36491fa9d schema json files 2022-03-17 18:32:41 +01:00
jacques
ad2d38538a remove old migrations json files 2022-03-17 18:32:40 +01:00
jacques
e1d2c197cc rename Medic in Prescription and refactor code 2022-03-17 18:32:40 +01:00
jacques
179175cccd update appcompat version 2022-03-17 18:32:40 +01:00
jacques
796472cd1f remove some warning after code analysis 2022-03-15 08:17:53 +01:00
jacques
62440f2439 optimize import 2022-03-14 10:41:38 +01:00
jacques
d8d4f4efff Merge branch 'feature/move2room' into develop 2022-03-14 10:20:27 +01:00
jacques
3754b3bb22 Fix for loop and small bug in onButtonClick 2022-03-14 10:19:55 +01:00
jacques
a3500635f3 Fix small bug. 2022-03-14 10:02:52 +01:00
jacques
b260220039 use correct filename 2022-03-13 19:51:26 +01:00
jacques
10f2bf2c34 Add old prescriptions database migration to room presciptions database
Fix some annoying warning about gradle 8.0
2022-03-13 19:50:18 +01:00
jacques
5d8d859d15 rename layout, names must content only [a-z][0-9] and underscore 2022-03-13 18:06:27 +01:00
jacques
6390b7977c change file names 2022-03-13 12:50:40 +01:00
jacques
9f816764b8 fix typos 2022-03-13 12:50:13 +01:00
jacques
d1e04bab7a Use modern call for resource 2022-03-13 12:49:46 +01:00
jacques
24ec947239 Change resource name 2022-03-13 12:49:06 +01:00
jacques
da79ff480e Optimize according to IDE 2022-03-13 12:47:52 +01:00
jacques
0304eb27b1 Renamed according to the java class
Do some cleaning
2022-03-13 12:47:10 +01:00
jacques
dc71f57a73 optimize import and clean dead code 2022-03-12 21:43:30 +01:00
jacques
2f2c31b1c9 Add Migration json 2022-03-12 21:43:02 +01:00
jacques
8257f5477a Use Medic instead of Drug 2022-03-12 21:32:57 +01:00
jacques
426092bbad Make DrugDetailActivity call more clear 2022-03-12 21:32:17 +01:00
jacques
9d19b6dec7 Use Float instead of Double
Make class serializable
2022-03-12 21:30:54 +01:00
jacques
af71f54796 Remove unuse query
optimize import
2022-03-12 21:29:26 +01:00
jacques
8728c79909 Migration use Double instead of Long
Migration use Float instead of Double
2022-03-12 21:28:11 +01:00
jacques
6bf1d82318 Add format string method 2022-03-12 21:18:44 +01:00
jacques
9fa217d587 Use new Medic object for both presciptions (the list of medications user take, and medications, the complete database;
Need a migration between version 1 an 2 of the database schema
2022-03-11 21:45:43 +01:00
jacques
74db60cfe7 Fix some typos 2022-03-11 10:14:44 +01:00
jacques
15b7c52b66 Add more cancel case in scan return 2022-03-11 10:14:28 +01:00
jacques
273ae8bdfe Start using zxing contract (a lot of work to do). 2022-03-11 10:13:00 +01:00
jacques
d2cea5600d Change compileSskVersion
Upgrade androidx.appcompat version
2022-03-11 10:04:53 +01:00
jacques
35085f19c7 Change insert to insertAll. 2022-03-08 19:48:47 +01:00
jacques
bbec058a6a Remove id form columns 2022-03-08 19:48:07 +01:00
jacques
14f481175b Minor change in calling Room 2022-03-08 19:47:27 +01:00
jacques
c43e5d1880 Add generated json database schema 2022-03-08 19:46:36 +01:00
jacques
be85f8c69d use correct import
use getters and setters
2022-03-07 22:10:20 +01:00
jacques
88c534e719 use correct import
add getters and setters
2022-03-07 22:09:23 +01:00
jacques
bed4186bc3 use correct import 2022-03-07 22:08:55 +01:00
jacques
615d2f1914 Update dependencies for room 2022-03-07 22:07:50 +01:00
Jacques Foucry
0681c63c8e Add demo code for room database amanagement 2022-03-07 18:19:57 +01:00
Jacques Foucry
a98601c8b0 Add Room prescription database amangement 2022-03-07 18:19:35 +01:00
Jacques Foucry
3e38c7223c Add Room dependencies 2022-03-07 18:18:55 +01:00
jacques
e657105e3a Don't use contract for DetailDrugActivity, code stil in project buit not used (see DrugDetailContract);
Add @SuppressWarnings("deprecation") in order to still use startActivityForResult without warning.
2022-03-06 10:52:27 +01:00
jacques
e98f07bac6 Minor changes 2022-03-06 10:49:16 +01:00
jacques
7de2982944 fix code style and comments 2022-03-06 10:48:51 +01:00
jacques
0b3a4c8a12 Added but not use; try to use contract, unsuccessfully. Keep fil just in casse 2022-03-06 10:48:05 +01:00
jacques
8fccb00f3a Some improvement after code Analysis 2022-03-04 11:46:06 +01:00
jacques
207179a5b1 Integrate PilldroidScanContract and deal with return to add medication 2022-03-04 11:45:36 +01:00
jacques
bf88d1e64f Some cleaning according to code analysis 2022-03-02 10:35:23 +01:00
jacques
f31a5a2550 Fix some typos 2022-03-01 20:43:55 +01:00
jacques
46811d4d71 Remove some warning 2022-03-01 20:33:34 +01:00
jacques
184e4abb57 Almost working scanContract with CustomScannerActivity and returnCode 2022-03-01 20:23:47 +01:00
jacques
c735b1b592 Add strings for cancelling barcode scan 2022-03-01 20:21:40 +01:00
Jacques Foucry
b3ec1ba492 New Test for contract 2022-02-28 20:42:29 +01:00
jacques
9815482244 back to almost working situation 2022-02-21 14:53:47 +01:00
Jacques Foucry
1efac31e54 try with scannerActivity override 2022-02-21 09:43:11 +01:00
jacques
09d73ba381 fix 2 typos 2022-02-19 20:22:17 +01:00
jacques
2f74bdbce2 Sebd returnCode with barcode informations 2022-02-19 12:21:24 +01:00
jacques
066fee7334 Receive correct returnCode 2022-02-19 12:19:27 +01:00
jacques
2a7856179c Add parseSetBarcodeActivity method 2022-02-19 12:18:00 +01:00
jacques
3fd04c7b21 WAdd barcodeValues 2022-02-17 11:29:51 +01:00
jacques
e1240db07b WIP: Add manualAddLaucher 2022-02-17 11:29:19 +01:00
jacques
e3b88a08cf Add mBarcodeLauncher 2022-02-17 11:27:59 +01:00
jacques
ad605609e6 Add parserbarcode 2022-02-17 11:26:43 +01:00
jacques
55c2b67f2e WIP: try to create custom scanActivity 2022-02-13 17:49:25 +01:00
Jacques Foucry
8ac3a79639 Remove Sentry.io 2022-02-10 22:10:53 +01:00
Jacques Foucry
1a34a015fa Update build.gradle 2022-02-10 22:10:53 +01:00
jacques
b0dc51dd60 Add scanOptions for QRCode light on dark background 2022-02-09 11:57:31 +01:00
jacques
94e625db26 Create a custom scanbarcode contract form xxing scanContract. Unsuccesfful. 2022-02-08 07:51:20 +01:00
jacques
4d365c5092 Try to use custom scan contrat from zxing library. No success. 2022-02-08 07:50:22 +01:00
jacques
e11e1c1b4a Optimize import 2022-02-08 07:48:12 +01:00
jacques
33b8a5834c Update dependencies 2022-02-08 07:47:07 +01:00
Jacques Foucry
d82c7a4e59 Test CustomScannerContract 2022-02-05 19:16:18 +01:00
jacques
e33297def4 Fix some typos 2022-01-31 17:50:26 +01:00
Jacques Foucry
f82eb2d210 Add more cancel case in scan return 2022-01-31 17:27:48 +01:00
jacques
bfed07d8c6 Start using zxing contract (a lot of work to do). 2022-01-31 11:29:58 +01:00
jacques
683dc81c04 Fix typo 2022-01-31 11:28:52 +01:00
jacques
5cc0483487 Change zxing call method using contract
Clean imports
2022-01-30 22:20:31 +01:00
jacques
062d3f960b Change compileSskVersion
Upgrade androidx.appcompat version
2022-01-30 22:19:33 +01:00
jacques
03ebce8cb8 Change onClick call 2022-01-30 22:17:56 +01:00
jacques
f40426235d Change versionCode 2022-01-28 16:47:55 +01:00
jacques
ca9c95c9e0 Add sentry.io call in case of exception 2022-01-28 16:47:23 +01:00
jacques
63eaca5683 Remove deprecated dexOptions
Add conditional depency for sentry.io
2022-01-28 15:52:55 +01:00
jacques
e87234a4c2 Remove unused code 2022-01-21 18:21:43 +01:00
jacques
b3245bbb04 Add deprecation comment for old code 2022-01-21 18:20:25 +01:00
jacques
489911bd95 Change About icon 2022-01-21 18:19:30 +01:00
jacques
cd10430643 Add new way to have fulle screen in Android 11 2022-01-20 19:45:28 +01:00
jacques
c4514e329f Update versionCode 2022-01-20 19:44:42 +01:00
jacques
942afaabda Downgrade versionCode and versionName 2022-01-18 21:46:56 +01:00
jacques
86daad92ab Change versionCode 2022-01-18 20:50:57 +01:00
jacques
62545a63e4 Change versionName once again 2022-01-17 14:09:11 +01:00
jacques
801198e1a8 Change versionName once again 2022-01-17 11:43:08 +01:00
jacques
b94c42994f Change versionName 2022-01-17 11:23:02 +01:00
jacques
ac15fae0f0 Change buildToolsVersion 2022-01-15 19:51:17 +01:00
jacques
de326ac7d2 Change JavaVersion 2022-01-14 22:28:19 +01:00
jacques
92de093c7c Change JAVA_VERSION and compileSdkVersion 2022-01-14 20:40:42 +01:00
jacques
5e43f7eaca Change versionName again 2022-01-14 11:00:22 +01:00
jacques
61a0172258 Change versionName 2022-01-14 10:48:55 +01:00
jacques
f32645b47c Revert "Add FastLane structure"
This reverts commit 810f8ec2
2022-01-13 17:04:44 +01:00
jacques
810f8ec224 Add FastLane structure 2022-01-13 16:56:28 +01:00
jacques
b17e55c6b5 Change gradle signingConfigs 2022-01-12 08:17:10 +01:00
jacques
24f8730729 Simply versioncode and versionname 2022-01-10 18:39:04 +01:00
jacques
cb77b38b82 Change signinConfig behavior 2022-01-01 18:47:19 +01:00
jacques
9dc8fe4154 Add to .gitignore 2022-01-01 18:46:49 +01:00
jacques
d04e132f6b Change versionPathc value by day date 2021-12-30 18:34:24 +01:00
jacques
fe99a52911 Add not intrepreted sting 2021-12-29 21:05:44 +01:00
jacques
13140d44a7 Add code_39 barcode test
add default bahavior when barre code not readable
Move from if to swith
Add methode scanNotOk
2021-12-29 21:04:54 +01:00
jacques
5eb5ea32d6 Add cip7 to drug
add getCIP13FromCIP7 method
2021-12-29 21:02:22 +01:00
jacques
d581492ee6 Minor change in date formet 2021-12-28 15:10:36 +01:00
jacques
b6d0322acd Add drug comparaison between the original drug and the saved one. 2021-12-28 15:09:52 +01:00
jacques
592079bd01 Change prise by take
add equals override to compare too drugs objects.
2021-12-28 15:08:07 +01:00
jacques
5a28a9748d Add human readable log 2021-12-28 15:06:11 +01:00
jacques
14fa50b395 Change pendingIntent flag according to IDE suggestion 2021-12-28 15:03:38 +01:00
jacques
03d183f079 Change versionPatch 2021-12-04 21:19:30 +01:00
jacques
8ddbf6031d Change versionPatch 2021-12-04 21:15:17 +01:00
jacques
ac94daf0e6 new Icon version 2021-12-04 21:08:29 +01:00
jacques
fffad74050 New Icon version 2021-12-04 21:03:55 +01:00
jacques
d5aba3ba3c fix typos
change textview size
2021-12-04 21:01:05 +01:00
jacques
d075385a3a fix typos
cahnge textview size
2021-12-03 22:16:13 +01:00
jacques
66ec0e0a9e Refactor tutorial slide with french text
Remove unnecessary ressources
2021-12-01 19:22:34 +01:00
jacques
3c6c3d84ea New version of the database 2021-11-21 13:55:56 +01:00
jacques
3a86d9cb19 change application icon in order to have the shadow. reoriented the pill too. 2021-11-20 11:08:28 +01:00
jacques
5712bc586d Remove app_name to be compliant with flavors 2021-11-20 10:45:03 +01:00
jacques
a7e6db6adf Add buildType and flavors 2021-11-20 10:44:01 +01:00
jacques
af50a1cc3d Change suggested by IDE 2021-11-20 10:43:02 +01:00
jacques
8c43dfd58f Add apk output 2021-11-20 10:42:28 +01:00
jacques
d2489d1f25 remove dead code
compliance with IDE suggestion
2021-11-07 22:18:21 +01:00
jacques
682af77f97 Add If Build.Config tests
remove dead code
2021-11-07 22:17:10 +01:00
jacques
6f5cba6d84 Add string for screen readers 2021-11-07 16:35:44 +01:00
jacques
61bc2399c1 Change some attributes for the save button 2021-11-07 16:35:05 +01:00
jacques
2cfd1b13ab new icon files 2021-10-16 08:40:15 +02:00
jacques
7de52268fd Upgrade gradle 2021-10-16 08:39:47 +02:00
jacques
e35234eda1 Replace save button and fix typo in file name 2021-10-05 12:23:04 +02:00
jacques
6640727a05 Add security in Manifest 2021-10-04 17:24:05 +02:00
jacques
3eee70cc13 New icons files 2021-10-04 16:27:21 +02:00
jacques
0861271b7d Change version string 2021-10-03 17:43:51 +02:00
jacques
0c39d2ec80 Add correct icon (hopefully) and use it on AndroidManifest.xml 2021-10-03 17:43:17 +02:00
jacques
9665e21df8 Add removing Log.x statement (not yet used) 2021-10-03 13:57:42 +02:00
jacques
4431622534 Update gradle script 2021-10-03 13:57:11 +02:00
jacques
49352fadd1 Add BuildConfig.DEBUG if statement on debug toast 2021-10-03 13:56:04 +02:00
jacques
f364890d02 Remove dead code 2021-10-03 13:54:29 +02:00
jacques
60792d1b4b remove cip13 in DrugListActivityist 2021-09-17 14:42:16 +02:00
jacques
ad5c798857 Move save icon in detailView 2021-09-17 14:41:03 +02:00
jacques
934d6ae67b Add EAN_13 case 2021-08-09 16:20:42 +02:00
jacques
3934f64106 Change version number 2021-07-09 11:52:39 +02:00
jacques
99436ae75e fix typo 2021-07-09 11:38:39 +02:00
jacques
e50102067a Remove duplicate depencie
Update build tool version
2021-07-09 11:38:22 +02:00
jacques
7600596fb7 Downgrade appcompat to 1.2.0 in order to eliministe startActivityForResult depreated issue
upgrade other dependencies
2021-07-09 11:21:34 +02:00
jacques
2ce346a276 Optimize import;
Add sentry import;
Keep test code commented.
2021-07-09 11:19:31 +02:00
jacques
fd25a41a11 Optimize import 2021-07-09 11:18:13 +02:00
jacques
fc70f4b96b Add todo comment for deprecated code. 2021-07-04 22:22:24 +02:00
jacques
d0f6f5b1dd Change take loop 2021-07-04 22:22:23 +02:00
jacques
4486b45bd9 fix typo 2021-06-26 17:51:05 +02:00
jacques
7d3cdee933 fix typo 2021-06-26 17:50:22 +02:00
jacques
4696132ca3 fix typo 2021-06-26 17:19:37 +02:00
jacques
88b849b3b5 Comment log. 2021-06-18 20:11:12 +02:00
jacques
e895693c66 change import 2021-06-18 20:10:36 +02:00
jacques
ed6052ba1b Cosmetic change in the code 2021-06-18 20:10:07 +02:00
jacques
be9fc0a358 Upgrade gradle file 2021-06-18 20:07:24 +02:00
jacques
6fa451b2ea Add sentry framework 2021-06-18 20:06:17 +02:00
jacques
1112355230 Change test getStock vs alertThereshold
Add calling application from notification (not yet tested)
Change scheduleAlarm time
2021-06-18 20:04:39 +02:00
jacques
358212bac0 Change test getStock vs alertThereshold
Add calling application from notification (not yet tested)
Change scheduleAlarm time
2021-06-18 20:04:00 +02:00
jacques
8a205163b4 Fix therehold not save bug 2021-05-16 19:54:50 +02:00
jacques
4b4d15c9fc Minor change in colors 2021-05-16 13:15:19 +02:00
jacques
8414bfb948 Change version of recyclerView dependency
Change app version
2021-05-13 17:30:08 +02:00
jacques
e0af464a87 Remove some debug log 2021-05-13 17:29:05 +02:00
jacques
6964516e56 Make change for a test release for Erwan
Change the drugs database.
2021-05-11 17:01:40 +02:00
jacques
8c8b732fbe Remove dead code;
change BOOT_COMPLETEED test
Add debug code
2021-05-08 22:31:37 +02:00
jacques
90f89caae5 Fixing typos 2021-05-07 22:13:10 +02:00
jacques
24bf0c7874 Minor change but this code is not used any more.
TODO:remove it
2021-05-07 22:12:55 +02:00
jacques
dd47fcb42a Add permission to use alarmManager;
comment joservice
2021-05-07 22:12:10 +02:00
jacques
9f84a7d1f5 Move scheduleAlarm in AlarmReceiver and call it from onPause.
Add the way to launch alarmManager at bootime
2021-05-07 22:10:26 +02:00
jacques
87998345eb Fix debug error 2021-04-18 18:47:38 +02:00
jacques
15c4f7c956 Refactor for internationalisation of source code 2021-04-18 18:39:55 +02:00
jacques
2a22187ca3 Refactor for internalization 2021-04-12 21:11:50 +02:00
jacques
5cbc80df30 Gradle update 2021-04-09 20:32:43 +02:00
jacques
1b692135a6 First outside release 2021-04-06 17:35:38 +02:00