From c3aba81cb213ef618387716f4d09cc811c08d7ef Mon Sep 17 00:00:00 2001 From: Paul Plant <37302780+paulplant@users.noreply.github.com> Date: Mon, 25 Apr 2022 18:45:56 +0200 Subject: [PATCH] add treatments screen improvements - use .decimalPad keyboard for insulin entries - change "New Entry" to "New Treatment" as the idea of a Treatment "Entry" is not intuitive to most users - minor IB layout changes to enable future new treatment types to fit easily --- xdrip/Storyboards/Base.lproj/Main.storyboard | 22 +++++++++---------- xdrip/Storyboards/ar.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/de.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/en.lproj/Treatments.strings | 2 +- xdrip/Storyboards/es.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/fi.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/fr.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/it.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/nl.lproj/Treatments.strings | 4 ++-- .../pl-PL.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/pt.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/ru.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/sl.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/sv.lproj/Treatments.strings | 4 ++-- xdrip/Storyboards/zh.lproj/Treatments.strings | 4 ++-- xdrip/Texts/TextsTreatmentsView.swift | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/xdrip/Storyboards/Base.lproj/Main.storyboard b/xdrip/Storyboards/Base.lproj/Main.storyboard index 11b8c498..a88c4b8f 100644 --- a/xdrip/Storyboards/Base.lproj/Main.storyboard +++ b/xdrip/Storyboards/Base.lproj/Main.storyboard @@ -1840,10 +1840,10 @@ - + - - + + @@ -1857,7 +1857,7 @@ - + @@ -1868,7 +1868,7 @@ - + - + - + - + - + @@ -1914,7 +1914,7 @@ - + @@ -1929,7 +1929,7 @@ - + diff --git a/xdrip/Storyboards/ar.lproj/Treatments.strings b/xdrip/Storyboards/ar.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/ar.lproj/Treatments.strings +++ b/xdrip/Storyboards/ar.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/de.lproj/Treatments.strings b/xdrip/Storyboards/de.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/de.lproj/Treatments.strings +++ b/xdrip/Storyboards/de.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/en.lproj/Treatments.strings b/xdrip/Storyboards/en.lproj/Treatments.strings index 1ab7c895..b40d6a0b 100644 --- a/xdrip/Storyboards/en.lproj/Treatments.strings +++ b/xdrip/Storyboards/en.lproj/Treatments.strings @@ -1,6 +1,6 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; diff --git a/xdrip/Storyboards/es.lproj/Treatments.strings b/xdrip/Storyboards/es.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/es.lproj/Treatments.strings +++ b/xdrip/Storyboards/es.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/fi.lproj/Treatments.strings b/xdrip/Storyboards/fi.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/fi.lproj/Treatments.strings +++ b/xdrip/Storyboards/fi.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/fr.lproj/Treatments.strings b/xdrip/Storyboards/fr.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/fr.lproj/Treatments.strings +++ b/xdrip/Storyboards/fr.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/it.lproj/Treatments.strings b/xdrip/Storyboards/it.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/it.lproj/Treatments.strings +++ b/xdrip/Storyboards/it.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/nl.lproj/Treatments.strings b/xdrip/Storyboards/nl.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/nl.lproj/Treatments.strings +++ b/xdrip/Storyboards/nl.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/pl-PL.lproj/Treatments.strings b/xdrip/Storyboards/pl-PL.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/pl-PL.lproj/Treatments.strings +++ b/xdrip/Storyboards/pl-PL.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/pt.lproj/Treatments.strings b/xdrip/Storyboards/pt.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/pt.lproj/Treatments.strings +++ b/xdrip/Storyboards/pt.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/ru.lproj/Treatments.strings b/xdrip/Storyboards/ru.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/ru.lproj/Treatments.strings +++ b/xdrip/Storyboards/ru.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/sl.lproj/Treatments.strings b/xdrip/Storyboards/sl.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/sl.lproj/Treatments.strings +++ b/xdrip/Storyboards/sl.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/sv.lproj/Treatments.strings b/xdrip/Storyboards/sv.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/sv.lproj/Treatments.strings +++ b/xdrip/Storyboards/sv.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Storyboards/zh.lproj/Treatments.strings b/xdrip/Storyboards/zh.lproj/Treatments.strings index 9422a503..3e62667d 100644 --- a/xdrip/Storyboards/zh.lproj/Treatments.strings +++ b/xdrip/Storyboards/zh.lproj/Treatments.strings @@ -4,7 +4,7 @@ "treatments_title" = "Treatments"; "treatments_new_button" = "New"; -"treatments_new_entry" = "New Entry"; +"treatments_new_entry" = "New Treatment"; "treatments_carbs_with_unit" = "Carbs (g):"; "treatments_insulin_with_unit" = "Insulin (U):"; "treatments_exercise_with_unit" = "Exercise (min):"; @@ -16,4 +16,4 @@ "treatments_exercise" = "Exercise"; "treatments_question_mark" = "?"; "treatments_success" = "Success"; -"treatments_sync_complete" = "Synchronization complete."; \ No newline at end of file +"treatments_sync_complete" = "Synchronization complete."; diff --git a/xdrip/Texts/TextsTreatmentsView.swift b/xdrip/Texts/TextsTreatmentsView.swift index 981c7234..282dc0b2 100644 --- a/xdrip/Texts/TextsTreatmentsView.swift +++ b/xdrip/Texts/TextsTreatmentsView.swift @@ -13,7 +13,7 @@ enum Texts_TreatmentsView { }() static let newEntryTitle:String = { - return NSLocalizedString("treatments_new_entry", tableName: filename, bundle: Bundle.main, value: "New Entry", comment: "New entry view title.") + return NSLocalizedString("treatments_new_entry", tableName: filename, bundle: Bundle.main, value: "New Treatment", comment: "New entry view title.") }() static let carbsWithUnit:String = {