Skip to content

Commit a978530

Browse files
easydev991easydev991
authored
Обновление user-flow (#133)
* В процессе - Удалил из таббара дневники - Добавил в таббар настройки - Удалил из навбара в профиле кнопку перехода в настройки * В процессе - Заменил экран для выбора темы на меню-пикер - Переместил кнопку для смены пароля на экран изменения профиля * Мелкие правки Рефактор и шеврон в ячейке с выбором пола * В процессе Переместил дневники в профиль * В процессе - Небольшой рефактор кнопок в профиле - При отсутствии дневников у основного пользователя в ячейке с дневниками показываем шеврон без текста справа * В процессе - Перенес кнопку для выхода из профиля на экран профиля * Убрал неактуальный код * Поднял версию билда
1 parent 41ac582 commit a978530

File tree

24 files changed

+215
-335
lines changed

24 files changed

+215
-335
lines changed

‎SwiftUI-WorkoutApp.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
670431512964544D0090CAC3 /* FeedbackSender in Frameworks */ = {isa = PBXBuildFile; productRef = 670431502964544D0090CAC3 /* FeedbackSender */; };
1111
6705E7EE283B703400DABCC8 /* JournalSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6705E7ED283B703400DABCC8 /* JournalSettingsView.swift */; };
12-
670CA19E280E8F09003914A3 /* ProfileSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 670CA19D280E8F09003914A3 /* ProfileSettingsView.swift */; };
13-
67138D7D2972E86C00BBF450 /* IncognitoNavbarInfoButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D7C2972E86C00BBF450 /* IncognitoNavbarInfoButton.swift */; };
12+
670CA19E280E8F09003914A3 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 670CA19D280E8F09003914A3 /* SettingsView.swift */; };
1413
67138D87297311BD00BBF450 /* WorkoutAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D86297311BD00BBF450 /* WorkoutAppUITests.swift */; };
1514
67138D90297323AE00BBF450 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D8F297323AE00BBF450 /* SnapshotHelper.swift */; };
1615
67138D922974851F00BBF450 /* XCUIElement+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67138D912974851F00BBF450 /* XCUIElement+.swift */; };
@@ -49,7 +48,6 @@
4948
6798AA4C280AF1C200DB76F1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6798AA4B280AF1C200DB76F1 /* LaunchScreen.storyboard */; };
5049
6798AA53280AF43900DB76F1 /* EventsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA52280AF43900DB76F1 /* EventsListView.swift */; };
5150
6798AA55280AF46300DB76F1 /* DialogsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA54280AF46300DB76F1 /* DialogsScreen.swift */; };
52-
6798AA57280AF48C00DB76F1 /* JournalsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA56280AF48C00DB76F1 /* JournalsScreen.swift */; };
5351
6798AA59280AF4B100DB76F1 /* SportsGroundsMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA58280AF4B100DB76F1 /* SportsGroundsMapView.swift */; };
5452
6798AA5B280AF4C700DB76F1 /* ProfileScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA5A280AF4C700DB76F1 /* ProfileScreen.swift */; };
5553
6798AA66280B232F00DB76F1 /* IncognitoProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA65280B232F00DB76F1 /* IncognitoProfileView.swift */; };
@@ -63,7 +61,6 @@
6361
67A079F22A758E7D005EAF70 /* PickedPhotoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A079F12A758E7D005EAF70 /* PickedPhotoView.swift */; };
6462
67A64A242AC83A0F00CBDD5F /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 67A64A232AC83A0F00CBDD5F /* Localizable.xcstrings */; };
6563
67A9C90828427DEA005D6A36 /* SportsGroundFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A9C90728427DEA005D6A36 /* SportsGroundFilterView.swift */; };
66-
67B371712A63FF6F000FF143 /* AppThemeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67B371702A63FF6F000FF143 /* AppThemeScreen.swift */; };
6764
67B371732A640079000FF143 /* AppThemeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67B371722A640079000FF143 /* AppThemeService.swift */; };
6865
67B78712281D654C008B104F /* DefaultsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67B78711281D654C008B104F /* DefaultsService.swift */; };
6966
67B78716281D8006008B104F /* SportsGroundsMapViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67B78715281D8006008B104F /* SportsGroundsMapViewModel.swift */; };
@@ -100,8 +97,7 @@
10097

10198
/* Begin PBXFileReference section */
10299
6705E7ED283B703400DABCC8 /* JournalSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JournalSettingsView.swift; sourceTree = "<group>"; };
103-
670CA19D280E8F09003914A3 /* ProfileSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileSettingsView.swift; sourceTree = "<group>"; };
104-
67138D7C2972E86C00BBF450 /* IncognitoNavbarInfoButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoNavbarInfoButton.swift; sourceTree = "<group>"; };
100+
670CA19D280E8F09003914A3 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
105101
67138D84297311BD00BBF450 /* WorkoutAppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WorkoutAppUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
106102
67138D86297311BD00BBF450 /* WorkoutAppUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutAppUITests.swift; sourceTree = "<group>"; };
107103
67138D8F297323AE00BBF450 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
@@ -144,7 +140,6 @@
144140
6798AA4B280AF1C200DB76F1 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
145141
6798AA52280AF43900DB76F1 /* EventsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventsListView.swift; sourceTree = "<group>"; };
146142
6798AA54280AF46300DB76F1 /* DialogsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DialogsScreen.swift; sourceTree = "<group>"; };
147-
6798AA56280AF48C00DB76F1 /* JournalsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JournalsScreen.swift; sourceTree = "<group>"; };
148143
6798AA58280AF4B100DB76F1 /* SportsGroundsMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SportsGroundsMapView.swift; sourceTree = "<group>"; };
149144
6798AA5A280AF4C700DB76F1 /* ProfileScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileScreen.swift; sourceTree = "<group>"; };
150145
6798AA65280B232F00DB76F1 /* IncognitoProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoProfileView.swift; sourceTree = "<group>"; };
@@ -158,7 +153,6 @@
158153
67A079F12A758E7D005EAF70 /* PickedPhotoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickedPhotoView.swift; sourceTree = "<group>"; };
159154
67A64A232AC83A0F00CBDD5F /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
160155
67A9C90728427DEA005D6A36 /* SportsGroundFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SportsGroundFilterView.swift; sourceTree = "<group>"; };
161-
67B371702A63FF6F000FF143 /* AppThemeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppThemeScreen.swift; sourceTree = "<group>"; };
162156
67B371722A640079000FF143 /* AppThemeService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppThemeService.swift; sourceTree = "<group>"; };
163157
67B78711281D654C008B104F /* DefaultsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultsService.swift; sourceTree = "<group>"; };
164158
67B78715281D8006008B104F /* SportsGroundsMapViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SportsGroundsMapViewModel.swift; sourceTree = "<group>"; };
@@ -240,7 +234,6 @@
240234
67419AD4282E8E6F004F5339 /* Journals */ = {
241235
isa = PBXGroup;
242236
children = (
243-
6798AA56280AF48C00DB76F1 /* JournalsScreen.swift */,
244237
6762775A283A87AD009C203F /* JournalCell.swift */,
245238
6762774E283A3A3B009C203F /* JournalsList */,
246239
67627753283A4C2F009C203F /* EntriesList */,
@@ -279,10 +272,7 @@
279272
67419AD8282E8E9E004F5339 /* Settings */ = {
280273
isa = PBXGroup;
281274
children = (
282-
6747575528113419002F0A24 /* ChangePasswordView.swift */,
283-
67B371702A63FF6F000FF143 /* AppThemeScreen.swift */,
284-
6770A8352834D7B50006B672 /* EditAccount */,
285-
670CA19D280E8F09003914A3 /* ProfileSettingsView.swift */,
275+
670CA19D280E8F09003914A3 /* SettingsView.swift */,
286276
6798AA72280B43FE00DB76F1 /* LoginView.swift */,
287277
);
288278
path = Settings;
@@ -403,6 +393,7 @@
403393
isa = PBXGroup;
404394
children = (
405395
6798AA83280C0F7D00DB76F1 /* EditAccountScreen.swift */,
396+
6747575528113419002F0A24 /* ChangePasswordView.swift */,
406397
);
407398
path = EditAccount;
408399
sourceTree = "<group>";
@@ -471,8 +462,8 @@
471462
67475757281285E5002F0A24 /* SportsGrounds */,
472463
671D7DED28210D820068E728 /* Events */,
473464
67419AD5282E8E7C004F5339 /* Messages */,
474-
67419AD4282E8E6F004F5339 /* Journals */,
475465
6798AA69280B23BF00DB76F1 /* Profile */,
466+
67419AD8282E8E9E004F5339 /* Settings */,
476467
6798AA6A280B277600DB76F1 /* Common */,
477468
);
478469
path = Screens;
@@ -505,11 +496,11 @@
505496
6798AA69280B23BF00DB76F1 /* Profile */ = {
506497
isa = PBXGroup;
507498
children = (
499+
67419AD4282E8E6F004F5339 /* Journals */,
508500
6798AA5A280AF4C700DB76F1 /* ProfileScreen.swift */,
509-
6798AA65280B232F00DB76F1 /* IncognitoProfileView.swift */,
501+
6770A8352834D7B50006B672 /* EditAccount */,
510502
67D9167A2838D2150098D3CB /* Detail */,
511503
67419AD9282E8EBA004F5339 /* FriendRequests */,
512-
67419AD8282E8E9E004F5339 /* Settings */,
513504
67419AD7282E8E95004F5339 /* SearchUsers */,
514505
);
515506
path = Profile;
@@ -518,7 +509,7 @@
518509
6798AA6A280B277600DB76F1 /* Common */ = {
519510
isa = PBXGroup;
520511
children = (
521-
679F3B0A2969DF3E00BB3590 /* IncognitoButtons */,
512+
679F3B0A2969DF3E00BB3590 /* Incognito */,
522513
679F3AF8296802BA00BB3590 /* SendMessage */,
523514
679F3AF72968029900BB3590 /* SportsGroundLocation */,
524515
67C87FD4284388EF00D6377D /* PhotoSection */,
@@ -548,13 +539,13 @@
548539
path = SendMessage;
549540
sourceTree = "<group>";
550541
};
551-
679F3B0A2969DF3E00BB3590 /* IncognitoButtons */ = {
542+
679F3B0A2969DF3E00BB3590 /* Incognito */ = {
552543
isa = PBXGroup;
553544
children = (
545+
6798AA65280B232F00DB76F1 /* IncognitoProfileView.swift */,
554546
679F3B062969D4E200BB3590 /* IncognitoUserButton.swift */,
555-
67138D7C2972E86C00BBF450 /* IncognitoNavbarInfoButton.swift */,
556547
);
557-
path = IncognitoButtons;
548+
path = Incognito;
558549
sourceTree = "<group>";
559550
};
560551
67A9C90628427DDD005D6A36 /* Filter */ = {
@@ -805,7 +796,6 @@
805796
675EC653281445E500C2E229 /* MapViewUI.swift in Sources */,
806797
6798AA59280AF4B100DB76F1 /* SportsGroundsMapView.swift in Sources */,
807798
6798AA68280B23B700DB76F1 /* UserDetailsView.swift in Sources */,
808-
67138D7D2972E86C00BBF450 /* IncognitoNavbarInfoButton.swift in Sources */,
809799
67B78712281D654C008B104F /* DefaultsService.swift in Sources */,
810800
67419ACF282E70B9004F5339 /* SportsGroundsListView.swift in Sources */,
811801
67EA685C2A71A99700697C88 /* PhotoDetailScreen.swift in Sources */,
@@ -818,17 +808,15 @@
818808
675E5618297D21D400B4981A /* Array+.swift in Sources */,
819809
67FBF64F28338A2E008A7968 /* EventDetailsView.swift in Sources */,
820810
6766A036284603CA0033F1E8 /* TabViewModel.swift in Sources */,
821-
67B371712A63FF6F000FF143 /* AppThemeScreen.swift in Sources */,
822811
67D916862838F0DD0098D3CB /* DialogView.swift in Sources */,
823812
67627750283A3A54009C203F /* JournalsListView.swift in Sources */,
824813
67891E38283E947B00B10802 /* SportsGroundFormView.swift in Sources */,
825814
674D061B28280A63007E75C6 /* FriendRequestsView.swift in Sources */,
826815
6798AA3E280AEDC900DB76F1 /* SwiftUI_WorkoutAppApp.swift in Sources */,
827-
6798AA57280AF48C00DB76F1 /* JournalsScreen.swift in Sources */,
828816
675EC6632815AA4A00C2E229 /* MapSnapshotView.swift in Sources */,
829817
67D916812838E2460098D3CB /* DialogListView.swift in Sources */,
830818
6798AA53280AF43900DB76F1 /* EventsListView.swift in Sources */,
831-
670CA19E280E8F09003914A3 /* ProfileSettingsView.swift in Sources */,
819+
670CA19E280E8F09003914A3 /* SettingsView.swift in Sources */,
832820
6762775B283A87AD009C203F /* JournalCell.swift in Sources */,
833821
6798AA84280C0F7D00DB76F1 /* EditAccountScreen.swift in Sources */,
834822
6798AA73280B43FE00DB76F1 /* LoginView.swift in Sources */,
@@ -1078,7 +1066,7 @@
10781066
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10791067
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
10801068
CODE_SIGN_STYLE = Automatic;
1081-
CURRENT_PROJECT_VERSION = 1;
1069+
CURRENT_PROJECT_VERSION = 2;
10821070
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
10831071
DEVELOPMENT_TEAM = CR68PP2Z3F;
10841072
ENABLE_PREVIEWS = YES;
@@ -1114,7 +1102,7 @@
11141102
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
11151103
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
11161104
CODE_SIGN_STYLE = Automatic;
1117-
CURRENT_PROJECT_VERSION = 1;
1105+
CURRENT_PROJECT_VERSION = 2;
11181106
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
11191107
DEVELOPMENT_TEAM = CR68PP2Z3F;
11201108
ENABLE_PREVIEWS = YES;

‎SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/Icons.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public enum Icons {
1212
public enum Tabbar: String, CaseIterable {
1313
case events = "person.3"
1414
case messages = "message"
15-
case journals = "list.bullet.circle"
1615
case profile = "person"
16+
case settings = "gearshape"
1717
}
1818

1919
/// Названия остальных иконок
@@ -38,6 +38,7 @@ public enum Icons {
3838
case addPerson = "person.crop.circle.badge.plus"
3939
case deletePerson = "person.crop.circle.badge.minus"
4040
case signPost = "signpost.right"
41+
case key = "key.fill"
4142
case envelope
4243
case globe = "globe.europe.africa"
4344
case person = "person.fill"

‎SwiftUI-WorkoutApp/Resources/Localizable.xcstrings‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
"zero" : {
324324
"stringUnit" : {
325325
"state" : "translated",
326-
"value" : "0 journals"
326+
"value" : ""
327327
}
328328
}
329329
}
@@ -364,8 +364,8 @@
364364
},
365365
"zero" : {
366366
"stringUnit" : {
367-
"state" : "translated",
368-
"value" : "0 дневников"
367+
"state" : "new",
368+
"value" : ""
369369
}
370370
}
371371
}
@@ -680,6 +680,12 @@
680680
"state" : "translated",
681681
"value" : "Street Workout (boosty)"
682682
}
683+
},
684+
"ru" : {
685+
"stringUnit" : {
686+
"state" : "translated",
687+
"value" : "Street Workout на boosty"
688+
}
683689
}
684690
}
685691
},
@@ -922,6 +928,23 @@
922928
}
923929
}
924930
},
931+
"Внешний вид" : {
932+
"extractionState" : "manual",
933+
"localizations" : {
934+
"en" : {
935+
"stringUnit" : {
936+
"state" : "translated",
937+
"value" : "Appearance"
938+
}
939+
},
940+
"ru" : {
941+
"stringUnit" : {
942+
"state" : "translated",
943+
"value" : "Внешний вид"
944+
}
945+
}
946+
}
947+
},
925948
"Внутренняя ошибка сервера" : {
926949
"extractionState" : "manual",
927950
"localizations" : {
@@ -3627,6 +3650,7 @@
36273650
}
36283651
},
36293652
"Тема приложения" : {
3653+
"extractionState" : "stale",
36303654
"localizations" : {
36313655
"en" : {
36323656
"stringUnit" : {

‎SwiftUI-WorkoutApp/SWModels/Sources/SWModels/DefaultsProtocol.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public protocol DefaultsProtocol: AnyObject {
1313
var friendsIdsList: [Int] { get }
1414
var blacklistedUsers: [UserResponse] { get }
1515
var unreadMessagesCount: Int { get }
16-
func setAppLanguage(_ language: String)
16+
func setAppLanguage(_ language: AppLanguage)
1717
func setAppTheme(_ theme: AppColorTheme)
1818
func saveAuthData(_ info: AuthData) throws
1919
func basicAuthInfo() throws -> AuthData

‎SwiftUI-WorkoutApp/SWModels/Sources/SWModels/MainUserForm.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ public extension MainUserForm {
5353
case gender = "Пол"
5454
}
5555

56+
var genderString: String {
57+
(Gender(genderCode) ?? .unspecified).rawValue
58+
}
59+
5660
func placeholder(_ element: Placeholder) -> String {
5761
element.rawValue
5862
}

‎SwiftUI-WorkoutApp/SWModels/Sources/SWModels/UserModel.swift‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ public struct UserModel: Identifiable, Hashable {
1010
public let age: Int
1111
public let countryID: Int
1212
public let cityID: Int
13-
public let usesSportsGrounds: Int
13+
private let usesSportsGrounds: Int
1414
public let addedSportsGrounds: [SportsGround]
15-
public let friendsCount, journalsCount: Int
15+
private let friendsCount, journalsCount: Int
1616

1717
public init(_ user: UserResponse?) {
1818
if let user {
@@ -90,6 +90,15 @@ public extension UserModel {
9090
)
9191
}
9292

93+
var hasJournals: Bool { journalsCount > 0 }
94+
95+
var hasFriends: Bool { friendsCount > 0 }
96+
97+
var hasAddedGrounds: Bool { !addedSportsGrounds.isEmpty }
98+
99+
/// Тренируется на каких-нибудь площадках
100+
var hasUsedGrounds: Bool { usesSportsGrounds > 0 }
101+
93102
var journalsCountString: String {
94103
String.localizedStringWithFormat(
95104
NSLocalizedString("journalsCount", comment: ""),

‎SwiftUI-WorkoutApp/Screens/Profile/IncognitoProfileView.swift‎ renamed to ‎SwiftUI-WorkoutApp/Screens/Common/Incognito/IncognitoProfileView.swift‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@ struct IncognitoProfileView: View {
77
var body: some View {
88
VStack(spacing: 16) {
99
authInvitation
10-
IncognitoUserButton(mode: .authorize)
10+
IncognitoUserButton()
1111
registrationInfo
1212
}
1313
.frame(maxWidth: .infinity, maxHeight: .infinity)
14-
.toolbar {
15-
ToolbarItem(placement: .navigationBarTrailing) {
16-
IncognitoNavbarInfoButton()
17-
}
18-
}
1914
.padding()
2015
.background(Color.swBackground)
2116
}

‎SwiftUI-WorkoutApp/Screens/Common/IncognitoButtons/IncognitoUserButton.swift‎ renamed to ‎SwiftUI-WorkoutApp/Screens/Common/Incognito/IncognitoUserButton.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import SwiftUI
33

44
struct IncognitoUserButton: View {
55
@State private var isLinkActive = false
6-
let mode: IncognitoUserButton.Mode
6+
var mode = IncognitoUserButton.Mode.authorize
77

88
var body: some View {
99
NavigationLink(mode.title, destination: mode.destination, isActive: $isLinkActive)

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

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

‎SwiftUI-WorkoutApp/Screens/Events/List/EventsListView.swift‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ private extension EventsListView {
142142
EventFormView(for: .regularCreate, refreshClbk: refreshAction)
143143
}
144144
}
145-
} else {
146-
IncognitoNavbarInfoButton()
147145
}
148146
}
149147

0 commit comments

Comments
 (0)