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.

Sign up for GitHub

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

hugo/refactor/Refactor editProfilesLabel #682

Merged
merged 8 commits into from
Feb 15, 2024
Merged

hugo/refactor/Refactor editProfilesLabel #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec97f35
:recycle: (LekaApp): Refactor titles and texts
HPezz Feb 14, 2024
1b4a52e
:lipstick: (LekaApp): Change NoAccount SF symbol color
HPezz Feb 14, 2024
bde3029
:lipstick: (LekaApp): Add pencil on EditCaregiverLabel
HPezz Feb 14, 2024
85ac121
:lipstick: (LekaApp): Update Carereceiver View
HPezz Feb 14, 2024
3149dbe
:globe_with_meridians: (LekaApp): Add tracking localization
HPezz Feb 14, 2024
0e9fc2f
:children_crossing: (LekaApp): Improve caregiver profile edition, switch
ladislas Feb 15, 2024
b801abc
:recycle: (LekaApp): Rename Tracking/Monitoring by Users
ladislas Feb 15, 2024
0f267ed
:lipstick: (LekaApp): Edit user - remove name from title
ladislas Feb 15, 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
60 changes: 39 additions & 21 deletions Apps/LekaApp/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@
"en": {
"stringUnit": {
"state": "new",
"value": "Profil of "
"value": "Edit my profile"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Profil de "
"value": "Editer mon profil"
}
}
}
Expand Down Expand Up @@ -117,13 +117,13 @@
"en": {
"stringUnit": {
"state": "new",
"value": "Profil of "
"value": "Edit profil"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Profil de "
"value": "Editer le profil"
}
}
}
Expand Down Expand Up @@ -243,13 +243,13 @@
"en": {
"stringUnit": {
"state": "new",
"value": "A verification email has been sent.\nPlease check your inbox.\n\nWe will now guide you throught\nthe creation of your account\nand the different steps.\nReady?"
"value": "We will now guide you throught\nthe creation of your account\nand the different steps.\nReady?"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "L'email de v\u00e9rification a \u00e9t\u00e9 envoy\u00e9. Veuillez v\u00e9rifier votre bo\u00eete de r\u00e9ception.\u2028\u2028Nous allons maintenant vous guider\n\u00e0 travers la cr\u00e9ation de votre compte\net les diff\u00e9rentes \u00e9tapes.\nPr\u00eat(e)?"
"value": "Nous allons maintenant vous guider\n\u00e0 travers la cr\u00e9ation de votre compte\net les diff\u00e9rentes \u00e9tapes.\nPr\u00eat(e)?"
}
}
}
Expand Down Expand Up @@ -405,13 +405,13 @@
"en": {
"stringUnit": {
"state": "new",
"value": "You have completed process brilliantly:\n\n- Create your caregiver profile \u2705\n- Create your first care receiver profile \u2705\n\nYou can now discover the Leka App and dive deep in our educational content!"
"value": "You have just completed:\n\n\u2705 Your caregiver profile\n\u2705 Your first care receiver profile\n\nYou can now discover the Leka App and dive deep in our educational content!"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Vous avez brillamment compl\u00e9t\u00e9 le processus :\n\n- Cr\u00e9er votre profil d'accompagnant \u2705\n- Cr\u00e9er votre premier profil de personne accompagn\u00e9e \u2705\n\nVous pouvez maintenant d\u00e9couvrir l'appli Leka et approfondir notre contenu \u00e9ducatif !"
"value": "Vous venez de cr\u00e9er :\n\n\u2705 Un profil d'accompagnant\n\u2705 Un profil de personne accompagn\u00e9e \n\nVous pouvez maintenant d\u00e9couvrir l'appli Leka et approfondir notre contenu \u00e9ducatif !"
}
}
}
Expand Down Expand Up @@ -495,13 +495,13 @@
"en": {
"stringUnit": {
"state": "new",
"value": "What's your avatar ?"
"value": "Avatar choice"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Quel est ton avatar ?"
"value": "Choix de l'avatar"
}
}
}
Expand Down Expand Up @@ -693,13 +693,13 @@
"en": {
"stringUnit": {
"state": "new",
"value": "Name"
"value": "Username"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Nom"
"value": "Nom d'utilisateur"
}
}
}
Expand Down Expand Up @@ -765,13 +765,13 @@
"en": {
"stringUnit": {
"state": "new",
"value": "Care receivers list"
"value": "Care receivers"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Liste des personnes accompagn\u00e9es"
"value": "Personnes accompagn\u00e9es"
}
}
}
Expand Down Expand Up @@ -855,13 +855,13 @@
"en": {
"stringUnit": {
"state": "new",
"value": "Select your professions"
"value": "Profession choice"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "S\u00e9lectionnez vos professions"
"value": "Choix de(s) profession(s)"
}
}
}
Expand Down Expand Up @@ -897,7 +897,7 @@
"fr": {
"stringUnit": {
"state": "translated",
"value": "Le renfor\u00e7ateur est un effet lumineux r\u00e9p\u00e9titif du robot que vous pourrez actionner pour r\u00e9compenser le comportement de l'utilisateur. \u2028Si votre robot est connect\u00e9, vous pouvez tester les renfor\u00e7ateurs avant d'en choisir un."
"value": "Le renfor\u00e7ateur est un effet lumineux r\u00e9p\u00e9titif du robot que vous pourrez actionner pour r\u00e9compenser le comportement de l'utilisateur. Si votre robot est connect\u00e9, vous pouvez tester les renfor\u00e7ateurs avant d'en choisir un."
}
}
}
Expand Down Expand Up @@ -1028,6 +1028,24 @@
}
}
},
"lekapp.carereceiver_view.available_soon_label": {
"comment": "Temporary content for carereceiver monitoring",
"extractionState": "extracted_with_value",
"localizations": {
"en": {
"stringUnit": {
"state": "new",
"value": "\ud83d\udea7 Monitoring available soon..."
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "\ud83d\udea7 Suivi bient\u00f4t disponible ..."
}
}
}
},
"lekapp.not_account_connected_label.button_label": {
"comment": "Button label to log in or sign up",
"extractionState": "extracted_with_value",
Expand Down Expand Up @@ -1280,20 +1298,20 @@
}
}
},
"main_view.sidebar.section.tracking": {
"comment": "The title of the section 'Tracking'",
"main_view.sidebar.section.monitoring": {
"comment": "The title of the section 'Users'",
"extractionState": "extracted_with_value",
"localizations": {
"en": {
"stringUnit": {
"state": "new",
"value": "Tracking"
"value": "Users"
}
},
"fr": {
"stringUnit": {
"state": "translated",
"value": "Suivi"
"value": "Utilisateurs"
}
}
}
Expand Down
10 changes: 0 additions & 10 deletions ...App/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step1.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,6 @@ extension AccountCreationProcess {

var body: some View {
VStack(spacing: 30) {
Image(
DesignKitAsset.Images.welcome.name,
bundle: Bundle(for: DesignKitResources.self)
)
.resizable()
.renderingMode(.original)
.aspectRatio(contentMode: .fit)
.frame(height: 80)
.padding()

Text(l10n.AccountCreationProcess.Step1.title)
.font(.headline)
.foregroundColor(.orange)
Expand Down
13 changes: 5 additions & 8 deletions ...App/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step2.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@ extension AccountCreationProcess {

var body: some View {
VStack(spacing: 30) {
Image(
DesignKitAsset.Images.accompagnantPicto.name,
bundle: Bundle(for: DesignKitResources.self)
)
.resizable()
.renderingMode(.original)
.aspectRatio(contentMode: .fit)
.frame(height: 80)
Image(systemName: "person.3.fill")
.resizable()
.renderingMode(.original)
.aspectRatio(contentMode: .fit)
.frame(height: 80)

Text(l10n.AccountCreationProcess.Step2.title)
.font(.headline)
Expand Down
13 changes: 5 additions & 8 deletions ...App/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step3.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@ extension AccountCreationProcess {

var body: some View {
VStack(spacing: 30) {
Image(
DesignKitAsset.Images.user.name,
bundle: Bundle(for: DesignKitResources.self)
)
.resizable()
.renderingMode(.original)
.aspectRatio(contentMode: .fit)
.frame(height: 80)
Image(systemName: "figure.2.arms.open")
.resizable()
.renderingMode(.original)
.aspectRatio(contentMode: .fit)
.frame(height: 80)

Text(l10n.AccountCreationProcess.Step3.title)
.font(.headline)
Expand Down
9 changes: 3 additions & 6 deletions ...aApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+l10n.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ extension l10n {

static let message = LocalizedString("lekaapp.account_creation_process.step_1.message",
value: """
A verification email has been sent.
Please check your inbox.

We will now guide you throught
the creation of your account
and the different steps.
Expand Down Expand Up @@ -56,10 +53,10 @@ extension l10n {

static let message = LocalizedString("lekaapp.account_creation_process.step_4.message",
value: """
You have completed process brilliantly:
You have just completed:

- Create your caregiver profile ✅
- Create your first care receiver profile ✅
✅ Your caregiver profile
✅ Your first care receiver profile

You can now discover the Leka App and dive deep in our educational content!
""",
Expand Down
2 changes: 1 addition & 1 deletion Apps/LekaApp/Sources/_NEWCodeBase/Views/AvatarPicker/AvatarPicker+l10n.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import LocalizationKit

extension l10n {
enum AvatarPicker {
static let title = LocalizedString("lekaapp.avatar_picker.title", value: "What's your avatar ?", comment: "Avatar picker title")
static let title = LocalizedString("lekaapp.avatar_picker.title", value: "Avatar choice", comment: "Avatar picker title")

static let validateButton = LocalizedString("lekaapp.avatar_picker.validate_button", value: "Validate selection", comment: "Avatar picker validate button")
}
Expand Down
2 changes: 1 addition & 1 deletion Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView+l10n.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ extension l10n {
static let title = LocalizedString("edit_caregiver_view.appearance_section.accent_color_row.title", value: "Color Theme", comment: "AccentColor Row title")
}

static let navigationTitle = LocalizedString("edit_caregiver_view.navigation_title", value: "Profil of ", comment: "The navigation title of Edit Caregiver View")
static let navigationTitle = LocalizedString("edit_caregiver_view.navigation_title", value: "Edit my profile", comment: "The navigation title of Edit Caregiver View")

static let saveButtonLabel = LocalizedString("edit_caregiver_view.save_button_label", value: "Save", comment: "Save button label of Edit Caregiver View")

Expand Down
2 changes: 1 addition & 1 deletion Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
}
}
.navigationTitle(String(l10n.EditCaregiverView.navigationTitle.characters) + self.modifiedCaregiver.name)
.navigationTitle(String(l10n.EditCaregiverView.navigationTitle.characters))
.navigationBarTitleDisplayMode(.inline)
.interactiveDismissDisabled()
.toolbar {
Expand All @@ -50,7 +50,7 @@
}
ToolbarItem(placement: .topBarTrailing) {
Button(String(l10n.EditCaregiverView.saveButtonLabel.characters)) {
// TODO: (@mathieu) - Add Firestore logic

Check warning on line 53 in Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView.swift

View workflow job for this annotation

GitHub Actions / swiftlint 

TODOs should be resolved ((@mathieu) - Add Firestore log...) (todo)
self.rootOwnerViewModel.isEditCaregiverViewPresented = false
self.rootOwnerViewModel.currentCaregiver = self.modifiedCaregiver
}
Expand Down
2 changes: 1 addition & 1 deletion Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView+l10n.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import LocalizationKit

extension l10n {
enum EditCarereceiverView {
static let navigationTitle = LocalizedString("edit_carereceiver_view.navigation_title", value: "Profil of ", comment: "The navigation title of Edit Carereceiver View")
static let navigationTitle = LocalizedString("edit_carereceiver_view.navigation_title", value: "Edit profil", comment: "The navigation title of Edit Carereceiver View")

static let saveButtonLabel = LocalizedString("edit_carereceiver_view.save_button_label", value: "Save", comment: "Save button label of Edit Carereceiver View")

Expand Down
2 changes: 1 addition & 1 deletion Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
}
}
.navigationTitle(String(l10n.EditCarereceiverView.navigationTitle.characters) + self.modifiedCarereceiver.name)
.navigationTitle(String(l10n.EditCarereceiverView.navigationTitle.characters))
.navigationBarTitleDisplayMode(.inline)
.interactiveDismissDisabled()
.toolbar {
Expand All @@ -49,7 +49,7 @@
}
ToolbarItem(placement: .topBarTrailing) {
Button(String(l10n.EditCarereceiverView.saveButtonLabel.characters)) {
// TODO: (@mathieu) - Add Firestore logic

Check warning on line 52 in Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView.swift

View workflow job for this annotation

GitHub Actions / swiftlint 

TODOs should be resolved ((@mathieu) - Add Firestore log...) (todo)
self.rootOwnerViewModel.isEditCarereceiverViewPresented = false
self.rootOwnerViewModel.currentCarereceiver = self.modifiedCarereceiver
}
Expand Down
Loading
Loading