Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shortcuts - refactoring and add new functionalities #177

Draft
wants to merge 35 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
aa8ae7b
Shortcuts - refactoring and add new functionalities
avouspierre Apr 25, 2024
faa349d
TempTarget Shortcut fix for unit (by @robert)
mountrcg May 5, 2024
7436329
update alive to dev
MikePlante1 May 13, 2024
1c01b11
update alive to dev (2)
MikePlante1 May 13, 2024
35bd5d2
harmonize Shortcut descriptions and text
mountrcg May 15, 2024
d74029d
fix function names and harmonize overrides
mountrcg May 15, 2024
54a974c
List Bolus short cut
mountrcg May 15, 2024
8f9fbd0
more text and reminder localization
mountrcg May 15, 2024
f23836c
Fix words and translations in shortcuts
avouspierre May 15, 2024
961612b
Fix to prompt input for bolusQuantity
aug0211 May 23, 2024
7faf40d
Merge branch 'alpha' into dev+shortcuts
Sjoerd-Bo3 Jun 9, 2024
fc3fa19
fix: changes from pr are addressed
Sjoerd-Bo3 Jun 13, 2024
23d23f2
Delete Trio.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sjoerd-Bo3 Jun 13, 2024
3dfed12
refactor: rename files
Sjoerd-Bo3 Jun 14, 2024
8dcd89a
Rename overridePresetEntity.swift to OverridePresetEntity.swift
Sjoerd-Bo3 Jun 14, 2024
f574b66
Rename carbPresetResult.swift to CarbPresetResult.swift
Sjoerd-Bo3 Jun 14, 2024
18853be
Rename tempPresetEntity.swift to TempPresetEntity.swift
Sjoerd-Bo3 Jun 14, 2024
55a2b94
Revert "Delete Trio.xcworkspace/xcshareddata/swiftpm/Package.resolved"
Sjoerd-Bo3 Jun 14, 2024
34adc91
revert change on package.resolved
Sjoerd-Bo3 Jun 14, 2024
9b60001
fix: gracefully unwrapping of id
Sjoerd-Bo3 Jun 14, 2024
fe41399
refactor: parameterizing function
Sjoerd-Bo3 Jun 14, 2024
ac92afb
fix: default glucosestring
Sjoerd-Bo3 Jun 14, 2024
0b972b6
refactor: remove postfix underscore - unneccesary
Sjoerd-Bo3 Jun 14, 2024
911d564
additional strigns for translation
Sjoerd-Bo3 Jun 14, 2024
4065a4c
refactor: removed spaces
Sjoerd-Bo3 Jun 14, 2024
60d36ea
refactor: rename noAllowed case to notAllowed
Sjoerd-Bo3 Jun 14, 2024
d0da3f3
refactor: rename bolusQ to BolusQuantity
Sjoerd-Bo3 Jun 14, 2024
bdf7779
updates all localizations shortcuts
avouspierre Jun 15, 2024
b843728
fix issue in unit for temptarget
avouspierre Jun 15, 2024
85e32c7
feat: cancel overrides/tt with name and error
Sjoerd-Bo3 Jun 16, 2024
d5f13b4
update translations in catalog
avouspierre Jun 18, 2024
f72f9cb
Fix shortcut override confirmation text
aug0211 Jul 7, 2024
f5915f5
Cleanup carb/fat/protein entry via shortcut
aug0211 Jul 7, 2024
6ce9fbe
Fix shortcut bolus safety guards
aug0211 Jul 7, 2024
90d62d2
Phrasing updates for shortcuts
aug0211 Jul 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 152 additions & 4 deletions FreeAPS.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
AppShortcuts.strings
avouspierre marked this conversation as resolved.
Show resolved Hide resolved
*/
/* --------- has to be redone after finalizing the shortcuts ----------------------- */
/* Trio Temporary Target shortcut*/
"Activate ${applicationName} temporary target" = "Activate ${applicationName} temporary target";

/* Trio Temporary Target shortcut Description */
"${applicationName} apply a temporary target" = "${applicationName} apply a temporary target";

/* Trio Status shortcut */
"List ${applicationName} state" = "List ${applicationName} state";

/* Trio Status shortcut Description*/
"${applicationName} state" = "${applicationName} state";

/* Trio Add carbs shortcut */
"Add carbs in ${applicationName}" = "Add carbs in ${applicationName}";

/* Trio Add carbs shortcut description */
"${applicationName} allows to add carbs" = "${applicationName} allows to add carbs";

/* Trio Add carbs shortcut description */
"${applicationName} allows to add carbs" = "${applicationName} allows to add carbs";

/* Trio Create and apply Temporary Target shortcut*/
"Create and apply a temporary target in ${applicationName}" = "Create and apply a temporary target in ${applicationName}";

/* Trio Create and apply Temporary Target description*/
"${applicationName} allows to create and apply a temporary target" = "${applicationName} allows to create and apply a temporary target";

/* Trio Temporary override shortcut*/
"Activate ${applicationName} temporary override" = "Activate ${applicationName} temporary override";

/* Trio Temporary override shortcut Description */
"${applicationName} apply a temporary override" = "${applicationName} apply a temporary override";
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
AppShortcuts.strings
FreeAPS

Created by Pierre LAGARDE on 22/04/2024.

*/
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
AppShortcuts.strings
*/
/* -------------------------------- */
/* Trio Temporary Target shortcut*/
"Activate ${applicationName} temporary target" = "Activer une cible temporaire à ${applicationName}";

/* Trio Temporary Target shortcut Description */
"${applicationName} apply a temporary target" = "${applicationName} permet d'appliquer une cible temporaire";

/* Trio Status shortcut */
"List ${applicationName} state" = "Lister les états de ${applicationName}";

/* Trio Status shortcut Description*/
"${applicationName} state" = "Etat de ${applicationName}";

/* Trio Add carbs shortcut */
"Add carbs in ${applicationName}" = "Ajouter des glucides à ${applicationName}";

/* Trio Add carbs shortcut description */
"${applicationName} allows to add carbs" = "${applicationName} permet d'ajouter des glucides";

/* Trio Create and apply Temporary Target shortcut*/
"Create and apply a temporary target in ${applicationName}" = "Définir et appliquer une cible temporaire à ${applicationName}";

/* Trio Create and apply Temporary Target description*/
"${applicationName} allows to create and apply a temporary target" = "${applicationName} permet de définir et appliquer une cible temporaire";

/* Trio Temporary override shortcut*/
"Activate ${applicationName} temporary override" = "Activer une surcharge temporaire à ${applicationName}";

/* Trio Temporary override shortcut Description */
"${applicationName} apply a temporary override" = "${applicationName} permet d'appliquer une surcharge temporaire";
Loading