-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
🚚 (LekaApp): Rename ProfileSettings in EditProfiles
- Loading branch information
Showing
13 changed files
with
102 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 0 additions & 27 deletions
27
...LekaApp/Sources/_NEWCodeBase/Views/CaregiverSettingsView/CaregiverSettingsView+l10n.swift
This file was deleted.
Oops, something went wrong.
19 changes: 0 additions & 19 deletions
19
...p/Sources/_NEWCodeBase/Views/CarereceiverSettingsView/CarereceiverSettingsView+l10n.swift
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView+l10n.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
// Leka - iOS Monorepo | ||
// Copyright APF France handicap | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
import LocalizationKit | ||
|
||
// swiftlint:disable line_length nesting | ||
|
||
extension l10n { | ||
enum EditCaregiverView { | ||
enum AppearanceRow { | ||
static let title = LocalizedString("edit_caregiver_view.appearance_section.appearance_row.title", value: "Dark Mode", comment: "Appearance Row title") | ||
} | ||
|
||
enum AccentColorRow { | ||
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 saveButtonLabel = LocalizedString("edit_caregiver_view.save_button_label", value: "Save", comment: "Save button label of Edit Caregiver View") | ||
|
||
static let closeButtonLabel = LocalizedString("edit_caregiver_view.close_button_label", value: "Close", comment: "Close button label of Edit Caregiver View") | ||
} | ||
} | ||
|
||
// swiftlint:enable line_length nesting |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,9 +6,9 @@ import DesignKit | |
import LocalizationKit | ||
import SwiftUI | ||
|
||
// MARK: - CaregiverSettingsView | ||
// MARK: - EditCaregiverView | ||
|
||
struct CaregiverSettingsView: View { | ||
struct EditCaregiverView: View { | ||
// MARK: Internal | ||
|
||
@State var modifiedCaregiver: Caregiver | ||
|
@@ -24,7 +24,7 @@ struct CaregiverSettingsView: View { | |
|
||
Section { | ||
LabeledContent(String(l10n.CaregiverCreation.caregiverNameLabel.characters)) { | ||
TextField("Nom", text: self.$modifiedCaregiver.name) | ||
TextField("", text: self.$modifiedCaregiver.name) | ||
.multilineTextAlignment(.trailing) | ||
} | ||
} | ||
|
@@ -39,19 +39,19 @@ struct CaregiverSettingsView: View { | |
} | ||
} | ||
} | ||
.navigationTitle(String(l10n.CaregiverSettingsView.navigationTitle.characters) + self.modifiedCaregiver.name) | ||
.navigationTitle(String(l10n.EditCaregiverView.navigationTitle.characters) + self.modifiedCaregiver.name) | ||
.navigationBarTitleDisplayMode(.inline) | ||
.interactiveDismissDisabled() | ||
.toolbar { | ||
ToolbarItem(placement: .topBarLeading) { | ||
Button(String(l10n.CaregiverSettingsView.closeButtonLabel.characters)) { | ||
self.rootOwnerViewModel.isCaregiverSettingsViewPresented = false | ||
Button(String(l10n.EditCaregiverView.closeButtonLabel.characters)) { | ||
self.rootOwnerViewModel.isEditCaregiverViewPresented = false | ||
} | ||
} | ||
ToolbarItem(placement: .topBarTrailing) { | ||
Button(String(l10n.CaregiverSettingsView.saveButtonLabel.characters)) { | ||
Button(String(l10n.EditCaregiverView.saveButtonLabel.characters)) { | ||
// TODO: (@mathieu) - Add Firestore logic | ||
Check warning on line 53 in Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCaregiverView/EditCaregiverView.swift GitHub Actions / swiftlint
|
||
self.rootOwnerViewModel.isCaregiverSettingsViewPresented = false | ||
self.rootOwnerViewModel.isEditCaregiverViewPresented = false | ||
self.rootOwnerViewModel.currentCaregiver = self.modifiedCaregiver | ||
} | ||
} | ||
|
@@ -101,5 +101,5 @@ struct CaregiverSettingsView: View { | |
} | ||
|
||
#Preview { | ||
CaregiverSettingsView(modifiedCaregiver: Caregiver()) | ||
EditCaregiverView(modifiedCaregiver: Caregiver()) | ||
} |
19 changes: 19 additions & 0 deletions
19
Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView+l10n.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// Leka - iOS Monorepo | ||
// Copyright APF France handicap | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
import LocalizationKit | ||
|
||
// swiftlint:disable line_length | ||
|
||
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 saveButtonLabel = LocalizedString("edit_carereceiver_view.save_button_label", value: "Save", comment: "Save button label of Edit Carereceiver View") | ||
|
||
static let closeButtonLabel = LocalizedString("edit_carereceiver_view.close_button_label", value: "Close", comment: "Close button label of Edit Carereceiver View") | ||
} | ||
} | ||
|
||
// swiftlint:enable line_length |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,9 +6,9 @@ import DesignKit | |
import LocalizationKit | ||
import SwiftUI | ||
|
||
// MARK: - CarereceiverSettingsView | ||
// MARK: - EditCarereceiverView | ||
|
||
struct CarereceiverSettingsView: View { | ||
struct EditCarereceiverView: View { | ||
// MARK: Internal | ||
|
||
@Binding var modifiedCarereceiver: Carereceiver | ||
|
@@ -17,12 +17,14 @@ struct CarereceiverSettingsView: View { | |
NavigationStack { | ||
VStack(spacing: 40) { | ||
Form { | ||
self.avatarPickerButton | ||
.listRowBackground(Color.clear) | ||
Section { | ||
self.avatarPickerButton | ||
.listRowBackground(Color.clear) | ||
} | ||
|
||
Section { | ||
LabeledContent(String(l10n.CarereceiverCreation.carereceiverNameLabel.characters)) { | ||
TextField("Nom", text: self.$modifiedCarereceiver.name) | ||
TextField("", text: self.$modifiedCarereceiver.name) | ||
.multilineTextAlignment(.trailing) | ||
} | ||
} | ||
|
@@ -36,19 +38,19 @@ struct CarereceiverSettingsView: View { | |
} | ||
} | ||
} | ||
.navigationTitle(String(l10n.CarereceiverSettingsView.navigationTitle.characters) + self.modifiedCarereceiver.name) | ||
.navigationTitle(String(l10n.EditCarereceiverView.navigationTitle.characters) + self.modifiedCarereceiver.name) | ||
.navigationBarTitleDisplayMode(.inline) | ||
.interactiveDismissDisabled() | ||
.toolbar { | ||
ToolbarItem(placement: .topBarLeading) { | ||
Button(String(l10n.CarereceiverSettingsView.closeButtonLabel.characters)) { | ||
self.rootOwnerViewModel.isCarereceiverSettingsViewPresented = false | ||
Button(String(l10n.EditCarereceiverView.closeButtonLabel.characters)) { | ||
self.rootOwnerViewModel.isEditCarereceiverViewPresented = false | ||
} | ||
} | ||
ToolbarItem(placement: .topBarTrailing) { | ||
Button(String(l10n.CarereceiverSettingsView.saveButtonLabel.characters)) { | ||
Button(String(l10n.EditCarereceiverView.saveButtonLabel.characters)) { | ||
// TODO: (@mathieu) - Add Firestore logic | ||
Check warning on line 52 in Apps/LekaApp/Sources/_NEWCodeBase/Views/EditCarereceiverView/EditCarereceiverView.swift GitHub Actions / swiftlint
|
||
self.rootOwnerViewModel.isCarereceiverSettingsViewPresented = false | ||
self.rootOwnerViewModel.isEditCarereceiverViewPresented = false | ||
self.rootOwnerViewModel.currentCarereceiver = self.modifiedCarereceiver | ||
} | ||
} | ||
|
@@ -79,5 +81,5 @@ struct CarereceiverSettingsView: View { | |
} | ||
|
||
#Preview { | ||
CarereceiverSettingsView(modifiedCarereceiver: .constant(Carereceiver())) | ||
EditCarereceiverView(modifiedCarereceiver: .constant(Carereceiver())) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.