From 17e2d02c62cb7dda5ec1fcbd63fea71b50eb90b5 Mon Sep 17 00:00:00 2001 From: Ladislas de Toldi Date: Thu, 8 Feb 2024 12:16:10 +0100 Subject: [PATCH] :wastebasket: (TODO): Remove todos 'replace with Leka font' --- .../Views/AccountCreation/AccountCreationView.swift | 1 - .../Process/AccountCreationProcess+Step1.swift | 1 - .../Process/AccountCreationProcess+Step2.swift | 1 - .../Process/AccountCreationProcess+Step3.swift | 1 - .../Process/AccountCreationProcess+Step4.swift | 1 - .../AccountCreation/Process/AccountCreationProcess.swift | 1 - .../Views/CaregiverSettingsView/CaregiverSettingsView.swift | 2 -- Apps/LekaApp/Sources/_NEWCodeBase/Views/ConnectionView.swift | 4 ++-- .../Views/ProfessionPicker/ProfessionPicker+Tag.swift | 1 - .../_NEWCodeBase/Views/Profiles/CaregiverAvatarCell.swift | 1 - .../_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift | 2 -- .../_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift | 1 - .../Views/Settings/SettingsView+CredentialsSection.swift | 1 - .../_NEWCodeBase/Views/TextFields/TextFieldEmail.swift | 1 - .../_NEWCodeBase/Views/TextFields/TextFieldPassword.swift | 1 - Apps/LekaApp/Sources/_OLDCodeBase/Styles/Styles.swift | 3 --- .../Activities/Components/ActivityListCell.swift | 2 -- .../Components/SelectedActivityInstructionsView.swift | 1 - .../EducationalContent/Activities_shared/GoButton.swift | 1 - .../Activities_shared/InstructionsView.swift | 1 - .../Components/ActivityListCell_Curriculums.swift | 1 - .../Curriculums/Components/CurriculumPillShapedView.swift | 2 -- .../Curriculums/CurriculumDetailsView.swift | 3 --- .../EducationalContent/Curriculums/CurriculumListView.swift | 1 - .../Views/Game/Components/CurrentGameInstructionView.swift | 1 - .../Views/Game/Components/InstructionButton.swift | 1 - Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/GameView.swift | 2 -- .../GlobalComponentViews/InformationTiles/InfoTile.swift | 4 ---- .../GlobalComponentViews/LekaTextField+DEPRECATED.swift | 2 -- .../SignUpPath/Shared/SignupNavigationTitle+DEPRECATED.swift | 1 - .../SignUpPath/SignupFinalStep+DEPRECATED.swift | 3 --- .../Identification/SignUpPath/SignupStep1+DEPRECATED.swift | 3 --- .../Identification/SignUpPath/SignupStep2+DEPRECATED.swift | 3 --- .../Identification/SignUpPath/SignupStep3+DEPRECATED.swift | 3 --- .../Identification/WelcomeViews/LoginView+DEPRECATED.swift | 4 ---- .../Identification/WelcomeViews/SignupView+DEPRECATED.swift | 2 -- .../_OLDCodeBase/Views/Profiles/ProfileEditorView.swift | 1 - .../ProfileSelector_Teachers+DEPRECATED.swift | 1 - .../ProfileSelectors/ProfileSelector_Users+DEPRECATED.swift | 1 - .../AvatarPickerTriggersComponentViews+DEPRECATED.swift | 1 - .../Pickers/Components/AvatarPickerStore+DEPRECATED.swift | 1 - .../AvatarPickers_NavBarComponents+DEPRECATED.swift | 1 - .../CreateProfiles/Components/DeleteProfileButton.swift | 1 - .../Components/JobPickerTrigger+DEPRECATED.swift | 1 - .../Components/ReinforcerPicker+DEPRECATED.swift | 2 -- .../CreateProfiles/CreateTeacherProfileView+DEPRECATED.swift | 2 -- .../CreateProfiles/CreateUserProfileView+DEPRECATED.swift | 2 -- .../JobPicker/Components/JobPickerStore+DEPRECATED.swift | 1 - .../JobPicker/Components/JobTag+DEPRECATED.swift | 1 - .../ProfilesComponents/JobPicker/JobPicker+DEPRECATED.swift | 1 - .../ProfileSets/ProfileSet_Teachers+DEPRECATED.swift | 3 --- .../ProfileSets/ProfileSet_Users+DEPRECATED.swift | 3 --- .../TeacherSet_AvatarCell+DEPRECATED.swift | 1 - .../UserSetComponents/UserSet_AvatarCell+DEPRECATED.swift | 1 - .../Components/SettingsSection_Credentials+DEPRECATED.swift | 2 -- .../Components/SettingsSection_Exploratory+DEPRECATED.swift | 2 -- .../Components/SettingsSection_Profiles+DEPRECATED.swift | 2 -- .../Views/Settings/SettingsView+DEPRECATED.swift | 2 -- .../Components/Shared/SidebarAvatarNameLabel.swift | 1 - .../ProfilesButton/Components/UserSidebarAvatarCell.swift | 1 - .../Header/ProfilesButton/GoToProfileEditorButton.swift | 1 - .../Components/RobotConnectionIndicator+DEPRECATED.swift | 1 - .../RobotButton/GoToRobotConnectButton+DEPRECATED.swift | 5 ----- .../Views/Sidebar/Components/SidebarSections.swift | 2 -- .../Sources/_OLDCodeBase/Views/Sidebar/SidebarView.swift | 2 -- .../Exercises/ActionButton/ActionButton+Observe.swift | 1 - .../DanceFreeze/DanceFreezeView+ButtonStyles.swift | 1 - .../DanceFreeze/DanceFreezeView+LauncherView.swift | 1 - .../DanceFreeze/DanceFreezeView+SongSelectorView.swift | 1 - .../HideAndSeek/HideAndSeekView+ButtonLabel.swift | 1 - .../Specialized/HideAndSeek/HideAndSeekView+HiddenView.swift | 1 - .../Specialized/HideAndSeek/HideAndSeekView+Launcher.swift | 1 - .../Specialized/Melody/MelodyView+ButtonLabel.swift | 1 - .../Specialized/Melody/MelodyView+SongSelectorView.swift | 1 - .../Specialized/Pairing/PairingView+ActionButton.swift | 1 - .../Exercises/Specialized/Pairing/PairingView.swift | 1 - .../_NewSystem/Views/Activity/ActivityView+SuccessView.swift | 2 -- .../_NewSystem/Views/Activity/Activityview+FailureView.swift | 2 -- 78 files changed, 2 insertions(+), 123 deletions(-) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/AccountCreationView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/AccountCreationView.swift index c18a97f1f4..ff20646b89 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/AccountCreationView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/AccountCreationView.swift @@ -22,7 +22,6 @@ struct AccountCreationView: View { var body: some View { VStack(alignment: .center, spacing: 30) { Text(l10n.AccountCreationView.createAccountTitle) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title) VStack(spacing: 15) { 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 b44252bc31..b781a0c630 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step1.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step1.swift @@ -23,7 +23,6 @@ extension AccountCreationProcess { .padding() Text(l10n.AccountCreationProcess.Step1.title) - // TODO: (@ui/ux) - Design System - replace with Leka font .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 85674e59f9..cc47ab0bda 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step2.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step2.swift @@ -24,7 +24,6 @@ extension AccountCreationProcess { .frame(height: 80) Text(l10n.AccountCreationProcess.Step2.title) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .textCase(.uppercase) .foregroundColor(.orange) 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 755ea45782..024328b3b4 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step3.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step3.swift @@ -24,7 +24,6 @@ extension AccountCreationProcess { .frame(height: 80) Text(l10n.AccountCreationProcess.Step3.title) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .textCase(.uppercase) .foregroundColor(DesignKitAsset.Colors.lekaOrange.swiftUIColor) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step4.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step4.swift index a5f77587be..16b43c39e7 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step4.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess+Step4.swift @@ -13,7 +13,6 @@ extension AccountCreationProcess { var body: some View { VStack(spacing: 30) { Text(l10n.AccountCreationProcess.Step4.title) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(DesignKitAsset.Colors.lekaOrange.swiftUIColor) diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess.swift index f5441578e6..8e29e66be9 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/AccountCreation/Process/AccountCreationProcess.swift @@ -9,7 +9,6 @@ enum AccountCreationProcess { struct NavigationTitle: View { var body: some View { Text(l10n.AccountCreationProcess.navigationTitle) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/CaregiverSettingsView/CaregiverSettingsView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/CaregiverSettingsView/CaregiverSettingsView.swift index a21cc72b90..2ee4577e3b 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/CaregiverSettingsView/CaregiverSettingsView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/CaregiverSettingsView/CaregiverSettingsView.swift @@ -60,7 +60,6 @@ struct CaregiverSettingsView: View { VStack(spacing: 15) { AvatarPicker.ButtonLabel(image: self.modifiedCaregiver.avatar) Text(l10n.CaregiverCreation.avatarChoiceButton) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } } @@ -70,7 +69,6 @@ struct CaregiverSettingsView: View { VStack(alignment: .leading) { HStack { Text(l10n.CaregiverCreation.professionLabel) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) Spacer() diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/ConnectionView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/ConnectionView.swift index 8f69637fcd..06b360a8c9 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/ConnectionView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/ConnectionView.swift @@ -27,7 +27,7 @@ struct ConnectionView: View { var body: some View { VStack(alignment: .center, spacing: 30) { Text(l10n.ConnectionView.title) - .font(.title) // TODO: (@ui/ux) - Design System - replace with Leka font + .font(.title) VStack { TextFieldEmail(entry: self.$viewModel.email) @@ -36,7 +36,7 @@ struct ConnectionView: View { TextFieldPassword(entry: self.$viewModel.password) Text(l10n.ConnectionView.passwordForgottenButton) - .font(.footnote) // TODO: (@ui/ux) - Design System - replace with Leka font + .font(.footnote) .underline() } } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/ProfessionPicker/ProfessionPicker+Tag.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/ProfessionPicker/ProfessionPicker+Tag.swift index 09caac46ff..601a9d208f 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/ProfessionPicker/ProfessionPicker+Tag.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/ProfessionPicker/ProfessionPicker+Tag.swift @@ -25,7 +25,6 @@ extension ProfessionPicker { } } } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.caption) .buttonStyle(.bordered) } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CaregiverAvatarCell.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CaregiverAvatarCell.swift index 8b1fddeab3..b00df4b093 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CaregiverAvatarCell.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CaregiverAvatarCell.swift @@ -30,7 +30,6 @@ struct CaregiverAvatarCell: View { .frame(width: 140) Text(self.caregiver.name) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift index 36b7547e0b..01e3713fb6 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCaregiverView.swift @@ -56,7 +56,6 @@ struct CreateCaregiverView: View { VStack(spacing: 15) { AvatarPicker.ButtonLabel(image: self.newCaregiver.avatar) Text(l10n.CaregiverCreation.avatarChoiceButton) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } } @@ -66,7 +65,6 @@ struct CreateCaregiverView: View { VStack(alignment: .leading) { HStack { Text(l10n.CaregiverCreation.professionLabel) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) Spacer() diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift index 130e56f27d..c4b7365605 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Profiles/CreateCarereceiverView.swift @@ -53,7 +53,6 @@ struct CreateCarereceiverView: View { VStack(spacing: 15) { AvatarPicker.ButtonLabel(image: self.newCarereceiver.avatar) Text(l10n.CarereceiverCreation.avatarChoiceButton) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+CredentialsSection.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+CredentialsSection.swift index ee274c53bf..2cdb58f158 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+CredentialsSection.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/Settings/SettingsView+CredentialsSection.swift @@ -15,7 +15,6 @@ extension SettingsView { Section(String(l10n.SettingsView.CredentialsSection.header.characters)) { LabeledContent { Text(self.rootOwnerViewModel.currentCompany?.email ?? "") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .multilineTextAlignment(.leading) } label: { diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/TextFields/TextFieldEmail.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/TextFields/TextFieldEmail.swift index 8a69859b9d..d26dbe4fae 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/TextFields/TextFieldEmail.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/TextFields/TextFieldEmail.swift @@ -53,7 +53,6 @@ struct TextFieldEmail: View { ) Text(l10n.TextFieldEmail.invalidEmailErrorLabel) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .foregroundStyle(self.isErrorMessageVisible ? .red : .clear) } diff --git a/Apps/LekaApp/Sources/_NEWCodeBase/Views/TextFields/TextFieldPassword.swift b/Apps/LekaApp/Sources/_NEWCodeBase/Views/TextFields/TextFieldPassword.swift index a2aa36ee8f..592ddacc88 100644 --- a/Apps/LekaApp/Sources/_NEWCodeBase/Views/TextFields/TextFieldPassword.swift +++ b/Apps/LekaApp/Sources/_NEWCodeBase/Views/TextFields/TextFieldPassword.swift @@ -61,7 +61,6 @@ struct TextFieldPassword: View { } Text(l10n.TextFieldPassword.invalidPasswordErrorLabel) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .lineLimit(2) .foregroundStyle(self.entry.isValidPassword() ? .green : .gray) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Styles/Styles.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Styles/Styles.swift index 56b28e2d95..a6152a0728 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Styles/Styles.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Styles/Styles.swift @@ -64,7 +64,6 @@ struct Connect_ButtonStyle: ButtonStyle { func makeBody(configuration: Self.Configuration) -> some View { configuration.label - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .frame(width: 310, height: 60) .foregroundColor(self.reversed ? DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor : .white) @@ -100,7 +99,6 @@ struct JobPickerToggleStyle: ToggleStyle { configuration.label .multilineTextAlignment(.leading) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) Spacer() @@ -206,7 +204,6 @@ struct BorderedCapsule_ButtonStyle: ButtonStyle { func makeBody(configuration: Self.Configuration) -> some View { configuration.label - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .foregroundColor(!self.isFilled ? DesignKitAsset.Colors.bravoHighlights.swiftUIColor : .white) .opacity(configuration.isPressed ? 0.95 : 1) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities/Components/ActivityListCell.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities/Components/ActivityListCell.swift index 371144029b..97367caabc 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities/Components/ActivityListCell.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities/Components/ActivityListCell.swift @@ -40,12 +40,10 @@ struct ActivityListCell: View { VStack(alignment: .leading, spacing: 0) { Spacer() Text(self.activity.title.localized()) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title2) Spacer() Group { Text("ACTIVITÉ \(self.rank)") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) + Text(" - \(self.activity.short.localized())") } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities/Components/SelectedActivityInstructionsView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities/Components/SelectedActivityInstructionsView.swift index 0afbfda212..302196d079 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities/Components/SelectedActivityInstructionsView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities/Components/SelectedActivityInstructionsView.swift @@ -37,7 +37,6 @@ struct SelectedActivityInstructionsView: View { HStack { Spacer() Text(self.activityVM.currentActivity.title.localized()) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(.white) .multilineTextAlignment(.center) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities_shared/GoButton.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities_shared/GoButton.swift index f8b7b8d8a2..757cba3e92 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities_shared/GoButton.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities_shared/GoButton.swift @@ -48,7 +48,6 @@ struct GoButton: View { .stroke(.white, lineWidth: 2) Text("GO !") .foregroundColor(.white) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.system(size: 34, weight: .bold, design: .rounded)) } .frame(width: 127, height: 127) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities_shared/InstructionsView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities_shared/InstructionsView.swift index 40c35ab3f7..ab6bb9a847 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities_shared/InstructionsView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Activities_shared/InstructionsView.swift @@ -41,7 +41,6 @@ struct InstructionsView: View { HStack { Spacer() Text("DESCRIPTION & INSTALLATION") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(DesignKitAsset.Colors.darkGray.swiftUIColor.opacity(0.8)) .padding(.vertical, 22) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/Components/ActivityListCell_Curriculums.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/Components/ActivityListCell_Curriculums.swift index afcf146369..65d2de0166 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/Components/ActivityListCell_Curriculums.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/Components/ActivityListCell_Curriculums.swift @@ -44,7 +44,6 @@ struct ActivityListCell_Curriculums: View { Spacer() Group { Text("ACTIVITÉ \(self.rank)") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) + Text(" - \(self.activity.short.localized())") } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/Components/CurriculumPillShapedView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/Components/CurriculumPillShapedView.swift index b05d5d4752..5378147865 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/Components/CurriculumPillShapedView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/Components/CurriculumPillShapedView.swift @@ -30,7 +30,6 @@ struct CurriculumPillShapedView: View { private var topContent: some View { Text(self.curriculum.fullTitle.localized()) .multilineTextAlignment(.center) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .frame(maxWidth: 136, minHeight: 120) .foregroundColor(.white) @@ -42,7 +41,6 @@ struct CurriculumPillShapedView: View { self.iconView Spacer() Text("\(self.curriculum.activities.count) activités") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.caption) .foregroundColor(DesignKitAsset.Colors.darkGray.swiftUIColor) .padding(.bottom, 12) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/CurriculumDetailsView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/CurriculumDetailsView.swift index 855a05ad09..06cd0fdc79 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/CurriculumDetailsView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/CurriculumDetailsView.swift @@ -53,7 +53,6 @@ struct CurriculumDetailsView: View { .toolbar { ToolbarItem(placement: .principal) { Text(self.curriculumVM.setCurriculumDetailNavTitle()) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } ToolbarItem(placement: .navigationBarLeading) { @@ -77,7 +76,6 @@ struct CurriculumDetailsView: View { Spacer() VStack(spacing: 20) { Text(self.curriculumVM.selectedCurriculumHeaderTitle) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title2) .padding(.top, 15) Image(self.curriculumVM.selectedCurriculumIcon) @@ -85,7 +83,6 @@ struct CurriculumDetailsView: View { .aspectRatio(contentMode: .fit) .frame(width: 200, height: 66) Text(self.curriculumVM.selectedCurriculumDescription) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .multilineTextAlignment(.center) Spacer() diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/CurriculumListView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/CurriculumListView.swift index 53a01dd495..0b8c7d2f97 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/CurriculumListView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/EducationalContent/Curriculums/CurriculumListView.swift @@ -73,7 +73,6 @@ struct CurriculumListView: View { private func headerViews(title: LocalizedContent) -> some View { HStack { Text(title.localized()) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .padding(16) .padding(.leading, 20) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/Components/CurrentGameInstructionView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/Components/CurrentGameInstructionView.swift index 4f8f26b08f..55177ff6ff 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/Components/CurrentGameInstructionView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/Components/CurrentGameInstructionView.swift @@ -46,7 +46,6 @@ struct CurrentGameInstructionView: View { HStack { Spacer() Text(self.activityVM.currentActivity.title.localized()) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(.white) .multilineTextAlignment(.center) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/Components/InstructionButton.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/Components/InstructionButton.swift index d1be187a5b..e5277d4cb6 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/Components/InstructionButton.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/Components/InstructionButton.swift @@ -16,7 +16,6 @@ struct InstructionButton: View { Spacer() Text(self.activityVM.steps[self.activityVM.currentStep].instruction.localized()) .foregroundColor(DesignKitAsset.Colors.lekaDarkGray.swiftUIColor) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title2) .multilineTextAlignment(.center) .padding(.horizontal, self.gameMetrics.instructionFrame.height) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/GameView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/GameView.swift index 4ccb31a66a..bfd133af7b 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/GameView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/GameView.swift @@ -61,7 +61,6 @@ struct GameView: View { Image(systemName: "binoculars.fill") } } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.subheadline) } ToolbarItem(placement: .navigationBarTrailing) { @@ -165,7 +164,6 @@ struct GameView: View { value: self.textOpacity ) } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.largeTitle) } } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/GlobalComponentViews/InformationTiles/InfoTile.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/GlobalComponentViews/InformationTiles/InfoTile.swift index 4143d1e7b0..3ecbf27a37 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/GlobalComponentViews/InformationTiles/InfoTile.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/GlobalComponentViews/InformationTiles/InfoTile.swift @@ -51,7 +51,6 @@ struct InfoTile: View { } Spacer() Text(self.data.content.title!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title3) Spacer() if self.data != .discovery, self.settings.companyIsConnected { @@ -69,13 +68,11 @@ struct InfoTile: View { VStack { Spacer() Text(self.data.content.subtitle!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(self.headerColor) .padding(10) Spacer() Text(self.data.content.message!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.subheadline) .padding(10) Spacer() @@ -103,7 +100,6 @@ struct InfoTile: View { } .padding(.horizontal, 20) .buttonStyle( - // TODO: (@ui/ux) - Design System - replace with Leka font BorderedCapsule_NoFeedback_ButtonStyle( font: .body, color: DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor, diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/GlobalComponentViews/LekaTextField+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/GlobalComponentViews/LekaTextField+DEPRECATED.swift index 1050d3cf0f..9e6d3e0f1b 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/GlobalComponentViews/LekaTextField+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/GlobalComponentViews/LekaTextField+DEPRECATED.swift @@ -23,7 +23,6 @@ struct LekaTextFieldDeprecated: View { var body: some View { VStack(alignment: .leading, spacing: 10) { Text(self.label) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .foregroundColor(self.color) .padding(.leading, 10) @@ -75,7 +74,6 @@ struct LekaPasswordFieldDeprecated: View { var body: some View { VStack(alignment: .leading, spacing: 10) { Text(self.label) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .foregroundColor(self.color) .padding(.leading, 10) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/Shared/SignupNavigationTitle+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/Shared/SignupNavigationTitle+DEPRECATED.swift index d1b43b2873..afbbffa57e 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/Shared/SignupNavigationTitle+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/Shared/SignupNavigationTitle+DEPRECATED.swift @@ -10,7 +10,6 @@ struct SignupNavigationTitleDeprecated: View { var body: some View { Text("Première connexion") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupFinalStep+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupFinalStep+DEPRECATED.swift index 50cfaf9a40..e8ec5b41ad 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupFinalStep+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupFinalStep+DEPRECATED.swift @@ -33,7 +33,6 @@ struct SignupFinalStepDeprecated: View { VStack(spacing: 0) { // Title Text(self.data.content.title!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(DesignKitAsset.Colors.lekaOrange.swiftUIColor) Spacer() @@ -49,7 +48,6 @@ struct SignupFinalStepDeprecated: View { } } .multilineTextAlignment(.center) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) Spacer() // CTA Button @@ -78,7 +76,6 @@ struct SignupFinalStepDeprecated: View { Text(self.data.content.callToActionLabel!) } .buttonStyle( - // TODO: (@ui/ux) - Design System - replace with Leka font BorderedCapsule_NoFeedback_ButtonStyle( font: .body, color: DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep1+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep1+DEPRECATED.swift index b70accb8d2..f5766957f4 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep1+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep1+DEPRECATED.swift @@ -46,13 +46,11 @@ struct SignupStep1Deprecated: View { .padding(.bottom, 30) // Title Text(self.data.content.title!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(DesignKitAsset.Colors.lekaOrange.swiftUIColor) Spacer() // Message Text(self.data.content.message!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) Spacer() // CTA Button @@ -82,7 +80,6 @@ struct SignupStep1Deprecated: View { } ) .buttonStyle( - // TODO: (@ui/ux) - Design System - replace with Leka font BorderedCapsule_NoFeedback_ButtonStyle( font: .body, color: DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor, diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep2+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep2+DEPRECATED.swift index 4483d061e4..b416fbd486 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep2+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep2+DEPRECATED.swift @@ -47,13 +47,11 @@ struct SignupStep2Deprecated: View { Spacer() // Title Text(self.data.content.title!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(DesignKitAsset.Colors.lekaOrange.swiftUIColor) .padding(.vertical, 20) // Message Text(self.data.content.message!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) Spacer() // CTA Button @@ -83,7 +81,6 @@ struct SignupStep2Deprecated: View { } ) .buttonStyle( - // TODO: (@ui/ux) - Design System - replace with Leka font BorderedCapsule_NoFeedback_ButtonStyle( font: .body, color: DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor, diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep3+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep3+DEPRECATED.swift index ea6448663e..3108679070 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep3+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/SignUpPath/SignupStep3+DEPRECATED.swift @@ -47,13 +47,11 @@ struct SignupStep3Deprecated: View { .padding(.vertical, 20) // Title Text(self.data.content.title!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(DesignKitAsset.Colors.lekaOrange.swiftUIColor) Spacer() // Message Text(self.data.content.message!) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) Spacer() // CTA Button @@ -83,7 +81,6 @@ struct SignupStep3Deprecated: View { } ) .buttonStyle( - // TODO: (@ui/ux) - Design System - replace with Leka font BorderedCapsule_NoFeedback_ButtonStyle( font: .body, color: DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor, diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/WelcomeViews/LoginView+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/WelcomeViews/LoginView+DEPRECATED.swift index b9953abfc0..36ddf071e6 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/WelcomeViews/LoginView+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/WelcomeViews/LoginView+DEPRECATED.swift @@ -65,8 +65,6 @@ struct LoginViewDeprecated: View { private var title: some View { Text("Se connecter") .textCase(.uppercase) - - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title) } @@ -77,7 +75,6 @@ struct LoginViewDeprecated: View { }, label: { Text("Connexion") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .padding(6) .frame(width: 210) @@ -141,7 +138,6 @@ struct LoginViewDeprecated: View { Spacer() Link(destination: URL(string: "https://leka.io")!) { Text("Mot de passe oublié") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .underline() .padding([.top, .trailing], 10) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/WelcomeViews/SignupView+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/WelcomeViews/SignupView+DEPRECATED.swift index c7f275cae7..8bba357302 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/WelcomeViews/SignupView+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Identification/WelcomeViews/SignupView+DEPRECATED.swift @@ -145,7 +145,6 @@ struct SignupViewDeprecated: View { private var title: some View { Text("Créer un compte") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title) } @@ -156,7 +155,6 @@ struct SignupViewDeprecated: View { }, label: { Text("Connexion") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .padding(6) .frame(width: 210) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileEditorView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileEditorView.swift index 1a91b0d3f7..c715f78c5a 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileEditorView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileEditorView.swift @@ -52,7 +52,6 @@ struct ProfileEditorView: View { Image(systemName: "binoculars.fill") } } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileSelectors/ProfileSelector_Teachers+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileSelectors/ProfileSelector_Teachers+DEPRECATED.swift index e8c85b7a01..463d37e903 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileSelectors/ProfileSelector_Teachers+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileSelectors/ProfileSelector_Teachers+DEPRECATED.swift @@ -25,7 +25,6 @@ struct ProfileSelector_TeachersDeprecated: View { } Text("Choisir ou créer de nouveaux profils") } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileSelectors/ProfileSelector_Users+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileSelectors/ProfileSelector_Users+DEPRECATED.swift index d85bb4a04e..9ad9bcda83 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileSelectors/ProfileSelector_Users+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfileSelectors/ProfileSelector_Users+DEPRECATED.swift @@ -28,7 +28,6 @@ struct ProfileSelector_UsersDeprecated: View { } Text("Choisir ou créer de nouveaux profils") } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } ToolbarItem(placement: .navigationBarLeading) { diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/PickerTriggers/AvatarPickerTriggersComponentViews+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/PickerTriggers/AvatarPickerTriggersComponentViews+DEPRECATED.swift index 3eced28211..72f72f6402 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/PickerTriggers/AvatarPickerTriggersComponentViews+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/PickerTriggers/AvatarPickerTriggersComponentViews+DEPRECATED.swift @@ -38,7 +38,6 @@ struct AvatarTriggerCTAViewDeprecated: View { var body: some View { Text("choisir un avatar") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .padding(.vertical, 4) .padding(.horizontal, 20) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/Pickers/Components/AvatarPickerStore+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/Pickers/Components/AvatarPickerStore+DEPRECATED.swift index 788c3f1d92..60189ede19 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/Pickers/Components/AvatarPickerStore+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/Pickers/Components/AvatarPickerStore+DEPRECATED.swift @@ -26,7 +26,6 @@ struct AvatarPickerStoreDeprecated: View { private func makeAvatarCategoryRow(category: AvatarCategoryDeprecated) -> some View { VStack(alignment: .leading, spacing: 10) { Text(category.category) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .padding(.leading, 40) ScrollView(.horizontal, showsIndicators: true) { diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/Pickers/Components/AvatarPickers_NavBarComponents+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/Pickers/Components/AvatarPickers_NavBarComponents+DEPRECATED.swift index cefb25bc43..f29993ad1b 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/Pickers/Components/AvatarPickers_NavBarComponents+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/AvatarPicker/Pickers/Components/AvatarPickers_NavBarComponents+DEPRECATED.swift @@ -13,7 +13,6 @@ struct AvatarPicker_NavigationTitleDeprecated: View { var body: some View { Text("Quel est ton avatar ?") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/DeleteProfileButton.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/DeleteProfileButton.swift index 1fae60131e..8977d304e3 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/DeleteProfileButton.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/DeleteProfileButton.swift @@ -18,7 +18,6 @@ struct DeleteProfileButton: View { Label("Supprimer le profil", systemImage: "trash.fill") .padding(.horizontal, 20) } - // TODO: (@ui/ux) - Design System - replace with Leka font .buttonStyle(BorderedCapsule_NoFeedback_ButtonStyle(font: .body, color: Color.red)) .padding(.vertical, 10) } else { diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/JobPickerTrigger+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/JobPickerTrigger+DEPRECATED.swift index 91fef36052..d2a06cd393 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/JobPickerTrigger+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/JobPickerTrigger+DEPRECATED.swift @@ -16,7 +16,6 @@ struct JobPickerTriggerDeprecated: View { var body: some View { VStack(alignment: .leading, spacing: 10) { Text("Profession(s)") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .padding(.leading, 10) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/ReinforcerPicker+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/ReinforcerPicker+DEPRECATED.swift index 7104bf9cb2..80febf4bef 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/ReinforcerPicker+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/Components/ReinforcerPicker+DEPRECATED.swift @@ -14,7 +14,6 @@ struct ReinforcerPickerDeprecated: View { VStack(spacing: 10) { HStack { Text("Choix du renforçateur") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .padding(.leading, 10) Spacer() @@ -23,7 +22,6 @@ struct ReinforcerPickerDeprecated: View { Text( // swiftlint:disable:next line_length "Le renforçateur est un effet lumineux répétitif du robot que vous pourrez actionner pour récompenser le comportement de l'utilisateur. \nSi votre robot est connecté, vous pouvez tester les renforçateurs avant d'en choisir un." ) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .padding(.leading, 10) Spacer() diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/CreateTeacherProfileView+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/CreateTeacherProfileView+DEPRECATED.swift index 79a13a2a25..cdadc87f0f 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/CreateTeacherProfileView+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/CreateTeacherProfileView+DEPRECATED.swift @@ -140,7 +140,6 @@ struct CreateTeacherProfileViewDeprecated: View { ) .disabled(self.company.bufferTeacher.name.isEmpty) .buttonStyle( - // TODO: (@ui/ux) - Design System - replace with Leka font BorderedCapsule_NoFeedback_ButtonStyle( font: .body, color: DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor, @@ -155,7 +154,6 @@ struct CreateTeacherProfileViewDeprecated: View { // Toolbar private var navigationTitle: some View { Text(self.company.editingProfile ? "Éditer un profil accompagnant" : "Créer un profil accompagnant") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/CreateUserProfileView+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/CreateUserProfileView+DEPRECATED.swift index 05dca388e1..b90b202f58 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/CreateUserProfileView+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/CreateProfiles/CreateUserProfileView+DEPRECATED.swift @@ -108,7 +108,6 @@ struct CreateUserProfileViewDeprecated: View { ) .disabled(self.company.bufferTeacher.name.isEmpty) .buttonStyle( - // TODO: (@ui/ux) - Design System - replace with Leka font BorderedCapsule_NoFeedback_ButtonStyle( font: .body, color: DesignKitAsset.Colors.lekaDarkBlue.swiftUIColor, @@ -123,7 +122,6 @@ struct CreateUserProfileViewDeprecated: View { // Toolbar private var navigationTitle: some View { Text(self.company.editingProfile ? "Éditer un profil utilisateur" : "Créer un profil utilisateur") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/Components/JobPickerStore+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/Components/JobPickerStore+DEPRECATED.swift index accf2a3eaf..d6c1f0e64c 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/Components/JobPickerStore+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/Components/JobPickerStore+DEPRECATED.swift @@ -17,7 +17,6 @@ struct JobPickerStoreDeprecated: View { ForEach(ProfessionsDeprecated.allCases) { profession in Toggle(isOn: .constant(self.selectedJobs.contains(profession.name))) { Text(profession.name) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.subheadline) } .toggleStyle( diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/Components/JobTag+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/Components/JobTag+DEPRECATED.swift index a2f4285189..1374331ca2 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/Components/JobTag+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/Components/JobTag+DEPRECATED.swift @@ -23,7 +23,6 @@ struct JobTagDeprecated: View { Image(systemName: "multiply.square.fill") } } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .foregroundColor(.white) .padding(5) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/JobPicker+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/JobPicker+DEPRECATED.swift index 005d059446..8df54cb3c1 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/JobPicker+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/JobPicker/JobPicker+DEPRECATED.swift @@ -67,7 +67,6 @@ struct JobPickerDeprecated: View { private var navigationTitle: some View { Text("Sélectionnez vos professions") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/ProfileSet_Teachers+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/ProfileSet_Teachers+DEPRECATED.swift index 4a705ad196..bdd5d3ee55 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/ProfileSet_Teachers+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/ProfileSet_Teachers+DEPRECATED.swift @@ -66,7 +66,6 @@ struct ProfileSet_TeachersDeprecated: View { } label: { Image(systemName: "pencil") } - // TODO: (@ui/ux) - Design System - replace with Leka font .buttonStyle(CircledIcon_NoFeedback_ButtonStyle(font: .body)) } @@ -76,7 +75,6 @@ struct ProfileSet_TeachersDeprecated: View { Spacer() } Text("Qui êtes-vous ?") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) if self.navigationVM.showProfileEditor { Spacer() @@ -147,7 +145,6 @@ struct ProfileSet_TeachersDeprecated: View { } label: { Image(systemName: "plus") } - // TODO: (@ui/ux) - Design System - replace with Leka font .buttonStyle(CircledIcon_NoFeedback_ButtonStyle(font: .body)) } } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/ProfileSet_Users+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/ProfileSet_Users+DEPRECATED.swift index 3e2fc3b29e..e17f425590 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/ProfileSet_Users+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/ProfileSet_Users+DEPRECATED.swift @@ -62,7 +62,6 @@ struct ProfileSet_UsersDeprecated: View { } label: { Image(systemName: "pencil") } - // TODO: (@ui/ux) - Design System - replace with Leka font .buttonStyle(CircledIcon_NoFeedback_ButtonStyle(font: .body)) .disabled( self.company.getProfileDataFor( @@ -85,7 +84,6 @@ struct ProfileSet_UsersDeprecated: View { } label: { Image(systemName: "plus") } - // TODO: (@ui/ux) - Design System - replace with Leka font .buttonStyle(CircledIcon_NoFeedback_ButtonStyle(font: .body)) } @@ -95,7 +93,6 @@ struct ProfileSet_UsersDeprecated: View { Spacer() } Text("Qui accompagnez-vous?") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) if self.navigationVM.showProfileEditor { Spacer() diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/TeacherSetComponents/TeacherSet_AvatarCell+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/TeacherSetComponents/TeacherSet_AvatarCell+DEPRECATED.swift index a5a887f05d..3a9f301776 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/TeacherSetComponents/TeacherSet_AvatarCell+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/TeacherSetComponents/TeacherSet_AvatarCell+DEPRECATED.swift @@ -49,7 +49,6 @@ struct TeacherSet_AvatarCellDeprecated: View { .padding(10) Text(self.teacher.name) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .allowsTightening(true) .lineLimit(2) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/UserSetComponents/UserSet_AvatarCell+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/UserSetComponents/UserSet_AvatarCell+DEPRECATED.swift index 86b1703eca..4b0b775cba 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/UserSetComponents/UserSet_AvatarCell+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Profiles/ProfilesComponents/ProfileSets/UserSetComponents/UserSet_AvatarCell+DEPRECATED.swift @@ -65,7 +65,6 @@ struct UserSet_AvatarCellDeprecated: View { .padding(10) Text(self.user.name) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .allowsTightening(true) .lineLimit(2) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Credentials+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Credentials+DEPRECATED.swift index 6951255541..dfb5e3032b 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Credentials+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Credentials+DEPRECATED.swift @@ -14,7 +14,6 @@ struct SettingsSection_CredentialsDeprecated: View { Group { LabeledContent { Text(self.company.currentCompany.mail) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .multilineTextAlignment(.leading) } label: { @@ -28,7 +27,6 @@ struct SettingsSection_CredentialsDeprecated: View { .frame(maxHeight: 52) } header: { Text("Compte") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.subheadline) .headerProminence(.increased) .padding(.top, 20) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Exploratory+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Exploratory+DEPRECATED.swift index cc0ad65663..455d7bb1b4 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Exploratory+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Exploratory+DEPRECATED.swift @@ -17,7 +17,6 @@ struct SettingsSection_ExploratoryDeprecated: View { .labelsHidden() } label: { Text("Le mode exploratoire vous permet de découvrir les contenus sans enregistrer l'utilisation") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .foregroundColor(DesignKitAsset.Colors.lekaDarkGray.swiftUIColor) .frame(maxWidth: 300) @@ -28,7 +27,6 @@ struct SettingsSection_ExploratoryDeprecated: View { Image(systemName: "binoculars.fill") Text("Mode exploratoire") } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.subheadline) .headerProminence(.increased) } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Profiles+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Profiles+DEPRECATED.swift index 79cc85ecea..adbbea9d4e 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Profiles+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/Components/SettingsSection_Profiles+DEPRECATED.swift @@ -20,7 +20,6 @@ struct SettingsSection_ProfilesDeprecated: View { .frame(maxHeight: 52) } header: { Text("Profils") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .headerProminence(.increased) } @@ -45,7 +44,6 @@ struct SettingsSection_ProfilesDeprecated: View { .overlay( Text("+\(remainder)") .foregroundColor(.white) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .clipShape(Circle()) ) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/SettingsView+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/SettingsView+DEPRECATED.swift index 92f516ddc8..aa803f85fb 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/SettingsView+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Settings/SettingsView+DEPRECATED.swift @@ -29,7 +29,6 @@ struct SettingsViewDeprecated: View { .scrollDisabled(true) .padding(.horizontal, 10) .formStyle(.grouped) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) } .interactiveDismissDisabled() @@ -44,7 +43,6 @@ struct SettingsViewDeprecated: View { Image(systemName: "binoculars.fill") } } - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(.white) } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/Components/Shared/SidebarAvatarNameLabel.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/Components/Shared/SidebarAvatarNameLabel.swift index 488204bfbf..681b3d0e23 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/Components/Shared/SidebarAvatarNameLabel.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/Components/Shared/SidebarAvatarNameLabel.swift @@ -18,7 +18,6 @@ struct SidebarAvatarNameLabel: View { id: self.company.profilesInUse[self.type]! )[1] ) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.subheadline) .allowsTightening(true) .lineLimit(2) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/Components/UserSidebarAvatarCell.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/Components/UserSidebarAvatarCell.swift index 5049135fd3..04d170c018 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/Components/UserSidebarAvatarCell.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/Components/UserSidebarAvatarCell.swift @@ -38,7 +38,6 @@ struct UserSidebarAvatarCell: View { Image(systemName: "exclamationmark.circle.fill") .symbolRenderingMode(.palette) .foregroundStyle(.white, .red) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title) .frame(maxWidth: 22, maxHeight: 22) .offset(x: 2, y: -2) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/GoToProfileEditorButton.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/GoToProfileEditorButton.swift index aac8ca46c9..a45f9c4e93 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/GoToProfileEditorButton.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/ProfilesButton/GoToProfileEditorButton.swift @@ -45,7 +45,6 @@ struct GoToProfileEditorButton: View { private var exploratoryModeLabel: some View { Text("Mode exploratoire") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .foregroundColor(DesignKitAsset.Colors.lekaSkyBlue.swiftUIColor) .padding(.vertical, 2) diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/RobotButton/Components/RobotConnectionIndicator+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/RobotButton/Components/RobotConnectionIndicator+DEPRECATED.swift index cc11eb0de2..66b189b076 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/RobotButton/Components/RobotConnectionIndicator+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/RobotButton/Components/RobotConnectionIndicator+DEPRECATED.swift @@ -74,7 +74,6 @@ struct RobotConnectionIndicatorDeprecated: View { Image(systemName: "exclamationmark.circle.fill") .symbolRenderingMode(.palette) .foregroundStyle(.white, .red) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title2) .frame(maxWidth: 22, maxHeight: 22) } diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/RobotButton/GoToRobotConnectButton+DEPRECATED.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/RobotButton/GoToRobotConnectButton+DEPRECATED.swift index 401a085a9d..2ff5234768 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/RobotButton/GoToRobotConnectButton+DEPRECATED.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/Header/RobotButton/GoToRobotConnectButton+DEPRECATED.swift @@ -39,16 +39,13 @@ struct GoToRobotConnectButtonDeprecated: View { if self.robotViewModel.isConnected { VStack(alignment: .leading, spacing: 4) { Text("Connecté à") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.caption2) Text(self.robotViewModel.name) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.subheadline) self.robotCharginStatusAndBattery } } else { Text("Connectez-vous à votre Leka") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.subheadline) .multilineTextAlignment(.leading) } @@ -57,7 +54,6 @@ struct GoToRobotConnectButtonDeprecated: View { private var robotCharginStatusAndBattery: some View { HStack(spacing: 5) { Text(verbatim: "LekaOS v\(self.robotViewModel.osVersion)") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .foregroundColor(.gray) @@ -73,7 +69,6 @@ struct GoToRobotConnectButtonDeprecated: View { Image(systemName: battery.name) .foregroundColor(battery.color) Text(verbatim: "\(battery.level)%") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.footnote) .foregroundColor(.gray) .monospacedDigit() diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/SidebarSections.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/SidebarSections.swift index 13ae975312..f65a89e0e8 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/SidebarSections.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/Components/SidebarSections.swift @@ -26,7 +26,6 @@ struct SidebarSections: View { } label: { HStack { Label(item.label, systemImage: item.icon) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) Spacer() } @@ -53,7 +52,6 @@ struct SidebarSections: View { } header: { VStack(alignment: .leading, spacing: 6) { Text(content.title) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title2) .padding(.vertical, 10) Divider() diff --git a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/SidebarView.swift b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/SidebarView.swift index 718e78c318..4bde7755fe 100644 --- a/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/SidebarView.swift +++ b/Apps/LekaApp/Sources/_OLDCodeBase/Views/Sidebar/SidebarView.swift @@ -48,7 +48,6 @@ struct SidebarView: View { HStack { Image(systemName: "gear") Text("Réglages") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) } .foregroundColor(DesignKitAsset.Colors.lekaDarkGray.swiftUIColor) @@ -64,7 +63,6 @@ struct SidebarView: View { private var appVersionIndicator: some View { Text("My Leka App - Version \(self.appVersion!) (\(self.buildNumber!))") .foregroundColor(DesignKitAsset.Colors.lekaDarkGray.swiftUIColor) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.caption2) .frame(alignment: .bottom) } diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/ActionButton/ActionButton+Observe.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/ActionButton/ActionButton+Observe.swift index 9b121b2330..8d93d45397 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/ActionButton/ActionButton+Observe.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/ActionButton/ActionButton+Observe.swift @@ -57,7 +57,6 @@ struct ActionButtonObserve: View { .frame(width: 70, height: 70) .foregroundColor(.white) Text("Tap to reveal") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.title) .foregroundColor(.white) } diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+ButtonStyles.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+ButtonStyles.swift index 0c46329461..d2cda4ff27 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+ButtonStyles.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+ButtonStyles.swift @@ -20,7 +20,6 @@ extension DanceFreezeView { var body: some View { Text(self.text) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .foregroundColor(.white) .fixedSize(horizontal: false, vertical: true) diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+LauncherView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+LauncherView.swift index 8f5f16120a..4f2ca55fde 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+LauncherView.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+LauncherView.swift @@ -16,7 +16,6 @@ extension DanceFreezeView { var body: some View { VStack(spacing: 100) { Text(l10n.DanceFreezeView.instructions) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .padding(.top, 30) diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+SongSelectorView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+SongSelectorView.swift index 7283a6d221..213612b373 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+SongSelectorView.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/DanceFreeze/DanceFreezeView+SongSelectorView.swift @@ -29,7 +29,6 @@ extension DanceFreezeView { var body: some View { VStack(alignment: .leading) { Text(l10n.DanceFreezeView.musicSelectionTitle) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) Divider() diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+ButtonLabel.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+ButtonLabel.swift index 6cd1c91e42..1d881004b1 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+ButtonLabel.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+ButtonLabel.swift @@ -20,7 +20,6 @@ extension HideAndSeekView { var body: some View { Text(self.text) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .foregroundColor(.white) .fixedSize(horizontal: false, vertical: true) diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+HiddenView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+HiddenView.swift index 47967c5ae7..0bbdcf7813 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+HiddenView.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+HiddenView.swift @@ -12,7 +12,6 @@ extension HideAndSeekView { var body: some View { VStack { Text(l10n.HideAndSeekView.Player.instructions) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(.white) .multilineTextAlignment(.center) diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+Launcher.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+Launcher.swift index cba70650e2..76d4bc30a1 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+Launcher.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/HideAndSeek/HideAndSeekView+Launcher.swift @@ -13,7 +13,6 @@ extension HideAndSeekView { var body: some View { VStack { Text(l10n.HideAndSeekView.Launcher.instructions) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) GameEngineKitAsset.Exercises.HideAndSeek.imageIllustration.swiftUIImage .resizable() diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Melody/MelodyView+ButtonLabel.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Melody/MelodyView+ButtonLabel.swift index a723c40d92..0dca253967 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Melody/MelodyView+ButtonLabel.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Melody/MelodyView+ButtonLabel.swift @@ -21,7 +21,6 @@ extension MelodyView { var body: some View { Text(self.text) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .foregroundColor(.white) .fixedSize(horizontal: false, vertical: true) diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Melody/MelodyView+SongSelectorView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Melody/MelodyView+SongSelectorView.swift index bf497d7da0..11243e4162 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Melody/MelodyView+SongSelectorView.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Melody/MelodyView+SongSelectorView.swift @@ -29,7 +29,6 @@ extension MelodyView { var body: some View { VStack(alignment: .leading) { Text(l10n.MelodyView.musicSelectionTitle) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) Divider() diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Pairing/PairingView+ActionButton.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Pairing/PairingView+ActionButton.swift index ed71c9c59e..4673a423a7 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Pairing/PairingView+ActionButton.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Pairing/PairingView+ActionButton.swift @@ -40,7 +40,6 @@ extension PairingView { ) Text(self.text) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.body) .foregroundColor(DesignKitAsset.Colors.lekaDarkGray.swiftUIColor) .padding(.vertical, 10) diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Pairing/PairingView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Pairing/PairingView.swift index 59166c5063..1dd9c043b1 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Pairing/PairingView.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Exercises/Specialized/Pairing/PairingView.swift @@ -27,7 +27,6 @@ struct PairingView: View { var body: some View { VStack { Text(l10n.PairingView.instructions) - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.headline) .foregroundColor(.primary) .multilineTextAlignment(.center) diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/ActivityView+SuccessView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/ActivityView+SuccessView.swift index b2de8a89d8..b99a42214b 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/ActivityView+SuccessView.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/ActivityView+SuccessView.swift @@ -15,12 +15,10 @@ extension ActivityView { // TODO(@ladislas/@hugo): Use text variables to be localization friendly VStack { Text("\(self.percentage)% de réussite !") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.largeTitle) .foregroundStyle(.teal) .padding(10) Text("Bravo, vous avez réussi cette activité !") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.largeTitle) } diff --git a/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/Activityview+FailureView.swift b/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/Activityview+FailureView.swift index 4f5668c6c5..b5ed695512 100644 --- a/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/Activityview+FailureView.swift +++ b/Modules/GameEngineKit/Sources/_NewSystem/Views/Activity/Activityview+FailureView.swift @@ -15,12 +15,10 @@ extension ActivityView { // TODO(@ladislas/@hugo): Use text variables to be localization friendly VStack { Text("\(self.percentage)% de réussite !") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.largeTitle) .foregroundStyle(.teal) .padding(10) Text("Essayez à nouveau !") - // TODO: (@ui/ux) - Design System - replace with Leka font .font(.largeTitle) }