Skip to content
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

RazrabsApi now use protocol, host/scheme are private fields #3

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

RazrabsApi now use protocol, host/scheme are private fields #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion Razrabs/Razrabs.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
1C68A4BB28B43501008AE2A1 /* PRazrabsApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C68A4BA28B43501008AE2A1 /* PRazrabsApi.swift */; };
E907806528B09D6A0045F339 /* RazrabsApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E907806428B09D6A0045F339 /* RazrabsApp.swift */; };
E907806728B09D6A0045F339 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E907806628B09D6A0045F339 /* ContentView.swift */; };
E907806928B09D6D0045F339 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E907806828B09D6D0045F339 /* Assets.xcassets */; };
Expand Down Expand Up @@ -44,6 +45,7 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
1C68A4BA28B43501008AE2A1 /* PRazrabsApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PRazrabsApi.swift; sourceTree = "<group>"; };
E907806128B09D6A0045F339 /* Razrabs.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Razrabs.app; sourceTree = BUILT_PRODUCTS_DIR; };
E907806428B09D6A0045F339 /* RazrabsApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RazrabsApp.swift; sourceTree = "<group>"; };
E907806628B09D6A0045F339 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -91,6 +93,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
1C68A4B928B434F7008AE2A1 /* RazrabsApi */ = {
isa = PBXGroup;
children = (
E907808F28B09FC00045F339 /* RazrabsApi.swift */,
1C68A4BA28B43501008AE2A1 /* PRazrabsApi.swift */,
);
path = RazrabsApi;
sourceTree = "<group>";
};
E907805828B09D6A0045F339 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -155,7 +166,7 @@
E907808E28B09FB50045F339 /* Services */ = {
isa = PBXGroup;
children = (
E907808F28B09FC00045F339 /* RazrabsApi.swift */,
1C68A4B928B434F7008AE2A1 /* RazrabsApi */,
);
path = Services;
sourceTree = "<group>";
Expand Down Expand Up @@ -327,6 +338,7 @@
E907809028B09FC00045F339 /* RazrabsApi.swift in Sources */,
E90780A828B136A40045F339 /* FeedResponse.swift in Sources */,
E907806728B09D6A0045F339 /* ContentView.swift in Sources */,
1C68A4BB28B43501008AE2A1 /* PRazrabsApi.swift in Sources */,
E907806528B09D6A0045F339 /* RazrabsApp.swift in Sources */,
E907809A28B0F0470045F339 /* FeedItem.swift in Sources */,
E907809328B0AC380045F339 /* TagItem.swift in Sources */,
Expand Down Expand Up @@ -503,6 +515,7 @@
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -532,6 +545,7 @@
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
4 changes: 2 additions & 2 deletions Razrabs/Razrabs/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import SwiftUI

struct ContentView: View {
let razrabsApi: RazrabsApi
let razrabsApi: PRazrabsApi

@State var feedItems = [FeedItem]()

Expand Down Expand Up @@ -43,6 +43,6 @@ struct ContentView: View {

struct ContentView_Previews: PreviewProvider {
static var previews: some View {
ContentView(razrabsApi: .init(scheme: "https", host: "api.razrabs.ru"))
ContentView(razrabsApi: RazrabsApi(scheme: "https", host: "api.razrabs.ru"))
}
}
10 changes: 10 additions & 0 deletions Razrabs/Razrabs/Services/RazrabsApi/PRazrabsApi.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//
// PRazrabsApi.swift
// Razrabs
//
// Created by Anatoliy on 23.08.2022.
//

protocol PRazrabsApi {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

я бы назвал протокол RazrabsApi, а реализацию RazrabsApiImpl. Однобуквенные сокращения это ужасно для читаемости

func requestFeed(callback: @escaping (_ result: Result<FeedResponse, Swift.Error>) -> ())
}
6 changes: 3 additions & 3 deletions Razrabs/Razrabs/Services/RazrabsApi.swift → ...rabs/Services/RazrabsApi/RazrabsApi.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Foundation

class RazrabsApi {
let scheme: String
let host: String
final class RazrabsApi: PRazrabsApi {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

зачем final?

private let scheme: String
private let host: String
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

зачем приват?


enum Error: Swift.Error {
case responseIsNil
Expand Down