Skip to content

Commit 17e0f15

Browse files
ddanilyukddanilyuk
authored
Merge pull request #20 from ddanilyuk/release/1.1.1
Release/1.1.1
2 parents c35d18f + 947d42e commit 17e0f15

File tree

16 files changed

+387
-400
lines changed

16 files changed

+387
-400
lines changed

‎KPIHubIOS.xcodeproj/project.pbxproj

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
5F79DEB8284EB99C0040C14A /* GroupResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F79DEB7284EB99C0040C14A /* GroupResponse.swift */; };
9999
5F7B0BE4285B717800F8FB4C /* GroupRozkladHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F7B0BE3285B717800F8FB4C /* GroupRozkladHeaderView.swift */; };
100100
5F7C5904285B6D5A00900A90 /* View+If.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F7C5903285B6D5A00900A90 /* View+If.swift */; };
101-
5F7C5906285B6D8400900A90 /* GroupRozkladAnimationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F7C5905285B6D8400900A90 /* GroupRozkladAnimationViewModel.swift */; };
102101
5F856A3E286471AE00AB63AC /* Shape+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F856A3D286471AE00AB63AC /* Shape+Ext.swift */; };
103102
5F856A412864727000AB63AC /* CurrentDateClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F856A402864727000AB63AC /* CurrentDateClient.swift */; };
104103
5F97B3BF283677C200350368 /* KPIHubIOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F97B3BE283677C200350368 /* KPIHubIOSApp.swift */; };
@@ -113,7 +112,6 @@
113112
5F97F121284E200900DB0576 /* EditLessonTeachersStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F97F120284E200800DB0576 /* EditLessonTeachersStore.swift */; };
114113
5F97F123284E201300DB0576 /* EditLessonTeachersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F97F122284E201300DB0576 /* EditLessonTeachersView.swift */; };
115114
5FA2AC04284E30B50041FE74 /* Color+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FA2AC03284E30B50041FE74 /* Color+Extension.swift */; };
116-
5FA65DDC286A4C370048182C /* TCACoordinators in Frameworks */ = {isa = PBXBuildFile; productRef = 5FA65DDB286A4C370048182C /* TCACoordinators */; };
117115
5FD570B5283680DA00D8E869 /* Routes in Frameworks */ = {isa = PBXBuildFile; productRef = 5FD570B4283680DA00D8E869 /* Routes */; };
118116
5FDFBE27284D46FD007E9F3A /* CampusClientState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FDFBE26284D46FD007E9F3A /* CampusClientState.swift */; };
119117
5FDFBE2A284D48A2007E9F3A /* RozkladClientState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FDFBE29284D48A2007E9F3A /* RozkladClientState.swift */; };
@@ -136,8 +134,10 @@
136134
DB27C6E228D67B1500F4FA1B /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = DB27C6E128D67B1500F4FA1B /* FirebaseAnalytics */; };
137135
DB27C6E428D67B1500F4FA1B /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = DB27C6E328D67B1500F4FA1B /* FirebaseCrashlytics */; };
138136
DB27C6E628D67B1500F4FA1B /* FirebasePerformance in Frameworks */ = {isa = PBXBuildFile; productRef = DB27C6E528D67B1500F4FA1B /* FirebasePerformance */; };
139-
DB534FD228E2554700BB6BC6 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = DB534FD128E2554700BB6BC6 /* ComposableArchitecture */; };
137+
DB66277828EB9604006EBA99 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = DB66277728EB9604006EBA99 /* ComposableArchitecture */; };
138+
DB66277A28EB9604006EBA99 /* Dependencies in Frameworks */ = {isa = PBXBuildFile; productRef = DB66277928EB9604006EBA99 /* Dependencies */; };
140139
DB7FAD5228E24AF400963C84 /* Analytics+Campus.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB7FAD5128E24AF400963C84 /* Analytics+Campus.swift */; };
140+
DB8A517128EE15F100A6D939 /* TCACoordinators in Frameworks */ = {isa = PBXBuildFile; productRef = DB8A517028EE15F100A6D939 /* TCACoordinators */; };
141141
DBD22F4E28D67E2C004C5CAC /* AnalyticsClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBD22F4D28D67E2C004C5CAC /* AnalyticsClient.swift */; };
142142
DBD22F5028D68AAA004C5CAC /* Analytics+Group.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBD22F4F28D68AAA004C5CAC /* Analytics+Group.swift */; };
143143
DBD22F5228D70F75004C5CAC /* UserProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBD22F5128D70F75004C5CAC /* UserProperty.swift */; };
@@ -266,7 +266,6 @@
266266
5F79DEB7284EB99C0040C14A /* GroupResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupResponse.swift; sourceTree = "<group>"; };
267267
5F7B0BE3285B717800F8FB4C /* GroupRozkladHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupRozkladHeaderView.swift; sourceTree = "<group>"; };
268268
5F7C5903285B6D5A00900A90 /* View+If.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+If.swift"; sourceTree = "<group>"; };
269-
5F7C5905285B6D8400900A90 /* GroupRozkladAnimationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupRozkladAnimationViewModel.swift; sourceTree = "<group>"; };
270269
5F856A3D286471AE00AB63AC /* Shape+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Shape+Ext.swift"; sourceTree = "<group>"; };
271270
5F856A402864727000AB63AC /* CurrentDateClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentDateClient.swift; sourceTree = "<group>"; };
272271
5F97B3BB283677C200350368 /* KPIHubIOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KPIHubIOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -325,10 +324,11 @@
325324
5F28FB8D2858D55B00579A75 /* KeychainAccess in Frameworks */,
326325
DB27C6E228D67B1500F4FA1B /* FirebaseAnalytics in Frameworks */,
327326
DB27C6E428D67B1500F4FA1B /* FirebaseCrashlytics in Frameworks */,
327+
DB66277A28EB9604006EBA99 /* Dependencies in Frameworks */,
328328
5FD570B5283680DA00D8E869 /* Routes in Frameworks */,
329-
5FA65DDC286A4C370048182C /* TCACoordinators in Frameworks */,
330329
DB27C6E628D67B1500F4FA1B /* FirebasePerformance in Frameworks */,
331-
DB534FD228E2554700BB6BC6 /* ComposableArchitecture in Frameworks */,
330+
DB66277828EB9604006EBA99 /* ComposableArchitecture in Frameworks */,
331+
DB8A517128EE15F100A6D939 /* TCACoordinators in Frameworks */,
332332
B9921FEC72B198F4A63E3767 /* Pods_KPIHubIOS.framework in Frameworks */,
333333
);
334334
runOnlyForDeploymentPostprocessing = 0;
@@ -522,7 +522,6 @@
522522
5F137EFC28440DF500514263 /* GroupRozkladStore.swift */,
523523
5F198F5C28704DE300D13782 /* GroupRozkladSection.swift */,
524524
5F137EFE28440DFD00514263 /* GroupRozkladView.swift */,
525-
5F7C5905285B6D8400900A90 /* GroupRozkladAnimationViewModel.swift */,
526525
5F5F46442849005300202DA5 /* Subviews */,
527526
5F5F4628284569CC00202DA5 /* Cell */,
528527
);
@@ -1084,11 +1083,12 @@
10841083
packageProductDependencies = (
10851084
5FD570B4283680DA00D8E869 /* Routes */,
10861085
5F28FB8C2858D55B00579A75 /* KeychainAccess */,
1087-
5FA65DDB286A4C370048182C /* TCACoordinators */,
10881086
DB27C6E128D67B1500F4FA1B /* FirebaseAnalytics */,
10891087
DB27C6E328D67B1500F4FA1B /* FirebaseCrashlytics */,
10901088
DB27C6E528D67B1500F4FA1B /* FirebasePerformance */,
1091-
DB534FD128E2554700BB6BC6 /* ComposableArchitecture */,
1089+
DB66277728EB9604006EBA99 /* ComposableArchitecture */,
1090+
DB66277928EB9604006EBA99 /* Dependencies */,
1091+
DB8A517028EE15F100A6D939 /* TCACoordinators */,
10921092
);
10931093
productName = KPIHubIOS;
10941094
productReference = 5F97B3BB283677C200350368 /* KPIHubIOS.app */;
@@ -1165,10 +1165,10 @@
11651165
);
11661166
mainGroup = 5F97B3B2283677C200350368;
11671167
packageReferences = (
1168-
5F137EAC28439EA100514263 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */,
11691168
5F28FB8B2858D55A00579A75 /* XCRemoteSwiftPackageReference "KeychainAccess" */,
1170-
5FA65DDA286A4C370048182C /* XCRemoteSwiftPackageReference "TCACoordinators" */,
11711169
DB27C6E028D67B1500F4FA1B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
1170+
DB66277628EB9604006EBA99 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */,
1171+
DB8A516F28EE15F100A6D939 /* XCRemoteSwiftPackageReference "TCACoordinators" */,
11721172
);
11731173
productRefGroup = 5F97B3BC283677C200350368 /* Products */;
11741174
projectDirPath = "";
@@ -1394,7 +1394,6 @@
13941394
5F137EFF28440DFD00514263 /* GroupRozkladView.swift in Sources */,
13951395
5F5F464A284900C200202DA5 /* GroupRozkladDayPicker.swift in Sources */,
13961396
5F6712512865FB8600A57E10 /* LessonDetailsSectionView.swift in Sources */,
1397-
5F7C5906285B6D8400900A90 /* GroupRozkladAnimationViewModel.swift in Sources */,
13981397
5F667CFA284E3E78006D3AB7 /* LessonDetailsLocationsSection.swift in Sources */,
13991398
5F5F463D284814E800202DA5 /* Lesson.swift in Sources */,
14001399
5F28FB902858D65500579A75 /* KeychainClient.swift in Sources */,
@@ -1526,7 +1525,7 @@
15261525
ASSETCATALOG_COMPILER_APPICON_NAME = "$(KPIHubIOS_APP_ICON)";
15271526
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
15281527
CODE_SIGN_STYLE = Automatic;
1529-
CURRENT_PROJECT_VERSION = 3;
1528+
CURRENT_PROJECT_VERSION = 5;
15301529
DEVELOPMENT_ASSET_PATHS = "\"KPIHubIOS/Preview Content\"";
15311530
DEVELOPMENT_TEAM = M92VXVU7J9;
15321531
ENABLE_PREVIEWS = YES;
@@ -1542,7 +1541,7 @@
15421541
"$(inherited)",
15431542
"@executable_path/Frameworks",
15441543
);
1545-
MARKETING_VERSION = 1.1.0;
1544+
MARKETING_VERSION = 1.1.1;
15461545
PRODUCT_BUNDLE_IDENTIFIER = com.ddanilyuk.KPIHubIOS;
15471546
PRODUCT_NAME = "$(TARGET_NAME)";
15481547
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1659,7 +1658,7 @@
16591658
ASSETCATALOG_COMPILER_APPICON_NAME = "$(KPIHubIOS_APP_ICON)";
16601659
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
16611660
CODE_SIGN_STYLE = Automatic;
1662-
CURRENT_PROJECT_VERSION = 3;
1661+
CURRENT_PROJECT_VERSION = 5;
16631662
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
16641663
DEVELOPMENT_ASSET_PATHS = "\"KPIHubIOS/Preview Content\"";
16651664
DEVELOPMENT_TEAM = M92VXVU7J9;
@@ -1677,7 +1676,7 @@
16771676
"$(inherited)",
16781677
"@executable_path/Frameworks",
16791678
);
1680-
MARKETING_VERSION = 1.1.0;
1679+
MARKETING_VERSION = 1.1.1;
16811680
PRODUCT_BUNDLE_IDENTIFIER = com.ddanilyuk.KPIHubIOS.development;
16821681
PRODUCT_NAME = "$(TARGET_NAME)";
16831682
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1856,7 +1855,7 @@
18561855
ASSETCATALOG_COMPILER_APPICON_NAME = "$(KPIHubIOS_APP_ICON)";
18571856
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
18581857
CODE_SIGN_STYLE = Automatic;
1859-
CURRENT_PROJECT_VERSION = 3;
1858+
CURRENT_PROJECT_VERSION = 5;
18601859
DEVELOPMENT_ASSET_PATHS = "\"KPIHubIOS/Preview Content\"";
18611860
DEVELOPMENT_TEAM = M92VXVU7J9;
18621861
ENABLE_PREVIEWS = YES;
@@ -1872,7 +1871,7 @@
18721871
"$(inherited)",
18731872
"@executable_path/Frameworks",
18741873
);
1875-
MARKETING_VERSION = 1.1.0;
1874+
MARKETING_VERSION = 1.1.1;
18761875
PRODUCT_BUNDLE_IDENTIFIER = com.ddanilyuk.KPIHubIOS.development;
18771876
PRODUCT_NAME = "$(TARGET_NAME)";
18781877
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1888,7 +1887,7 @@
18881887
ASSETCATALOG_COMPILER_APPICON_NAME = "$(KPIHubIOS_APP_ICON)";
18891888
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
18901889
CODE_SIGN_STYLE = Automatic;
1891-
CURRENT_PROJECT_VERSION = 3;
1890+
CURRENT_PROJECT_VERSION = 5;
18921891
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
18931892
DEVELOPMENT_ASSET_PATHS = "\"KPIHubIOS/Preview Content\"";
18941893
DEVELOPMENT_TEAM = M92VXVU7J9;
@@ -1906,7 +1905,7 @@
19061905
"$(inherited)",
19071906
"@executable_path/Frameworks",
19081907
);
1909-
MARKETING_VERSION = 1.1.0;
1908+
MARKETING_VERSION = 1.1.1;
19101909
PRODUCT_BUNDLE_IDENTIFIER = com.ddanilyuk.KPIHubIOS;
19111910
PRODUCT_NAME = "$(TARGET_NAME)";
19121911
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -2045,14 +2044,6 @@
20452044
/* End XCConfigurationList section */
20462045

20472046
/* Begin XCRemoteSwiftPackageReference section */
2048-
5F137EAC28439EA100514263 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */ = {
2049-
isa = XCRemoteSwiftPackageReference;
2050-
repositoryURL = "https://github.com/pointfreeco/swift-composable-architecture";
2051-
requirement = {
2052-
branch = "protocol-beta";
2053-
kind = branch;
2054-
};
2055-
};
20562047
5F28FB8B2858D55A00579A75 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
20572048
isa = XCRemoteSwiftPackageReference;
20582049
repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess";
@@ -2061,20 +2052,28 @@
20612052
minimumVersion = 4.2.0;
20622053
};
20632054
};
2064-
5FA65DDA286A4C370048182C /* XCRemoteSwiftPackageReference "TCACoordinators" */ = {
2055+
DB27C6E028D67B1500F4FA1B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
20652056
isa = XCRemoteSwiftPackageReference;
2066-
repositoryURL = "https://github.com/johnpatrickmorgan/TCACoordinators";
2057+
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
20672058
requirement = {
20682059
kind = upToNextMajorVersion;
2069-
minimumVersion = 0.2.0;
2060+
minimumVersion = 9.0.0;
20702061
};
20712062
};
2072-
DB27C6E028D67B1500F4FA1B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
2063+
DB66277628EB9604006EBA99 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */ = {
20732064
isa = XCRemoteSwiftPackageReference;
2074-
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
2065+
repositoryURL = "https://github.com/pointfreeco/swift-composable-architecture";
20752066
requirement = {
2076-
kind = upToNextMajorVersion;
2077-
minimumVersion = 9.0.0;
2067+
branch = "protocol-beta";
2068+
kind = branch;
2069+
};
2070+
};
2071+
DB8A516F28EE15F100A6D939 /* XCRemoteSwiftPackageReference "TCACoordinators" */ = {
2072+
isa = XCRemoteSwiftPackageReference;
2073+
repositoryURL = "https://github.com/johnpatrickmorgan/TCACoordinators";
2074+
requirement = {
2075+
branch = main;
2076+
kind = branch;
20782077
};
20792078
};
20802079
/* End XCRemoteSwiftPackageReference section */
@@ -2085,11 +2084,6 @@
20852084
package = 5F28FB8B2858D55A00579A75 /* XCRemoteSwiftPackageReference "KeychainAccess" */;
20862085
productName = KeychainAccess;
20872086
};
2088-
5FA65DDB286A4C370048182C /* TCACoordinators */ = {
2089-
isa = XCSwiftPackageProductDependency;
2090-
package = 5FA65DDA286A4C370048182C /* XCRemoteSwiftPackageReference "TCACoordinators" */;
2091-
productName = TCACoordinators;
2092-
};
20932087
5FD570B4283680DA00D8E869 /* Routes */ = {
20942088
isa = XCSwiftPackageProductDependency;
20952089
productName = Routes;
@@ -2109,11 +2103,21 @@
21092103
package = DB27C6E028D67B1500F4FA1B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
21102104
productName = FirebasePerformance;
21112105
};
2112-
DB534FD128E2554700BB6BC6 /* ComposableArchitecture */ = {
2106+
DB66277728EB9604006EBA99 /* ComposableArchitecture */ = {
21132107
isa = XCSwiftPackageProductDependency;
2114-
package = 5F137EAC28439EA100514263 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */;
2108+
package = DB66277628EB9604006EBA99 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */;
21152109
productName = ComposableArchitecture;
21162110
};
2111+
DB66277928EB9604006EBA99 /* Dependencies */ = {
2112+
isa = XCSwiftPackageProductDependency;
2113+
package = DB66277628EB9604006EBA99 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */;
2114+
productName = Dependencies;
2115+
};
2116+
DB8A517028EE15F100A6D939 /* TCACoordinators */ = {
2117+
isa = XCSwiftPackageProductDependency;
2118+
package = DB8A516F28EE15F100A6D939 /* XCRemoteSwiftPackageReference "TCACoordinators" */;
2119+
productName = TCACoordinators;
2120+
};
21172121
/* End XCSwiftPackageProductDependency section */
21182122
};
21192123
rootObject = 5F97B3B3283677C200350368 /* Project object */;

‎KPIHubIOS.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
"kind" : "remoteSourceControl",
6969
"location" : "https://github.com/johnpatrickmorgan/FlowStacks",
7070
"state" : {
71-
"revision" : "6ef15945183e983d0de8c69a2750ed44d1f3645e",
72-
"version" : "0.2.3"
71+
"revision" : "8d1bc577fcab0c09d599f1f2f6747db2d15f84f4",
72+
"version" : "0.3.0"
7373
}
7474
},
7575
{
@@ -276,7 +276,7 @@
276276
"location" : "https://github.com/pointfreeco/swift-composable-architecture",
277277
"state" : {
278278
"branch" : "protocol-beta",
279-
"revision" : "62b7bc415fba01249346d704aa60d2bfe9483ff6"
279+
"revision" : "6ab2c918dcc2c46e4c167bb8a100e441b782a63b"
280280
}
281281
},
282282
{
@@ -401,8 +401,8 @@
401401
"kind" : "remoteSourceControl",
402402
"location" : "https://github.com/johnpatrickmorgan/TCACoordinators",
403403
"state" : {
404-
"revision" : "d44cce852aae359a40b92d4468791acc23803fb8",
405-
"version" : "0.2.1"
404+
"branch" : "main",
405+
"revision" : "6f7ae3cac128f6f5b5e88255d3210dcd01f17baa"
406406
}
407407
},
408408
{

‎KPIHubIOS/Clients/APIClient/APIClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private enum APIClientKey: TestDependencyKey {
1818

1919
extension APIClientKey: DependencyKey {
2020
static let liveValue: APIClient = APIClient.live(
21-
router: rootRouter.baseURL(DependencyValues.current.appConfiguration.apiURL)
21+
router: rootRouter.baseURL(DependencyValues._current.appConfiguration.apiURL)
2222
)
2323
}
2424

‎KPIHubIOS/Clients/CampusClientState/CampusClientState.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ private enum CampusClientStateKey: TestDependencyKey {
1616

1717
extension CampusClientStateKey: DependencyKey {
1818
static let liveValue = CampusClientState.live(
19-
userDefaultsClient: DependencyValues.current.userDefaultsClient,
20-
keychainClient: DependencyValues.current.keychainClient
19+
userDefaultsClient: DependencyValues._current.userDefaultsClient,
20+
keychainClient: DependencyValues._current.keychainClient
2121
)
2222
}
2323

‎KPIHubIOS/Clients/CampusClientStudySheet/CampusClientStudySheet.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ private enum CampusClientStudySheetKey: TestDependencyKey {
1616

1717
extension CampusClientStudySheetKey: DependencyKey {
1818
static let liveValue = CampusClientStudySheet.live(
19-
apiClient: DependencyValues.current.apiClient,
20-
userDefaultsClient: DependencyValues.current.userDefaultsClient,
21-
keychainClient: DependencyValues.current.keychainClient
19+
apiClient: DependencyValues._current.apiClient,
20+
userDefaultsClient: DependencyValues._current.userDefaultsClient,
21+
keychainClient: DependencyValues._current.keychainClient
2222
)
2323
}
2424

‎KPIHubIOS/Clients/CurrentDateClient/CurrentDateClient.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ private enum CurrentDateClientKey: TestDependencyKey {
1717

1818
extension CurrentDateClientKey: DependencyKey {
1919
static let liveValue = CurrentDateClient.live(
20-
userDefaultsClient: DependencyValues.current.userDefaultsClient,
21-
rozkladClientLessons: DependencyValues.current.rozkladClientLessons
20+
userDefaultsClient: DependencyValues._current.userDefaultsClient,
21+
rozkladClientLessons: DependencyValues._current.rozkladClientLessons
2222
)
2323
}
2424

‎KPIHubIOS/Clients/RozkladClientLessons/RozkladClientLessons.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ private enum RozkladClientLessonsKey: TestDependencyKey {
1616

1717
extension RozkladClientLessonsKey: DependencyKey {
1818
static let liveValue = RozkladClientLessons.live(
19-
userDefaultsClient: DependencyValues.current.userDefaultsClient
19+
userDefaultsClient: DependencyValues._current.userDefaultsClient
2020
)
2121
}
2222

‎KPIHubIOS/Clients/RozkladClientState/RozkladClientState.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private enum RozkladClientStateKey: TestDependencyKey {
1717

1818
extension RozkladClientStateKey: DependencyKey {
1919
static let liveValue = RozkladClientState.live(
20-
userDefaultsClient: DependencyValues.current.userDefaultsClient
20+
userDefaultsClient: DependencyValues._current.userDefaultsClient
2121
)
2222
}
2323

‎KPIHubIOS/Modules/Main/MainStore.swift

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ struct Main: ReducerProtocol {
1414

1515
struct State: Equatable {
1616

17-
@BindableState var selectedTab: Tab
17+
var selectedTab: Tab
1818

1919
enum Tab: Hashable {
2020
case rozklad
@@ -37,20 +37,18 @@ struct Main: ReducerProtocol {
3737

3838
// MARK: - Action
3939

40-
enum Action: Equatable, BindableAction {
40+
enum Action: Equatable {
4141
case rozklad(Rozklad.Action)
4242
case campus(Campus.Action)
4343
case profile(Profile.Action)
4444

45-
case binding(BindingAction<State>)
45+
case tabSelected(State.Tab)
4646
}
4747

4848
// MARK: - Reducer
4949

5050
@ReducerBuilder<State, Action>
5151
var core: some ReducerProtocol<State, Action> {
52-
BindingReducer()
53-
5452
Reduce { state, action in
5553
switch action {
5654
case .profile(.delegate(.selectRozkladTab)):
@@ -60,6 +58,10 @@ struct Main: ReducerProtocol {
6058
case .profile(.delegate(.selectCampusTab)):
6159
state.selectedTab = .campus
6260
return .none
61+
62+
case let .tabSelected(tab):
63+
state.selectedTab = tab
64+
return .none
6365

6466
case .rozklad:
6567
return .none
@@ -69,9 +71,6 @@ struct Main: ReducerProtocol {
6971

7072
case .profile:
7173
return .none
72-
73-
case .binding:
74-
return .none
7574
}
7675
}
7776
}

0 commit comments

Comments
 (0)