Commit graph

712 commits

Author SHA1 Message Date
jacques
e1cfc2a375 Add newStock calculation forgot in previous versions 2022-07-14 13:23:32 +02:00
jacques
70ac8b3d1e Remove unused code. 2022-07-10 15:36:26 +02:00
jacques
83b3f856b3 Remove old input dialog 2022-07-10 15:36:26 +02:00
jacques
7a6dfe37c9 New cip13 dialog 2022-07-07 09:52:18 +02:00
jacques
bf3dee565b Update dependencies, see PR #14 2022-07-06 11:28:07 +02:00
jacques
0cc1ad0462 Change placeholder 2022-07-06 10:40:27 +02:00
jacques
e3dc893113 typo 2022-07-06 10:40:27 +02:00
jacques
e16b6c4208 Update versionCode and versionName 2022-07-04 11:44:29 +02:00
jacques
1779bd9de6 add files 2022-06-29 21:18:32 +02:00
jacques
4f56964a58 Readd @Notnull for primary keys 2022-06-29 20:28:20 +02:00
jacques
7e8ce3d5f6 Add signing config for release 2022-06-29 20:27:36 +02:00
jacques
96c1958d2d optimize import 2022-06-29 05:09:31 +02:00
jacques
5825556cbc refactoring and use Utils.sortPrescriptionList
add conditional debug code
2022-06-29 04:58:06 +02:00
jacques
8a218e7467 refactoring and use Utils.sortPrescriptionList 2022-06-29 04:57:26 +02:00
jacques
5110e6b9b8 Create sortPrescriptionList method 2022-06-29 04:56:26 +02:00
jacques
76639d0d82 Make clean after analyze 2022-06-29 04:55:42 +02:00
jacques
54d5abb541 Change iteraror to a for loop 2022-06-26 11:56:06 +02:00
jacques
ea3a4ae374 fix error in AlarmReciver, bug not fixed yet. 2022-06-23 13:33:04 +02:00
jacques
5f4a04fe85 fix error in iterator 2022-06-23 13:32:37 +02:00
jacques
80daeb0923 Add iterator in contructList to change list order (not yet tested) 2022-06-23 11:28:24 +02:00
jacques
c659146d67 Change column name in schema using autoMigration 2022-06-23 11:23:59 +02:00
Jean-Baptiste
962e860584
Fix app_name on values en/fr (#13)
* Fix string fr

* Fix string en

* Fix typos

Co-authored-by: Altonss <66519591+Altonss@users.noreply.github.com>

* Fix typos

Co-authored-by: Altonss <66519591+Altonss@users.noreply.github.com>

Co-authored-by: Altonss <66519591+Altonss@users.noreply.github.com>
2022-06-19 17:38:45 +02:00
jacques
e86d0189f9 Change versionCode and versionName 2022-06-11 10:07:23 +02:00
jacques
27e96e989e Optimization 2022-06-10 21:47:49 +02:00
jacques
49fbff9018 remove ChangeCompileSdk 2022-06-10 21:47:17 +02:00
jacques
d82b79437d remove android:fitsSystemWindows="true" 2022-06-10 21:46:23 +02:00
jacques
a4d2232b13 Merge branch 'feature/swip_to_remove' into develop 2022-06-10 21:12:45 +02:00
jacques
6b6da51894 Optimizations 2022-06-10 21:12:27 +02:00
jacques
e42626fbfa Optimizations 2022-06-10 21:01:04 +02:00
jacques
024b97751b Add swipoe Right to Left to remove from list and prescription database
Add swipe left to Right to edit prescription detail
2022-06-10 20:55:25 +02:00
jacques
38a6c47ef5 Add pen icon 2022-06-10 20:53:18 +02:00
jacques
5043cda0fd Find a calculation to have same icon size in both swipe direction 2022-06-08 19:01:24 +02:00
jacques
b2f1df6350 Add swipe with icon to delete medic from prescription. The database update is not yet coded 2022-06-08 11:29:43 +02:00
jacques
846f6ecbe9 Remove old comment 2022-06-08 11:28:17 +02:00
jacques
38ec2cb9eb Add undo and french translation 2022-06-08 11:27:57 +02:00
jacques
b78a4acc15 Add trash icon 2022-06-08 11:27:34 +02:00
jacques
097d27c1f3 Make save button more floating. Avoid screen rotation 2022-05-30 22:36:03 +02:00
jacques
d78c4f13ef Change SimpleItemRecyclerView into RecyclerView 2022-05-22 18:49:10 +02:00
Jean-Baptiste
54a79b2514
Update french translation (#9)
* Update metadata FR

* Fix typos

* Update strings FR

* Fix Readme

* Fix
2022-05-11 08:53:55 +02:00
jacques
b567b728ae Update versionName and versionCode 2022-05-07 17:41:38 +02:00
jacques
742d7cbe1f fix AlarmReceiver bug, was still using the hold that should be empty. Use now the room database management 2022-05-04 19:48:19 +02:00
jacques
bbc1f39ebe add comment to see where to change code 2022-05-01 07:05:40 +02:00
jacques
d64fb4d322 Change versionName and versionCode 2022-04-27 10:00:25 +02:00
jacques
ed3a30f360 Change versionName and versionCode 2022-04-24 16:24:08 +02:00
jacques
0289e4035f Moving the save button at the bottom of the page. 2022-03-27 21:48:00 +02:00
jacques
2ae75d2f5b add json schemas 2022-03-27 21:18:14 +02:00
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