Skip to content

Commit 2e5e0d7

Browse files
author
Vadym Kurachevskyi
authored
Merge pull request #20 from dsay/feature/clean_code
clean code
2 parents dc965f8 + 9e11cec commit 2e5e0d7

File tree

19 files changed

+281
-199
lines changed

19 files changed

+281
-199
lines changed

‎Example/Example.xcodeproj/project.pbxproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
isa = PBXProject;
191191
attributes = {
192192
LastSwiftUpdateCheck = 0830;
193-
LastUpgradeCheck = 1030;
193+
LastUpgradeCheck = 1250;
194194
ORGANIZATIONNAME = UserReport;
195195
TargetAttributes = {
196196
110746E21F4492E700150955 = {
@@ -320,6 +320,7 @@
320320
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
321321
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
322322
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
323+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
323324
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
324325
CLANG_WARN_STRICT_PROTOTYPES = YES;
325326
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -344,7 +345,7 @@
344345
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
345346
GCC_WARN_UNUSED_FUNCTION = YES;
346347
GCC_WARN_UNUSED_VARIABLE = YES;
347-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
348+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
348349
MTL_ENABLE_DEBUG_INFO = YES;
349350
ONLY_ACTIVE_ARCH = YES;
350351
SDKROOT = iphoneos;
@@ -379,6 +380,7 @@
379380
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
380381
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
381382
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
383+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
382384
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
383385
CLANG_WARN_STRICT_PROTOTYPES = YES;
384386
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -397,7 +399,7 @@
397399
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
398400
GCC_WARN_UNUSED_FUNCTION = YES;
399401
GCC_WARN_UNUSED_VARIABLE = YES;
400-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
402+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
401403
MTL_ENABLE_DEBUG_INFO = NO;
402404
SDKROOT = iphoneos;
403405
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -413,7 +415,7 @@
413415
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
414416
DEVELOPMENT_TEAM = "";
415417
INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist";
416-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
418+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
417419
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
418420
PRODUCT_BUNDLE_IDENTIFIER = com.userreport.example;
419421
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -430,7 +432,7 @@
430432
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
431433
DEVELOPMENT_TEAM = "";
432434
INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist";
433-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
435+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
434436
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
435437
PRODUCT_BUNDLE_IDENTIFIER = com.userreport.example;
436438
PRODUCT_NAME = "$(TARGET_NAME)";

‎Example/Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Example/Example.xcodeproj/project.xcworkspace/xcuserdata/dmitriy.xcuserdatad/UserInterfaceState.xcuserstate

18.8 KB
Binary file not shown.

‎Example_Objective-C/Example_Objective-C.xcodeproj/project.pbxproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
116C89472305A85B003E17E5 /* Project object */ = {
146146
isa = PBXProject;
147147
attributes = {
148-
LastUpgradeCheck = 1030;
148+
LastUpgradeCheck = 1250;
149149
ORGANIZATIONNAME = UserReport;
150150
TargetAttributes = {
151151
116C894E2305A85B003E17E5 = {
@@ -245,6 +245,7 @@
245245
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
246246
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
247247
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
248+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
248249
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
249250
CLANG_WARN_STRICT_PROTOTYPES = YES;
250251
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -270,7 +271,7 @@
270271
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
271272
GCC_WARN_UNUSED_FUNCTION = YES;
272273
GCC_WARN_UNUSED_VARIABLE = YES;
273-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
274+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
274275
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
275276
MTL_FAST_MATH = YES;
276277
ONLY_ACTIVE_ARCH = YES;
@@ -304,6 +305,7 @@
304305
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
305306
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
306307
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
308+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
307309
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
308310
CLANG_WARN_STRICT_PROTOTYPES = YES;
309311
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -323,7 +325,7 @@
323325
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
324326
GCC_WARN_UNUSED_FUNCTION = YES;
325327
GCC_WARN_UNUSED_VARIABLE = YES;
326-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
328+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
327329
MTL_ENABLE_DEBUG_INFO = NO;
328330
MTL_FAST_MATH = YES;
329331
SDKROOT = iphoneos;

‎UserReport/UserReport/Helpers/HashingHelper.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ internal extension Data {
6060
// setup data variable to hold hashed value
6161
var digest = Data(count: Int(type.length))
6262

63-
_ = digest.withUnsafeMutableBytes{ digestBytes -> UInt8 in
63+
_ = digest.withUnsafeMutableBytes { digestBytes -> UInt8 in
64+
6465
self.withUnsafeBytes { messageBytes -> UInt8 in
66+
6567
if let mb = messageBytes.baseAddress, let db = digestBytes.bindMemory(to: UInt8.self).baseAddress {
6668
let length = CC_LONG(self.count)
6769
switch type {
@@ -70,8 +72,10 @@ internal extension Data {
7072
case .sha256: CC_SHA256(mb, length, db)
7173
}
7274
}
75+
7376
return 0
7477
}
78+
7579
}
7680

7781
// return the value based on the specified output type.

‎UserReport/UserReport/Models/Invitation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ internal struct Invitation {
2525
/**
2626
* An extension to initialize an object through a dictionary
2727
*/
28-
extension Invitation: Serialization {
28+
extension Invitation: SerializableObject {
2929

3030
// MARK: - Init
3131

‎UserReport/UserReport/Models/MediaSettings.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ internal struct MediaSettings {
2626
/**
2727
* An extension to initialize an object through a dictionary
2828
*/
29-
extension MediaSettings: Serialization {
29+
extension MediaSettings: SerializableObject {
3030

3131
// MARK: - Init
3232

‎UserReport/UserReport/Models/QuarantineResponse.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ internal struct QuarantineResponse {
2222
var isInLocal: Bool!
2323
}
2424

25-
extension QuarantineResponse: Serialization {
25+
extension QuarantineResponse: SerializableObject {
2626

2727
init(dict: [String: Any?]) throws {
2828

2929
guard let inGlobalTill = dict["inGlobalTill"] as? String else {
3030
throw URError.responseDataNotFoundKey("inGlobalTill")
3131
}
32+
3233
self.inGlobalTill = inGlobalTill
3334

3435
if let isInGlobal = dict["isInGlobal"] as? Bool {

‎UserReport/UserReport/Models/Serialization.swift renamed to ‎UserReport/UserReport/Models/SerializableObject.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
import Foundation
66

77
/// Protocol use for generic in Networking for serialization models
8-
protocol Serialization {
8+
protocol SerializableObject {
9+
910
init(dict: [String: Any?]) throws
1011
}
1112

1213

1314
/// Use this struct when you expect empty response
14-
struct Empty: Serialization {
15+
struct Empty: SerializableObject {
16+
1517
init(dict: [String: Any?]) throws {}
1618
}

‎UserReport/UserReport/Models/UserReportUser.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class UserReportUser: NSObject {
4545
return advertisingId
4646
}
4747

48-
isTrackingEnabled(){(isTrackingAllowed: Bool) -> Void in
48+
isTrackingEnabled() { isTrackingAllowed -> Void in
4949
if (isTrackingAllowed) {
5050
/// By default iOS 13.3 simulator always returns idfa as '00000000-0000-0000-000000000000'
5151
/// https://forums.developer.apple.com/thread/124604

0 commit comments

Comments
 (0)