Skip to content

Commit

Permalink
🗑️ (TODO): Remove todos 'replace with Leka font'
Browse files Browse the repository at this point in the history
  • Loading branch information
ladislas committed Feb 8, 2024
1 parent aa6adf5 commit 17e2d02
Show file tree
Hide file tree
Showing 78 changed files with 2 additions and 123 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions Apps/LekaApp/Sources/_NEWCodeBase/Views/ConnectionView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ extension ProfessionPicker {
}
}
}
// TODO: (@ui/ux) - Design System - replace with Leka font
.font(.caption)
.buttonStyle(.bordered)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand All @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions Apps/LekaApp/Sources/_OLDCodeBase/Styles/Styles.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -100,7 +99,6 @@ struct JobPickerToggleStyle: ToggleStyle {

configuration.label
.multilineTextAlignment(.leading)
// TODO: (@ui/ux) - Design System - replace with Leka font
.font(.body)

Spacer()
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -77,15 +76,13 @@ 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)
.resizable()
.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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions Apps/LekaApp/Sources/_OLDCodeBase/Views/Game/GameView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -165,7 +164,6 @@ struct GameView: View {
value: self.textOpacity
)
}
// TODO: (@ui/ux) - Design System - replace with Leka font
.font(.largeTitle)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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()
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -49,7 +48,6 @@ struct SignupFinalStepDeprecated: View {
}
}
.multilineTextAlignment(.center)
// TODO: (@ui/ux) - Design System - replace with Leka font
.font(.body)
Spacer()
// CTA Button
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Loading

0 comments on commit 17e2d02

Please sign in to comment.