diff --git a/Apps/LekaApp/Resources/Localizable.xcstrings b/Apps/LekaApp/Resources/Localizable.xcstrings index d13086b9a2..05172f2b99 100644 --- a/Apps/LekaApp/Resources/Localizable.xcstrings +++ b/Apps/LekaApp/Resources/Localizable.xcstrings @@ -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" } } } @@ -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" } } } @@ -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)?" } } } @@ -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 !" } } } @@ -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" } } } @@ -693,13 +693,13 @@ "en": { "stringUnit": { "state": "new", - "value": "Name" + "value": "Username" } }, "fr": { "stringUnit": { "state": "translated", - "value": "Nom" + "value": "Nom d'utilisateur" } } } @@ -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" } } } @@ -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)" } } } @@ -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." } } } @@ -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", @@ -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" } } } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step1.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step1.swift index b781a0c630..bbfbb56f6f 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step1.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step1.swift @@ -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) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step2.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step2.swift index cc47ab0bda..bb4cff73be 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step2.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step2.swift @@ -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) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step3.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step3.swift index 024328b3b4..845475f1c6 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step3.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step3.swift @@ -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) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+l10n.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+l10n.swift index c6967ad015..8db353b0d9 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+l10n.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+l10n.swift @@ -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. @@ -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! """, diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AvatarPicker/AvatarPicker+l10n.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AvatarPicker/AvatarPicker+l10n.swift index 52c83b5665..574f307cfa 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AvatarPicker/AvatarPicker+l10n.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AvatarPicker/AvatarPicker+l10n.swift @@ -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") } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView+l10n.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView+l10n.swift index a1884f89aa..84030ed5f4 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView+l10n.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView+l10n.swift @@ -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") diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView.swift index 1548a19c71..c14339ca24 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView.swift @@ -39,7 +39,7 @@ struct EditCaregiverView: View { } } } - .navigationTitle(String(l10n.EditCaregiverView.navigationTitle.characters) + self.modifiedCaregiver.name) + .navigationTitle(String(l10n.EditCaregiverView.navigationTitle.characters)) .navigationBarTitleDisplayMode(.inline) .interactiveDismissDisabled() .toolbar { diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView+l10n.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView+l10n.swift index b593d754f0..2ef5c211cb 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView+l10n.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView+l10n.swift @@ -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") diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView.swift index bc341fef93..a06fdc5e30 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView.swift @@ -38,7 +38,7 @@ struct EditCarereceiverView: View { } } } - .navigationTitle(String(l10n.EditCarereceiverView.navigationTitle.characters) + self.modifiedCarereceiver.name) + .navigationTitle(String(l10n.EditCarereceiverView.navigationTitle.characters)) .navigationBarTitleDisplayMode(.inline) .interactiveDismissDisabled() .toolbar { diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/CarereceiverView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/CarereceiverView.swift index 05d90e9722..f7094db50c 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/CarereceiverView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/CarereceiverView.swift @@ -3,9 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 import DesignKit +import LocalizationKit import SwiftUI -// MARK: - CarereceiversView +// MARK: - CarereceiverView struct CarereceiverView: View { // MARK: Internal @@ -13,21 +14,81 @@ struct CarereceiverView: View { @State var carereceiver: Carereceiver var body: some View { - Button { - self.rootOwnerViewModel.isEditCarereceiverViewPresented = true - } label: { - CarereceiverAvatarCell(carereceiver: self.carereceiver) - } - .sheet(isPresented: self.$rootOwnerViewModel.isEditCarereceiverViewPresented) { - EditCarereceiverView(modifiedCarereceiver: self.$carereceiver) + VStack { + Button { + self.rootOwnerViewModel.isEditCarereceiverViewPresented = true + } label: { + self.editCarereceiverButtonLabel + } + .padding() + .frame(maxWidth: .infinity, maxHeight: 120, alignment: .center) + .sheet(isPresented: self.$rootOwnerViewModel.isEditCarereceiverViewPresented) { + EditCarereceiverView(modifiedCarereceiver: self.$carereceiver) + } + + Divider() + + Spacer() + + Text(l10n.CarereceiverView.availableSoonLabel) + .font(.largeTitle) + + Spacer() } + .navigationTitle(self.carereceiver.name) + .navigationBarTitleDisplayMode(.inline) } // MARK: Private + private let strokeColor: Color = .init(light: UIColor.systemGray3, dark: UIColor.systemGray2) @ObservedObject private var rootOwnerViewModel: RootOwnerViewModel = .shared + + private var editCarereceiverButtonLabel: some View { + Image(self.carereceiver.avatar, bundle: Bundle(for: DesignKitResources.self)) + .resizable() + .aspectRatio(contentMode: .fit) + .clipShape(Circle()) + .overlay { + Image(systemName: "pencil.circle.fill") + .resizable() + .renderingMode(.original) + .frame(maxWidth: 30, maxHeight: 30) + .foregroundStyle(.orange) + .padding(5) + .offset(x: 35, y: -35) + } + .overlay { + Circle() + .strokeBorder(self.strokeColor, lineWidth: 2) + .background { + Circle() + .fill(Color(uiColor: UIColor.systemGray6)) + } + .overlay { + Image(uiImage: self.rootOwnerViewModel.getReinforcerFor(index: self.carereceiver.reinforcer)) + .resizable() + .aspectRatio(contentMode: .fit) + .padding(5) + } + .frame(maxWidth: 45) + .offset(x: 40, y: 30) + } + } } +// MARK: - l10n.CarereceiverView + +// swiftlint:disable line_length + +extension l10n { + enum CarereceiverView { + static let availableSoonLabel = LocalizedString("lekapp.carereceiver_view.available_soon_label", value: "🚧 Monitoring available soon...", comment: "Temporary content for carereceiver monitoring") + } +} + +// swiftlint:enable line_length + #Preview { - CarereceiverView(carereceiver: Carereceiver()) + CarereceiverView(carereceiver: Carereceiver(name: "Peet", avatar: DesignKitAsset.Avatars.avatarsBoy1a.name, reinforcer: 2)) } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/EditCaregiverLabel.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/EditCaregiverLabel.swift index d8b6c41d77..0c7cd069c2 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/EditCaregiverLabel.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/EditCaregiverLabel.swift @@ -13,21 +13,27 @@ struct EditCaregiverLabel: View { // MARK: Internal var body: some View { - VStack(alignment: .center, spacing: 10) { + VStack(alignment: .leading) { if let caregiver = self.rootOwnerViewModel.currentCaregiver { Button { self.rootOwnerViewModel.isEditCaregiverViewPresented = true } label: { - CaregiverAvatarCell(caregiver: caregiver) - .frame(maxWidth: 80) + HStack(spacing: 10) { + Image(caregiver.avatar, bundle: Bundle(for: DesignKitResources.self)) + .resizable() + .aspectRatio(contentMode: .fit) + .clipShape(Circle()) + .frame(maxWidth: 90) + VStack(alignment: .leading, spacing: 0) { + Text(caregiver.name) + .font(.title) + .lineLimit(1) + .truncationMode(.tail) + Button("Edit profile") {} + .font(.footnote) + } + } } - - Button { - self.rootOwnerViewModel.isCaregiverPickerViewPresented = true - } label: { - Label(String(l10n.ChangeCaregiverProfile.buttonLabel.characters), systemImage: "person.2.circle") - } - .buttonStyle(.bordered) } else { Button { self.rootOwnerViewModel.isCaregiverPickerViewPresented = true @@ -37,6 +43,14 @@ struct EditCaregiverLabel: View { } } .frame(maxWidth: .infinity) + .toolbar { + ToolbarItem(placement: .topBarTrailing) { + Button("Switch profile", systemImage: "person.2.gobackward") { + print("change profile") + self.rootOwnerViewModel.isCaregiverPickerViewPresented = true + } + } + } } // MARK: Private @@ -104,4 +118,8 @@ extension l10n { }, detail: { EmptyView() }) + .onAppear { + let rootOwnerViewModel = RootOwnerViewModel.shared + rootOwnerViewModel.currentCaregiver = Caregiver(name: "Joe", avatar: "avatars_boy-1a") + } } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView+l10n.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView+l10n.swift index db6b7535db..b764d67713 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView+l10n.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView+l10n.swift @@ -4,7 +4,7 @@ import LocalizationKit -// swiftlint:disable line_length +// swiftlint:disable line_length nesting extension l10n { enum MainView { @@ -25,9 +25,9 @@ extension l10n { static let sectionContent = LocalizedString("main_view.sidebar.section.content", value: "Content", comment: "The title of the section 'Content'") - static let sectionTracking = LocalizedString("main_view.sidebar.section.tracking", value: "Tracking", comment: "The title of the section 'Tracking'") + static let sectionUsers = LocalizedString("main_view.sidebar.section.monitoring", value: "Users", comment: "The title of the section 'Users'") } } } -// swiftlint:enable line_length +// swiftlint:enable line_length nesting diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift index 23eb14ef70..b028e545f3 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/MainView.swift @@ -50,7 +50,7 @@ struct MainView: View { CategoryLabel(category: .stories) } - Section(String(l10n.MainView.Sidebar.sectionTracking.characters)) { + Section(String(l10n.MainView.Sidebar.sectionUsers.characters)) { CategoryLabel(category: .carereceivers) } @@ -73,8 +73,8 @@ struct MainView: View { } // TODO: (@ladislas) remove if not necessary // .disabled(navigation.disableUICompletly) - .navigationTitle(String(l10n.MainView.Sidebar.navigationTitle.characters)) - .navigationBarTitleDisplayMode(.inline) +// .navigationTitle(String(l10n.MainView.Sidebar.navigationTitle.characters)) +// .navigationBarTitleDisplayMode(.inline) } detail: { NavigationStack(path: self.$navigation.path) { switch self.navigation.selectedCategory { diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/NoAccountConnectedLabel.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/NoAccountConnectedLabel.swift index b985062082..36e98981b0 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/NoAccountConnectedLabel.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/MainView/NoAccountConnectedLabel.swift @@ -17,9 +17,10 @@ struct NoAccountConnectedLabel: View { VStack(alignment: .center, spacing: 10) { Image(systemName: "person.crop.circle.badge.xmark") .resizable() + .renderingMode(.original) + .foregroundStyle(self.styleManager.accentColor!) .scaledToFit() .frame(width: 80) - .foregroundStyle(self.styleManager.accentColor!) Text(l10n.NoAccountConnectedLabel.message) .foregroundColor(.orange) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/ProfessionPicker/ProfessionPicker+l10n.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/ProfessionPicker/ProfessionPicker+l10n.swift index 0a733d093e..6338c609e3 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/ProfessionPicker/ProfessionPicker+l10n.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/ProfessionPicker/ProfessionPicker+l10n.swift @@ -8,7 +8,7 @@ import LocalizationKit extension l10n { enum ProfessionPicker { - static let title = LocalizedString("lekaapp.profession_picker.title", value: "Select your professions", comment: "Profession picker title") + static let title = LocalizedString("lekaapp.profession_picker.title", value: "Profession choice", comment: "Profession picker title") static let otherLabel = LocalizedString("lekaapp.profession_picker.other_label", value: "Other (specify)", comment: "Profession picker other profession label") diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CarereceiverPicker.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CarereceiverPicker.swift index c9c006fd06..0ef18b3534 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CarereceiverPicker.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CarereceiverPicker.swift @@ -60,7 +60,7 @@ struct CarereceiverPicker: View { extension l10n { enum CarereceiverPicker { static let title = LocalizedString("lekaapp.carereceiver_picker.title", - value: "Care receivers list", + value: "Care receivers", comment: "Carereceiver picker title") static let addButtonLabel = LocalizedString("lekaapp.carereceiver_picker.addButtonLabel", diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift index 5be4e06feb..14c1d92a10 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift @@ -40,6 +40,9 @@ struct CreateCaregiverView: View { self.isPresented.toggle() self.onDismissAction() } + if self.newCaregiver.avatar.isEmpty { + self.newCaregiver.avatar = AvatarSets.weather.content.images.randomElement()! + } // TODO: (@team) : add the caregiver profile to the account // TODO: (@team) : assign the caregiver profile as the current selected one self.rootOwnerViewModel.mockCaregiversSet.append(self.newCaregiver) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift index 547d12c585..e349f6ff16 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift @@ -36,6 +36,9 @@ struct CreateCarereceiverView: View { self.isPresented.toggle() self.onDismissAction() } + if self.newCarereceiver.avatar.isEmpty { + self.newCarereceiver.avatar = AvatarSets.sunglasses.content.images.randomElement()! + } // TODO: (@team) : add the carereceiver profile to the account // TODO: (@team) : assign the carereceiver profile as the current selected one self.rootOwnerViewModel.mockCarereceiversSet.append(self.newCarereceiver) @@ -83,7 +86,7 @@ extension l10n { static let avatarChoiceButton = LocalizedString("lekaapp.carereceiver_creation.avatar_choice_button", value: "Choose an avatar", comment: " Carereceiver creation avatar choice button label") - static let carereceiverNameLabel = LocalizedString("lekaapp.carereceiver_creation.carereceiver_name_label", value: "Name", comment: " Carereceiver creation carereceiver name textfield label") + static let carereceiverNameLabel = LocalizedString("lekaapp.carereceiver_creation.carereceiver_name_label", value: "Username", comment: " Carereceiver creation carereceiver name textfield label") static let registerProfilButton = LocalizedString("lekaapp.carereceiver_creation.register_profil_button", value: "Register profile", comment: " Carereceiver creation register profil button label") }