Skip to content

Доработки #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 4, 2025
Merged

Доработки #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c49376e
Рефактор сетевого слоя
easydev991 Feb 3, 2025
7f3f21a
Новый пикер фотографий для iOS 16+ (#275)
easydev991 Feb 4, 2025
410b0fc
Рефактор
easydev991 Feb 4, 2025
6f12933
Добавил поддержку диплинков: swparks
easydev991 Feb 4, 2025
3456377
Бейдж с количеством непрочитанных сообщений в таббаре (#276)
easydev991 Feb 4, 2025
0864b94
Небольшие правки
easydev991 Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions SwiftUI-WorkoutApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
67138D922974851F00BBF450 /* XCUIElement+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D912974851F00BBF450 /* XCUIElement+.swift */; };
67138D942974854F00BBF450 /* XCTestCase+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D932974854F00BBF450 /* XCTestCase+.swift */; };
6718BCA42AD5327F002846A6 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6718BCA32AD5327F002846A6 /* SnapshotHelper.swift */; };
671B4AE92D4F623100286996 /* ModernPickedImagesGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 671B4AE82D4F623100286996 /* ModernPickedImagesGrid.swift */; };
671B4AEB2D4F683E00286996 /* ImagePickerViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 671B4AEA2D4F683E00286996 /* ImagePickerViews.swift */; };
671D7DEC28210D2F0068E728 /* EmptyContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 671D7DEB28210D2F0068E728 /* EmptyContentView.swift */; };
67419ACF282E70B9004F5339 /* ParksListScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67419ACE282E70B9004F5339 /* ParksListScreen.swift */; };
6747575628113419002F0A24 /* ChangePasswordScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6747575528113419002F0A24 /* ChangePasswordScreen.swift */; };
Expand All @@ -34,6 +36,7 @@
67627750283A3A54009C203F /* JournalsListScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6762774F283A3A54009C203F /* JournalsListScreen.swift */; };
67627755283A4C77009C203F /* JournalEntriesScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67627754283A4C77009C203F /* JournalEntriesScreen.swift */; };
6762775B283A87AD009C203F /* JournalCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6762775A283A87AD009C203F /* JournalCell.swift */; };
6764D6382D52009F00699007 /* DialogsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6764D6372D52009F00699007 /* DialogsViewModel.swift */; };
6765B2562D451771006164AB /* UIImage+toMediaFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6765B2552D451771006164AB /* UIImage+toMediaFile.swift */; };
6765B2582D4544C8006164AB /* MainUserProfileScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6765B2572D4544C8006164AB /* MainUserProfileScreen.swift */; };
6765B25B2D455D5C006164AB /* ProfileViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6765B25A2D455D5C006164AB /* ProfileViews.swift */; };
Expand Down Expand Up @@ -97,6 +100,8 @@
67138D912974851F00BBF450 /* XCUIElement+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIElement+.swift"; sourceTree = "<group>"; };
67138D932974854F00BBF450 /* XCTestCase+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTestCase+.swift"; sourceTree = "<group>"; };
6718BCA32AD5327F002846A6 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
671B4AE82D4F623100286996 /* ModernPickedImagesGrid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModernPickedImagesGrid.swift; sourceTree = "<group>"; };
671B4AEA2D4F683E00286996 /* ImagePickerViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePickerViews.swift; sourceTree = "<group>"; };
671D7DEB28210D2F0068E728 /* EmptyContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyContentView.swift; sourceTree = "<group>"; };
67419ACE282E70B9004F5339 /* ParksListScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParksListScreen.swift; sourceTree = "<group>"; };
6747575528113419002F0A24 /* ChangePasswordScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangePasswordScreen.swift; sourceTree = "<group>"; };
Expand All @@ -119,6 +124,7 @@
6762774F283A3A54009C203F /* JournalsListScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JournalsListScreen.swift; sourceTree = "<group>"; };
67627754283A4C77009C203F /* JournalEntriesScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JournalEntriesScreen.swift; sourceTree = "<group>"; };
6762775A283A87AD009C203F /* JournalCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JournalCell.swift; sourceTree = "<group>"; };
6764D6372D52009F00699007 /* DialogsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DialogsViewModel.swift; sourceTree = "<group>"; };
6765B2552D451771006164AB /* UIImage+toMediaFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+toMediaFile.swift"; sourceTree = "<group>"; };
6765B2572D4544C8006164AB /* MainUserProfileScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainUserProfileScreen.swift; sourceTree = "<group>"; };
6765B25A2D455D5C006164AB /* ProfileViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViews.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -223,6 +229,7 @@
67419AD5282E8E7C004F5339 /* Messages */ = {
isa = PBXGroup;
children = (
6764D6372D52009F00699007 /* DialogsViewModel.swift */,
67D916802838E2460098D3CB /* DialogsListScreen.swift */,
67D916852838F0DD0098D3CB /* DialogScreen.swift */,
);
Expand Down Expand Up @@ -265,6 +272,8 @@
children = (
67515698283FEC3100501346 /* PickedImagesGrid.swift */,
67A079F12A758E7D005EAF70 /* PickedPhotoView.swift */,
671B4AE82D4F623100286996 /* ModernPickedImagesGrid.swift */,
671B4AEA2D4F683E00286996 /* ImagePickerViews.swift */,
);
path = ImagePicker;
sourceTree = "<group>";
Expand Down Expand Up @@ -609,9 +618,11 @@
67419ACF282E70B9004F5339 /* ParksListScreen.swift in Sources */,
67EA685C2A71A99700697C88 /* PhotoDetailScreen.swift in Sources */,
674DF0402B11257D00828016 /* NavigationLink+.swift in Sources */,
671B4AEB2D4F683E00286996 /* ImagePickerViews.swift in Sources */,
67BD2D012AF7D21B00F44064 /* ParksManager.swift in Sources */,
6705E7EE283B703400DABCC8 /* JournalSettingsScreen.swift in Sources */,
6798AA40280AEDC900DB76F1 /* RootScreen.swift in Sources */,
671B4AE92D4F623100286996 /* ModernPickedImagesGrid.swift in Sources */,
675EC64F2814126800C2E229 /* TextEntryScreen.swift in Sources */,
674D0623282A9896007E75C6 /* SearchUsersScreen.swift in Sources */,
67A4710D2AEED8F8004D341D /* PastEventStorage.swift in Sources */,
Expand All @@ -638,6 +649,7 @@
6798AA84280C0F7D00DB76F1 /* EditProfileScreen.swift in Sources */,
6798AA73280B43FE00DB76F1 /* LoginScreen.swift in Sources */,
67D9169628396C1E0098D3CB /* SendMessageScreen.swift in Sources */,
6764D6382D52009F00699007 /* DialogsViewModel.swift in Sources */,
6747575928128603002F0A24 /* ParkDetailScreen.swift in Sources */,
675EC6572815433600C2E229 /* UsersListScreen.swift in Sources */,
675EC65F2815532800C2E229 /* EventFormScreen.swift in Sources */,
Expand Down Expand Up @@ -844,7 +856,7 @@
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
DEVELOPMENT_TEAM = CR68PP2Z3F;
ENABLE_PREVIEWS = YES;
Expand All @@ -855,6 +867,7 @@
INFOPLIST_KEY_CFBundleDisplayName = "SW Площадки";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Для отображения спортивных площадок поблизости";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Для выбора фото профиля требуется доступ к галерее";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down Expand Up @@ -894,7 +907,7 @@
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
DEVELOPMENT_TEAM = CR68PP2Z3F;
ENABLE_PREVIEWS = YES;
Expand All @@ -905,6 +918,7 @@
INFOPLIST_KEY_CFBundleDisplayName = "SW Площадки";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Для отображения спортивных площадок поблизости";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Для выбора фото профиля требуется доступ к галерее";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down
36 changes: 24 additions & 12 deletions SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/BodyMaker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import Foundation

/// Делает `body` для запроса
public enum BodyMaker {
public struct Parameter<T: Hashable & RawRepresentable> where T.RawValue == String {
struct Parameter {
let key: String
let value: String

public init(from element: Dictionary<T, String>.Element) {
self.key = element.key.rawValue
init(from element: Dictionary<String, String>.Element) {
self.key = element.key
self.value = element.value
}

Expand All @@ -18,8 +18,8 @@ public enum BodyMaker {
}

/// Делает `body` из словаря
public static func makeBody(
with parameters: [Parameter<some Hashable & RawRepresentable>]
static func makeBody(
with parameters: [Parameter]
) -> Data? {
parameters.isEmpty
? nil
Expand All @@ -30,11 +30,11 @@ public enum BodyMaker {
}

/// Делает `body` из словаря и медиа-файлов
public static func makeBodyWithMultipartForm(
with parameters: [Parameter<some Hashable & RawRepresentable>],
and media: [MediaFile]?
static func makeBodyWithMultipartForm(
parameters: [Parameter],
media: [MediaFile]?,
boundary: String
) -> Data? {
let boundary = "FFF"
let lineBreak = "\r\n"
var body = Data()
if !parameters.isEmpty {
Expand All @@ -56,13 +56,25 @@ public enum BodyMaker {
if !body.isEmpty {
body.append("--\(boundary)--\(lineBreak)")
return body
} else {
return nil
}
return nil
}
}

public extension BodyMaker {
/// Модель для последующего создания тела запроса
struct Parts {
let parameters: [Parameter]
let mediaFiles: [MediaFile]?

public init(_ parameters: [String: String], _ mediaFiles: [MediaFile]?) {
self.parameters = parameters.map(Parameter.init)
self.mediaFiles = mediaFiles
}
}

/// Медиа-файл для отправки на сервер
public struct MediaFile: Codable, Equatable, Sendable {
struct MediaFile: Codable, Equatable, Sendable {
public let key: String
public let filename: String
public let data: Data
Expand Down
46 changes: 34 additions & 12 deletions SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/RequestComponents.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ public struct RequestComponents {
let queryItems: [URLQueryItem]
let httpMethod: HTTPMethod
let hasMultipartFormData: Bool
let body: Data?
let bodyParts: BodyMaker.Parts?
let boundary: String
let token: String?

/// Инициализатор
Expand All @@ -14,21 +15,24 @@ public struct RequestComponents {
/// - queryItems: Параметры `query`, по умолчанию отсутствуют
/// - httpMethod: Метод запроса
/// - hasMultipartFormData: Есть ли в запросе файлы для отправки (в нашем случае картинки), по умолчанию `false`
/// - body: Тело запроса, по умолчанию `nil`
/// - bodyParts: Данные для тела запроса, по умолчанию `nil`
/// - boundary: `Boundary` для `body`, по умолчанию `UUID().uuidString`
/// - token: Токен для авторизации, по умолчанию `nil`
public init(
path: String,
queryItems: [URLQueryItem] = [],
httpMethod: HTTPMethod,
hasMultipartFormData: Bool = false,
body: Data? = nil,
bodyParts: BodyMaker.Parts? = nil,
boundary: String = UUID().uuidString,
token: String? = nil
) {
self.path = path
self.queryItems = queryItems
self.httpMethod = httpMethod
self.hasMultipartFormData = hasMultipartFormData
self.body = body
self.bodyParts = bodyParts
self.boundary = boundary
self.token = token
}

Expand All @@ -50,19 +54,37 @@ extension RequestComponents {
guard let url else { return nil }
var request = URLRequest(url: url)
request.httpMethod = httpMethod.rawValue
request.httpBody = body

var allHeaders = [HTTPHeaderField]()
// TODO: генерировать boundary в одном месте (вместо FFF)
if let body {
allHeaders.append(.init(key: "Content-Length", value: "\(body.count)"))
}
if hasMultipartFormData {
allHeaders.append(.init(key: "Content-Type", value: "multipart/form-data; boundary=FFF"))
var httpBodyData: Data?

if let bodyParts {
let parameters = bodyParts.parameters
if hasMultipartFormData {
httpBodyData = BodyMaker.makeBodyWithMultipartForm(
parameters: parameters,
media: bodyParts.mediaFiles,
boundary: boundary
)
allHeaders.append(.init(
key: "Content-Type",
value: "multipart/form-data; boundary=\(boundary)"
))
} else {
httpBodyData = BodyMaker.makeBody(with: parameters)
}
if let httpBodyData {
allHeaders.append(.init(key: "Content-Length", value: "\(httpBodyData.count)"))
}
}

if let token, !token.isEmpty {
allHeaders.append(.init(key: "Authorization", value: "Basic \(token)"))
}
request.allHTTPHeaderFields = Dictionary(uniqueKeysWithValues: allHeaders.map { ($0.key, $0.value) })
request.allHTTPHeaderFields = Dictionary(
uniqueKeysWithValues: allHeaders.map { ($0.key, $0.value) }
)
request.httpBody = httpBodyData
return request
}
}
Loading