Commit graph

1117 commits

Author SHA1 Message Date
Milos Kozak
c9c02458d6 TT & GV new way of upload to NS 2021-03-27 23:14:51 +01:00
Philoul
b375ae45ae Improve Layout (avoid overlap between Action and Icon on low res screen) 2021-03-27 16:02:40 +01:00
Milos Kozak
ff001b0add remove MealLink.class 2021-03-25 23:52:08 +01:00
Philoul
b329971d9a Add Filter to hide Loop entries
I didn't find an easy way to filter with SQL query, so I filtered manually the list, probably not the best solution...
2021-03-25 23:47:03 +01:00
Milos Kozak
7f0fe881b6 DetailedBolusInfo, MealLink UI 2021-03-25 17:48:07 +01:00
Philoul
6e0d21a874 Add Source icon in UserEntryFragment, Update source in uel.log 2021-03-25 13:32:11 +01:00
Milos Kozak
a2fbab02f9 food -> Room 2021-03-19 18:49:34 +01:00
Philoul
d731762c70 Add optional condition in ValueWithUnit constructor and remove tests for uel.log 2021-03-13 12:15:21 +01:00
Philoul
dc010adf8c Improve UserEntryitem Layout 2021-03-09 23:02:31 +01:00
Philoul
f3787304f8 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_DevMerge
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
#	database/schemas/info.nightscout.androidaps.database.AppDatabase/4.json
2021-03-09 21:50:17 +01:00
Philoul
f3d6fff565 Add Export CSV in Maintenance Fragment 2021-03-08 21:42:16 +01:00
Milos Kozak
8db8edc3f6 Careportal -> Room 2021-03-08 20:10:02 +01:00
Philoul
f7f6f4b7c1 Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML 2021-03-08 18:22:50 +01:00
Philoul
816fd531a2 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits 2021-03-08 18:21:57 +01:00
Philoul
c259aa345c Csv format (not xml) modified to Excel default
remove unnecessary " and use ; as separator
2021-03-07 10:43:33 +01:00
Milos Kozak
021d70bbe6
Merge pull request #399 from Philoul/Fix_Carbs_Layout
Fix Carbs Layout
2021-03-07 00:58:23 +01:00
Philoul
177bf214fd xml export initialization 2021-03-06 16:14:44 +01:00
Philoul
db4268f408 UserEntry text format and colors.xml
ValueWithUnit Bold
Note standard grey color
Action Colored (table in UserEntryExt.kt)
2021-03-04 14:52:30 +01:00
Philoul
4ce59b929a Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-03-03 22:49:31 +01:00
Philoul
efa9e18f83 Constructor for formated Strings with param, add notes, convert to AAPS units in fragment 2021-03-02 22:43:18 +01:00
Philoul
f226a03c83 Fix Converters.kt
Initialize a first version of Layout with Card and TreamentsUserEntryFragment
2021-03-02 13:31:07 +01:00
Milos Kozak
3b5b945fea TemporaryTarget -> room database 2021-03-01 12:42:42 +01:00
Philoul
21784920de Fix witdth of Carbs Layout 2021-02-28 23:20:37 +01:00
Milos Kozak
07bf16b07b rename core strings 2021-02-22 18:04:30 +01:00
Milos Kozak
a0632f7753 automation module 2021-02-22 17:22:30 +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
Milos Kozak
fe3c049999 Nitification store logging 2021-02-20 19:34:19 +01:00
AdrianLxM
0457c1bf70 fix tests and switch icon and checkbox 2021-02-16 19:03:38 +01:00
AdrianLxM
2f05c431aa layout CarbDialog alarm and use timer for automation alarms 2021-02-15 23:55:57 +01:00
AdrianLxM
b9bf699942 use system countdown for simple reminder all the time 2021-02-13 22:41:33 +01:00
AdrianLxM
8b24becac7 small cleanups carb timer 2021-02-13 21:51:37 +01:00
AdrianLxM
a15377b48d carb timer for carbs dialog 2021-02-13 21:45:14 +01:00
Milos Kozak
5a4a662ec1 Merge branch 'dev' into newdb 2021-02-11 21:55:47 +01:00
Milos Kozak
84a2c37055 unused code 2021-02-11 13:48:50 +01:00
Milos Kozak
7b4a30865a UserEntry logging 2021-02-09 17:57:28 +01:00
Milos Kozak
e16d661183 OverviewFragment -> jetpack 2021-02-04 12:03:34 +01:00
Milos Kozak
f5eba51d5a ActionsFragment -> jetpack 2021-02-04 10:06:19 +01:00
Milos Kozak
ee6cd22d24 MedtronicFragment -> jetpack 2021-02-03 23:02:14 +01:00
Milos Kozak
0054fce4d9 treatments UI cleanup 2021-02-03 22:40:13 +01:00
Milos Kozak
a6b7beb2d7 TreatmentsTemporaryBasalsFragment -> jetpack 2021-02-03 20:22:03 +01:00
Milos Kozak
327f1ca63b TreatmentsProfileSwitchFragment -> jetpack 2021-02-03 20:08:53 +01:00
Milos Kozak
8a15fe12ba TreatmentsBolusFragment -> jetpack 2021-02-03 16:04:09 +01:00
Milos Kozak
74ae51a9e0 TreatmentsFragment -> jetpack 2021-02-03 15:52:43 +01:00
Milos Kozak
fab3c870d7 BGSourceFragment -> jetpack 2021-02-03 15:43:47 +01:00
Milos Kozak
4476d0e0db TreatmentsCareportalFragmentBinding -> jetpack 2021-02-03 15:30:05 +01:00
Milos Kozak
61871a924b LocalProfileFragment -> jetpack 2021-02-02 21:53:57 +01:00
Milos Kozak
29e33a68c2 TreatmentsExtendedBolusesFragment -> jetpack 2021-02-02 21:38:22 +01:00
Milos Kozak
609c1dfad3 InsulinFragment -> jetpack 2021-02-02 21:11:40 +01:00
Milos Kozak
026d6039dc SmsCommunicatorOtpActivity -> jetpack 2021-02-02 21:04:44 +01:00
Milos Kozak
2e58bfc829 SmsCommunicatorOtpActivity -> jetpack 2021-02-02 20:48:03 +01:00
Milos Kozak
2078962057 SmsCommunicatorOtpActivity -> jetpack 2021-02-02 20:32:07 +01:00
Milos Kozak
e7d58a8f84 EditQuickWizardDialog -> jetpack #2 2021-02-02 20:25:15 +01:00
Milos Kozak
99185f3d1f EditQuickWizardDialog -> jetpack 2021-02-01 20:36:58 +01:00
Milos Kozak
f2e5ef76aa OverviewFragment simplify 2021-01-26 15:44:56 +01:00
Milos Kozak
a15522fd50 VirtualPumpFragment -> jetpack 2021-01-26 15:44:14 +01:00
Milos Kozak
aeec33eb9e FoodFragment -> jetpack 2021-01-25 11:35:36 +01:00
Milos Kozak
c3878de916 QuickWizardListActivity -> jetpack 2021-01-25 10:36:05 +01:00
Milos Kozak
7e0be475f8 ObjectivesExamDialog -> jetpack 2021-01-24 22:12:03 +01:00
Milos Kozak
55da01d4a9 ObjectivesFragment -> jetpack 2021-01-24 16:16:07 +01:00
Milos Kozak
fcf67cd014 ConfigBuilderFragment -> jetpack 2021-01-24 15:20:12 +01:00
Milos Kozak
95e97edc74 OpenAPSAMAFragment -> jetpack 2021-01-24 14:50:21 +01:00
Milos Kozak
21095233dc HistoryBrowseActivity -> jetpack 2021-01-24 14:44:11 +01:00
Milos Kozak
1294642feb LoopFragment -> jetpack 2021-01-24 14:19:25 +01:00
Milos Kozak
4e3506007f WearFragment, SkinInterface -> jetpack 2021-01-23 22:42:13 +01:00
Milos Kozak
36d3182b1b LogSettingActivity -> jetpack 2021-01-22 14:34:13 +01:00
Milos Kozak
a6449a7578 SurveyActivity -> jetpack 2021-01-22 14:23:49 +01:00
Milos Kozak
9409193935 -> jetpack 2021-01-22 14:20:56 +01:00
Milos Kozak
b9477eef16 ProfileHelperActivity -> jetpack 2021-01-22 14:16:59 +01:00
Milos Kozak
0c6cd4aa82 WizardInfoDialog -> jetpack 2021-01-21 20:54:13 +01:00
Milos Kozak
63d328b940 TreatmentDialog -> jetpack 2021-01-21 20:46:21 +01:00
Milos Kozak
4a2213d11e TempTargetDialog -> jetpack 2021-01-21 20:41:29 +01:00
Milos Kozak
19b82f2246 TempBasalDialog -> jetpack 2021-01-21 20:35:14 +01:00
Milos Kozak
b09a909d74 InsulinDialog -> jetpack 2021-01-21 20:31:20 +01:00
Milos Kozak
83c709e2bc FillDialog -> jetpack 2021-01-21 20:21:25 +01:00
Milos Kozak
f1f0703a88 ExtendedBolusDialog -> jetpack 2021-01-21 20:16:13 +01:00
Milos Kozak
d376ee2229 CareDialog -> jetpack 2021-01-21 17:21:29 +01:00
Milos Kozak
bcc573202c CarbsDialog -> jetpack 2021-01-21 17:03:05 +01:00
Milos Kozak
24eec08a35 CalibrationDialog -> jetpack 2021-01-21 16:45:54 +01:00
Milos Kozak
157642649e ProfileSwitchDialog -> jetpack 2021-01-21 16:38:42 +01:00
Milos Kozak
99bf1567e2 NSProfileFragment -> jetpack 2021-01-21 12:48:30 +01:00
Milos Kozak
65a39d91be refactor import/export to create DaggerAppCompatActivityWithResult 2021-01-18 17:36:18 +01:00
Milos Kozak
273b04f0e7
Merge pull request #183 from rICTx-T1D/rICTxT1D/Issue156
Fix for issue #156 (correct vertical alignment of label)
2021-01-07 10:27:17 +01:00
rICTx-T1D
16fc035873 #156 - vertical-centered label by using TableRow-method to prevent truncation of translation 2021-01-05 22:08:43 +01:00
Philoul
ab2a1ed1fa Layout improvement
datetime vertical centered for languages with "long translations"
Add marging for right icon of automation (too close to border)
2021-01-04 22:19:02 +01:00
rICTx-T1D
99803870c5 #156 - vertical-centered label 2021-01-04 20:57:23 +01:00
Milos Kozak
3e45ab5187 hide non NSClient controls by default 2021-01-03 19:12:59 +01:00
Philoul
d4d8a8962a Improve vertical alignement 2020-12-30 09:41:12 +01:00
Philoul
86410b786f Fix Checkbox in dialog_wizard 2020-12-29 23:08:37 +01:00
Milos Kozak
c8f7dae2c8 Bolus advisor 2020-12-28 16:42:00 +01:00
Philoul
08ab436d90 Add Closed / LGS / Open switching in Loop paragraph 2020-12-27 15:32:12 +01:00
Philoul
b4710b4936 Merge remote-tracking branch 'Nightscout/dev' into LoopDialog 2020-12-27 13:18:04 +01:00
Philoul
329e5af94f Update "Loop header" 2020-12-26 18:26:46 +01:00
Philoul
cefdaa471d Replace Loop Menu by Loop Dialog 2020-12-26 17:40:16 +01:00
Philoul
33e13748ca Merge remote-tracking branch 'Nightscout/dev' into IncreaseHeightUpperRows 2020-12-25 16:48:23 +01:00
Philoul
47fe4d83be First draft 2020-12-25 16:47:42 +01:00
Milos Kozak
3c32583d8c ProfileHelper layout buttons fix 2020-12-25 14:42:39 +01:00
Milos Kozak
68a7c70e23
Merge pull request #117 from Philoul/ShortClick
Short Click menu added in overview
2020-12-25 10:44:21 +01:00
Philoul
554b14e9ef Increase height of Compact Tab and Profile/TT row 2020-12-24 11:06:50 +01:00
Philoul
422c78d30f Minor Layout improvements (if long label used) 2020-12-23 22:42:21 +01:00
Philoul
f76c6a4910 Remove unused code 2020-12-23 21:46:15 +01:00
Philoul
87961430a2 Move buttons below Time (best place I think) 2020-12-23 19:55:35 +01:00
Philoul
c6e8f277c0 Manual button hidden, Cancel only if TT running, Spinner added
Long Click removed for Cancel and Spinner don't update values
2020-12-23 19:28:50 +01:00
Philoul
004328ffe6 Improve buttons size, padding and text size for long words 2020-12-22 10:27:38 +01:00
Philoul
ffb5a7cd4a Spinner removed and Confirm dialog if click on Cancel to Hypo buttons 2020-12-21 21:03:30 +01:00
Philoul
4338605571 Add label below icons 2020-12-21 15:20:35 +01:00
Philoul
1d1359dfd4 TT Dialog Add 5 buttons for quick selection of TempTarget 2020-12-20 19:54:54 +01:00
osodebailar
b9fe0b7fd7 remove header again 2020-12-18 22:36:23 +01:00
osodebailar
df8616e60b new nav header with plugin icons and extend colors for black and white transparence for future extensions 2020-12-17 13:59:06 +01:00
osodebailar
5be36199c8 adapt against old layout 2020-12-17 13:35:03 +01:00
osodebailar
39355a4b6f add configbuilder icons for all plugins. rearrange view 2020-12-17 12:07:34 +01:00
Milos Kozak
4d02587bb7 AutomationEvent new options, automation jetpack bindings 2020-12-14 12:46:38 +01:00
Milos Kozak
2c43bc75c0
Merge pull request #113 from Philoul/ProfileSwitch_Dialog
ProfileSwitch dialog Improvements
2020-12-11 21:35:29 +01:00
Milos Kozak
24034b46b8
Merge pull request #112 from Philoul/Overview_Info_Layout
Move Ago below Arrow
2020-12-11 21:15:58 +01:00
Philoul
72898cdb2a ProfileSwitch Dialog, move Duration selector between Reuse button and Percentage selector 2020-12-11 18:56:22 +01:00
Milos Kozak
989976f1e6
Merge pull request #105 from Philoul/TempTarget_Icons
New TempTarget icons
2020-12-11 14:20:40 +01:00
Philoul
5f7108317f Move Ago below Arrow 2020-12-11 10:23:04 +01:00
Philoul
7a87cfc7ee Delete Automation rule with button
onItemDismiss left but could be simplified
2020-12-09 21:58:55 +01:00
Philoul
096aa008bc New TempTarget icons
Refactor to delete redundant icons
2020-12-09 20:59:43 +01:00
Brian Quinion
66a651a062 Use TextInputEditText instead of TextView to preference filter 2020-12-08 23:29:20 +00:00
Milos Kozak
e100e5abae large bg delta in tablet mode 2020-12-07 22:42:04 +01:00
Milos Kozak
a5d9d25564
Merge pull request #98 from Rig22/pump_icons
SVG Icons for pumps fragment tab
2020-12-07 21:20:11 +01:00
osodebailar
634efad48f extend Plugin with icon resource for menue and config builder. Integrate plugin icon for pump selection into config builder 2020-12-07 18:51:16 +01:00
Milos Kozak
26834de458 remove unused resources 2020-12-06 17:32:08 +01:00
Rig22
cad1fd2788 SVG Icons for pumps fragment tab 2020-12-05 12:21:22 +01:00
Brian Quinion
33431bd5a8 Add a clear button for preference filter, clean up layout a little 2020-11-24 11:43:59 +00:00
Brian Quinion
eaba35c024 Add a text filter to the top of preferences 2020-11-24 00:50:09 +00:00
Milos Kozak
e1a1a4228d larger font in tabled landscape mode 2020-11-23 13:24:38 +01:00
Milos Kozak
b4fb6ebff9 get rid of tablet layout, allign NSClient layout with AAPS 2020-11-22 20:48:36 +01:00
Milos Kozak
6b629a1dda
Merge pull request #41 from Philoul/Action_CarePortalInfo
Level informations added in Action>Careportal
2020-11-08 17:47:14 +01:00
Philoul
fb95eb4f2f Add LowRes Layout for action tab and additional function in Skininterface 2020-10-26 22:55:22 +01:00
Philoul
405a5526ab Little more compact Low Res layout 2020-10-20 21:22:50 +02:00
Philoul
ee79588449 Add setting for shorten label on very low res 2020-10-19 22:14:28 +02:00
Milos Kozak
fe5cc3d334 layouts -> AppCompat 2020-10-19 19:24:33 +02:00
Philoul
a548b9c55c Try to Fix Linefeed in level values 2020-10-18 18:15:37 +02:00
Philoul
4dc042a772 Remove addition Layout and update to remove Level in NsClient Version 2020-10-18 16:52:05 +02:00
Philoul
9f0f2c2c2f Replace LinearLayout by TableLayout 2020-10-18 16:20:14 +02:00
Philoul
84c2e7e86e Update of layout for low res screen to avoid line feed in level values 2020-10-17 23:07:40 +02:00
Philoul
961ee4ccf4 Add Sensor Battery Level information
It works with xDrip and Miaomiao2, but today there is a bug in xDrip (xDrip sends Phone battery level and not Sensor Battery level...)
2020-10-17 22:22:09 +02:00
Philoul
bd3cba8a1a First version of Layout and interface 2020-10-17 11:00:38 +02:00
osodebailar
3694441e37 remove unused import in xml 2020-10-01 12:23:58 +02:00
osodebailar
009988a76c fix stray char and alignment 2020-10-01 12:21:57 +02:00
osodebailar
42e37710f2 fix bottom button and change layout again to fit better 2020-09-30 20:15:07 +02:00
osodebailar
8d93ab6e79 format changes 2020-09-30 09:06:49 +02:00
osodebailar
7b7a0e0d5e fix for small displays that cannot import settings due to scroll and display too large texts problem like Jelley 2020-09-30 08:58:03 +02:00
Dominik Dzienia
d150730212 Make need for additional PIN at end of security code (after OTP) more obvious
* change hint for code checking edit field to indicate need for PIN
* add additional text about how code is constructed from OTP token and PIN
* change PIN preference label - add that it is mandatory
* add "followed by PIN" to text sent via SMS
2020-09-09 11:53:39 +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
1e7a7a40bc
Merge pull request #2913 from AAPS-Omnipod/omnipod_eros_dev_merge_to_upstream
Omnipod updates
2020-08-22 19:34:05 +02:00
Milos Kozak
7b94b2fa21 fix nsclient layout 2020-08-22 17:49:10 +02:00
bartsopers
6c3e7a8f43
Merge pull request #143 from smuething/move-protection-to-core
Move protection to core
2020-08-18 20:00:57 +02:00