Skip to content

Commit 3a8e096

Browse files
committed
Обновил версию дизайн-системы
И подставил пикер аватарки из дизайн-системы
1 parent eb16665 commit 3a8e096

File tree

4 files changed

+8
-52
lines changed

4 files changed

+8
-52
lines changed

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
6765B2562D451771006164AB /* UIImage+toMediaFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6765B2552D451771006164AB /* UIImage+toMediaFile.swift */; };
4040
6765B2582D4544C8006164AB /* MainUserProfileScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6765B2572D4544C8006164AB /* MainUserProfileScreen.swift */; };
4141
6765B25B2D455D5C006164AB /* ProfileViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6765B25A2D455D5C006164AB /* ProfileViews.swift */; };
42-
6765B25D2D46B024006164AB /* AvatarPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6765B25C2D46B024006164AB /* AvatarPickerView.swift */; };
4342
6765B2612D46C0F6006164AB /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 6765B2602D46C0F6006164AB /* InfoPlist.xcstrings */; };
4443
6766A036284603CA0033F1E8 /* TabViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6766A035284603CA0033F1E8 /* TabViewModel.swift */; };
4544
676D5A612D48BF0700EE5E9E /* String+localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 676D5A602D48BF0700EE5E9E /* String+localized.swift */; };
@@ -131,7 +130,6 @@
131130
6765B2552D451771006164AB /* UIImage+toMediaFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+toMediaFile.swift"; sourceTree = "<group>"; };
132131
6765B2572D4544C8006164AB /* MainUserProfileScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainUserProfileScreen.swift; sourceTree = "<group>"; };
133132
6765B25A2D455D5C006164AB /* ProfileViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViews.swift; sourceTree = "<group>"; };
134-
6765B25C2D46B024006164AB /* AvatarPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarPickerView.swift; sourceTree = "<group>"; };
135133
6765B2602D46C0F6006164AB /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
136134
6766A035284603CA0033F1E8 /* TabViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewModel.swift; sourceTree = "<group>"; };
137135
676D5A602D48BF0700EE5E9E /* String+localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+localized.swift"; sourceTree = "<group>"; };
@@ -318,7 +316,6 @@
318316
children = (
319317
6798AA83280C0F7D00DB76F1 /* EditProfileScreen.swift */,
320318
6747575528113419002F0A24 /* ChangePasswordScreen.swift */,
321-
6765B25C2D46B024006164AB /* AvatarPickerView.swift */,
322319
);
323320
path = EditProfile;
324321
sourceTree = "<group>";
@@ -644,7 +641,6 @@
644641
674D0623282A9896007E75C6 /* SearchUsersScreen.swift in Sources */,
645642
67A4710D2AEED8F8004D341D /* PastEventStorage.swift in Sources */,
646643
675FB8DB2ADDB87200C9671F /* ParksMapScreen+LocationSettingReminderView.swift in Sources */,
647-
6765B25D2D46B024006164AB /* AvatarPickerView.swift in Sources */,
648644
6747575628113419002F0A24 /* ChangePasswordScreen.swift in Sources */,
649645
67515699283FEC3100501346 /* PickedImagesGrid.swift in Sources */,
650646
67FBF64F28338A2E008A7968 /* EventDetailsScreen.swift in Sources */,
@@ -873,7 +869,7 @@
873869
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
874870
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
875871
CODE_SIGN_STYLE = Automatic;
876-
CURRENT_PROJECT_VERSION = 4;
872+
CURRENT_PROJECT_VERSION = 5;
877873
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
878874
DEVELOPMENT_TEAM = CR68PP2Z3F;
879875
ENABLE_PREVIEWS = YES;
@@ -923,7 +919,7 @@
923919
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
924920
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
925921
CODE_SIGN_STYLE = Automatic;
926-
CURRENT_PROJECT_VERSION = 4;
922+
CURRENT_PROJECT_VERSION = 5;
927923
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
928924
DEVELOPMENT_TEAM = CR68PP2Z3F;
929925
ENABLE_PREVIEWS = YES;
@@ -1021,7 +1017,7 @@
10211017
repositoryURL = "https://github.com/OlegEremenko991/SWDesignSystem";
10221018
requirement = {
10231019
kind = upToNextMajorVersion;
1024-
minimumVersion = 1.8.0;
1020+
minimumVersion = 1.9.0;
10251021
};
10261022
};
10271023
67F9534D2964A5700077DFDC /* XCRemoteSwiftPackageReference "ImagePicker" */ = {

SwiftUI-WorkoutApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SwiftUI-WorkoutApp/Screens/Profile/EditProfile/AvatarPickerView.swift

Lines changed: 0 additions & 40 deletions
This file was deleted.

SwiftUI-WorkoutApp/Screens/Profile/EditProfile/EditProfileScreen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private extension EditProfileScreen {
110110
.buttonStyle(SWButtonStyle(mode: .tinted, size: .large, maxWidth: nil))
111111
.padding(.bottom, 8)
112112
.sheet(isPresented: $showImagePicker) {
113-
AvatarPickerView {
113+
SWImagePicker {
114114
newAvatarImageModel = .init(uiImage: $0)
115115
userForm.image = $0.toMediaFile()
116116
}

0 commit comments

Comments
 (0)