Skip to content

Commit ce726c0

Browse files
easydev991easydev991
committed
Убрал WelcomeView
- По предложению Антона убрал приветственный экран, чтобы apple пропустили сборку в магазин
1 parent 1316d71 commit ce726c0

20 files changed

+46
-186
lines changed

‎SwiftUI-WorkoutApp.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,8 @@
9898
6798AA59280AF4B100DB76F1 /* SportsGroundsMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA58280AF4B100DB76F1 /* SportsGroundsMapView.swift */; };
9999
6798AA5B280AF4C700DB76F1 /* ProfileScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA5A280AF4C700DB76F1 /* ProfileScreen.swift */; };
100100
6798AA5D280AF5E500DB76F1 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA5C280AF5E500DB76F1 /* Constants.swift */; };
101-
6798AA64280B1F0900DB76F1 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA63280B1F0900DB76F1 /* WelcomeView.swift */; };
102101
6798AA66280B232F00DB76F1 /* IncognitoProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA65280B232F00DB76F1 /* IncognitoProfileView.swift */; };
103102
6798AA68280B23B700DB76F1 /* UserDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA67280B23B700DB76F1 /* UserDetailsView.swift */; };
104-
6798AA70280B42BC00DB76F1 /* IncognitoButtonLabelModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA6F280B42BC00DB76F1 /* IncognitoButtonLabelModifier.swift */; };
105103
6798AA73280B43FE00DB76F1 /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA72280B43FE00DB76F1 /* LoginView.swift */; };
106104
6798AA79280BE8E200DB76F1 /* countries.json in Resources */ = {isa = PBXBuildFile; fileRef = 6798AA75280BE8E200DB76F1 /* countries.json */; };
107105
6798AA7B280BE8E200DB76F1 /* oldSportsGrounds.json in Resources */ = {isa = PBXBuildFile; fileRef = 6798AA77280BE8E200DB76F1 /* oldSportsGrounds.json */; };
@@ -248,10 +246,8 @@
248246
6798AA58280AF4B100DB76F1 /* SportsGroundsMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SportsGroundsMapView.swift; sourceTree = "<group>"; };
249247
6798AA5A280AF4C700DB76F1 /* ProfileScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileScreen.swift; sourceTree = "<group>"; };
250248
6798AA5C280AF5E500DB76F1 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
251-
6798AA63280B1F0900DB76F1 /* WelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = "<group>"; };
252249
6798AA65280B232F00DB76F1 /* IncognitoProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoProfileView.swift; sourceTree = "<group>"; };
253250
6798AA67280B23B700DB76F1 /* UserDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsView.swift; sourceTree = "<group>"; };
254-
6798AA6F280B42BC00DB76F1 /* IncognitoButtonLabelModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoButtonLabelModifier.swift; sourceTree = "<group>"; };
255251
6798AA72280B43FE00DB76F1 /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
256252
6798AA75280BE8E200DB76F1 /* countries.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = countries.json; sourceTree = "<group>"; };
257253
6798AA77280BE8E200DB76F1 /* oldSportsGrounds.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = oldSportsGrounds.json; sourceTree = "<group>"; };
@@ -328,6 +324,24 @@
328324
path = Settings;
329325
sourceTree = "<group>";
330326
};
327+
67138D7E2972EF6F00BBF450 /* Login */ = {
328+
isa = PBXGroup;
329+
children = (
330+
6798AA72280B43FE00DB76F1 /* LoginView.swift */,
331+
67B7870F281D6110008B104F /* LoginViewModel.swift */,
332+
);
333+
path = Login;
334+
sourceTree = "<group>";
335+
};
336+
67138D7F2972EF7F00BBF450 /* ChangePassword */ = {
337+
isa = PBXGroup;
338+
children = (
339+
6747575528113419002F0A24 /* ChangePasswordView.swift */,
340+
67B78717281D8792008B104F /* ChangePasswordViewModel.swift */,
341+
);
342+
path = ChangePassword;
343+
sourceTree = "<group>";
344+
};
331345
671D7DED28210D820068E728 /* Events */ = {
332346
isa = PBXGroup;
333347
children = (
@@ -380,10 +394,11 @@
380394
67419AD8282E8E9E004F5339 /* Settings */ = {
381395
isa = PBXGroup;
382396
children = (
397+
67138D7F2972EF7F00BBF450 /* ChangePassword */,
398+
6770A8352834D7B50006B672 /* AccountInfo */,
399+
67138D7E2972EF6F00BBF450 /* Login */,
383400
670CA19D280E8F09003914A3 /* ProfileSettingsView.swift */,
384401
67B78719281D88CB008B104F /* ProfileSettingsViewModel.swift */,
385-
6747575528113419002F0A24 /* ChangePasswordView.swift */,
386-
67B78717281D8792008B104F /* ChangePasswordViewModel.swift */,
387402
);
388403
path = Settings;
389404
sourceTree = "<group>";
@@ -524,15 +539,15 @@
524539
path = Map;
525540
sourceTree = "<group>";
526541
};
527-
6770A8352834D7B50006B672 /* Account */ = {
542+
6770A8352834D7B50006B672 /* AccountInfo */ = {
528543
isa = PBXGroup;
529544
children = (
530-
6798AA83280C0F7D00DB76F1 /* AccountInfoView.swift */,
531-
67B78713281D74F3008B104F /* AccountInfoViewModel.swift */,
532545
6798AA8B280C390F00DB76F1 /* CountriesView.swift */,
533546
6798AA8D280C3CCB00DB76F1 /* CitiesView.swift */,
547+
6798AA83280C0F7D00DB76F1 /* AccountInfoView.swift */,
548+
67B78713281D74F3008B104F /* AccountInfoViewModel.swift */,
534549
);
535-
path = Account;
550+
path = AccountInfo;
536551
sourceTree = "<group>";
537552
};
538553
67891E34283E93ED00B10802 /* Form */ = {
@@ -590,7 +605,6 @@
590605
isa = PBXGroup;
591606
children = (
592607
67419AD6282E8E84004F5339 /* Root */,
593-
6798AA82280BF52600DB76F1 /* Welcome */,
594608
67475757281285E5002F0A24 /* SportsGrounds */,
595609
671D7DED28210D820068E728 /* Events */,
596610
67419AD5282E8E7C004F5339 /* Messages */,
@@ -706,17 +720,6 @@
706720
path = Common;
707721
sourceTree = "<group>";
708722
};
709-
6798AA82280BF52600DB76F1 /* Welcome */ = {
710-
isa = PBXGroup;
711-
children = (
712-
6770A8352834D7B50006B672 /* Account */,
713-
6798AA63280B1F0900DB76F1 /* WelcomeView.swift */,
714-
6798AA72280B43FE00DB76F1 /* LoginView.swift */,
715-
67B7870F281D6110008B104F /* LoginViewModel.swift */,
716-
);
717-
path = Welcome;
718-
sourceTree = "<group>";
719-
};
720723
679F3AF72968029900BB3590 /* SportsGroundLocation */ = {
721724
isa = PBXGroup;
722725
children = (
@@ -747,7 +750,6 @@
747750
679F3B0A2969DF3E00BB3590 /* IncognitoButtons */ = {
748751
isa = PBXGroup;
749752
children = (
750-
6798AA6F280B42BC00DB76F1 /* IncognitoButtonLabelModifier.swift */,
751753
679F3B062969D4E200BB3590 /* IncognitoUserButton.swift */,
752754
67138D7C2972E86C00BBF450 /* IncognitoNavbarInfoButton.swift */,
753755
);
@@ -936,7 +938,6 @@
936938
6798AA4E280AF32A00DB76F1 /* SportsGround.swift in Sources */,
937939
67419AD3282E7F84004F5339 /* RoundedDefaultImage.swift in Sources */,
938940
672F2BE72832CD2A0000A193 /* EventViewCell.swift in Sources */,
939-
6798AA70280B42BC00DB76F1 /* IncognitoButtonLabelModifier.swift in Sources */,
940941
67FBF64B283379D9008A7968 /* EventsListViewModel.swift in Sources */,
941942
67BAF3F428361BC400DB40D9 /* PhotoSectionView.swift in Sources */,
942943
67BAF3F82836245100DB40D9 /* Comments.swift in Sources */,
@@ -994,7 +995,6 @@
994995
6758B92C281D9283001D83D8 /* EventFormViewModel.swift in Sources */,
995996
6705E7F2283B880A00DABCC8 /* JournalSettingsViewModel.swift in Sources */,
996997
675A37152854B11300DAE071 /* Gender.swift in Sources */,
997-
6798AA64280B1F0900DB76F1 /* WelcomeView.swift in Sources */,
998998
67891E36283E945100B10802 /* SportsGroundFormViewModel.swift in Sources */,
999999
67FBF64F28338A2E008A7968 /* EventDetailsView.swift in Sources */,
10001000
67891E3A283EB15300B10802 /* SportsGroundResult.swift in Sources */,

‎SwiftUI-WorkoutApp/Models/FriendAction.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import Foundation
2+
13
enum FriendAction: String {
24
case sendFriendRequest = "Добавить в друзья"
35
case removeFriend = "Удалить из друзей"

‎SwiftUI-WorkoutApp/Models/LoginResponse.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ import Foundation
33
struct LoginResponse: Codable {
44
let userID: Int
55

6-
enum CodingKeys: String, CodingKey {
7-
case userID = "user_id"
8-
}
6+
enum CodingKeys: String, CodingKey { case userID = "user_id" }
97
}

‎SwiftUI-WorkoutApp/Models/MessageType.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import UIKit.UIColor
33

44
enum MessageType {
55
case incoming, sent
6-
var color: UIColor {
7-
self == .incoming ? .systemGreen : .systemBlue
8-
}
6+
7+
var color: UIColor { self == .incoming ? .systemGreen : .systemBlue }
98
}

‎SwiftUI-WorkoutApp/Models/PhotoContainer.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@ import Foundation
33
enum PhotoContainer {
44
case event(Input), sportsGround(Input)
55

6-
struct Input {
7-
let containerID, photoID: Int
8-
}
6+
struct Input { let containerID, photoID: Int }
97
}

‎SwiftUI-WorkoutApp/Screens/Common/IncognitoButtons/IncognitoButtonLabelModifier.swift‎

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

‎SwiftUI-WorkoutApp/Screens/Common/IncognitoButtons/IncognitoUserButton.swift‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ struct IncognitoUserButton: View {
66
var body: some View {
77
NavigationLink(destination: mode.destination) {
88
mode.label
9+
.roundedStyle()
910
}
1011
}
1112
}
1213

1314
extension IncognitoUserButton {
14-
enum Mode {
15-
case register(source: IncognitoButtonLabelModifier.Source)
16-
case authorize(source: IncognitoButtonLabelModifier.Source)
17-
}
15+
enum Mode { case register, authorize }
1816
}
1917

2018
private extension IncognitoUserButton.Mode {
@@ -29,33 +27,23 @@ private extension IncognitoUserButton.Mode {
2927
@ViewBuilder
3028
var label: some View {
3129
switch self {
32-
case let .register(source):
30+
case .register:
3331
Label("Регистрация", systemImage: "person.badge.plus")
34-
.incognitoButtonStyle(source: source)
35-
case let .authorize(source):
32+
case .authorize:
3633
Label("Авторизация", systemImage: "arrow.forward.circle")
37-
.incognitoButtonStyle(source: source)
3834
}
3935
}
4036
}
4137

4238
#if DEBUG
4339
struct IncognitoUserButton_Previews: PreviewProvider {
4440
static var previews: some View {
45-
Group {
46-
VStack(spacing: 16) {
47-
IncognitoUserButton(mode: .authorize(source: .welcomeView))
48-
IncognitoUserButton(mode: .register(source: .welcomeView))
49-
}
50-
.preferredColorScheme(.dark)
51-
.previewDisplayName("Приветственный экран")
52-
VStack(spacing: 16) {
53-
IncognitoUserButton(mode: .authorize(source: .incognitoView))
54-
IncognitoUserButton(mode: .register(source: .incognitoView))
55-
}
56-
.previewDisplayName("Инкогнито экран")
41+
VStack(spacing: 16) {
42+
IncognitoUserButton(mode: .authorize)
43+
IncognitoUserButton(mode: .register)
5744
}
5845
.padding()
46+
.previewDisplayName("Инкогнито экран")
5947
}
6048
}
6149
#endif

‎SwiftUI-WorkoutApp/Screens/Events/Form/EventFormView.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ extension EventFormView {
8383

8484
private extension EventFormView {
8585
enum FocusableField: Hashable {
86-
case eventName
87-
case eventDescription
86+
case eventName, eventDescription
8887
}
8988

9089
var eventNameSection: some View {

‎SwiftUI-WorkoutApp/Screens/Profile/IncognitoProfileView.swift‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ struct IncognitoProfileView: View {
55
var body: some View {
66
VStack(spacing: 16) {
77
incognitoInformer
8-
registerButton
9-
loginButton
8+
IncognitoUserButton(mode: .register)
9+
IncognitoUserButton(mode: .authorize)
1010
}
1111
.toolbar {
1212
ToolbarItem(placement: .navigationBarTrailing) {
@@ -24,14 +24,6 @@ private extension IncognitoProfileView {
2424
.multilineTextAlignment(.center)
2525
.padding()
2626
}
27-
28-
var registerButton: some View {
29-
IncognitoUserButton(mode: .register(source: .incognitoView))
30-
}
31-
32-
var loginButton: some View {
33-
IncognitoUserButton(mode: .authorize(source: .incognitoView))
34-
}
3527
}
3628

3729
#if DEBUG

‎SwiftUI-WorkoutApp/Screens/Welcome/Account/AccountInfoView.swift‎ renamed to ‎SwiftUI-WorkoutApp/Screens/Profile/Settings/AccountInfo/AccountInfoView.swift‎

File renamed without changes.

0 commit comments

Comments
 (0)