Обновил картинки в таббаре (#99)

* Доработка

- Обновил картинки в таббаре
- Убрал дефолтное заполнение картинок
- Поправил превью
- Сгенерировал новые скриншоты

* Поднял версию приложения до 3.3.1

Author: easydev991

.gitignore

@@ -1,3 +1,4 @@
 *.xcbkptlist
 screenshots/screenshots.html
 SwiftUI-WorkoutApp.xcodeproj/project.xcworkspace/xcuserdata/oleg991.xcuserdatad/UserInterfaceState.xcuserstate
+SwiftUI-WorkoutApp.xcodeproj/project.xcworkspace/xcuserdata/oleg991.xcuserdatad/IDEFindNavigatorScopes.plist

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -1216,7 +1216,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
 				PRODUCT_NAME = WorkoutApp;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1252,7 +1252,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
 				PRODUCT_NAME = WorkoutApp;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

SwiftUI-WorkoutApp/Screens/Root/RootView.swift

@@ -6,60 +6,15 @@ struct RootView: View {
     @EnvironmentObject private var defaults: DefaultsService
 
     var body: some View {
-        tabView
-            .animation(.spring(), value: defaults.isAuthorized)
-    }
-}
-
-private extension RootView {
-    var tabView: some View {
         TabView(selection: $viewModel.selectedTab) {
-            SportsGroundsMapView()
-                .tabItem {
-                    tabItemView(for: .map)
-                }
-                .tag(TabViewModel.Tab.map)
-            EventsListView()
-                .tabItem {
-                    tabItemView(for: .events)
-                }
-                .tag(TabViewModel.Tab.events)
-            DialogsScreen()
-                .tabItem {
-                    tabItemView(for: .messages)
-                }
-                .tag(TabViewModel.Tab.messages)
-                .badge(defaults.unreadMessagesCount)
-            JournalsScreen()
-                .tabItem {
-                    tabItemView(for: .journal)
-                }
-                .tag(TabViewModel.Tab.journal)
-            ProfileScreen()
-                .tabItem {
-                    tabItemView(for: .profile)
-                }
-                .tag(TabViewModel.Tab.profile)
-        }
-        .navigationViewStyle(.stack)
-    }
-
-    func tabItemView(for tab: TabViewModel.Tab) -> some View {
-        Group {
-            Text(tab.title)
-            switch tab {
-            case .map:
-                Image.sportsGroundIcon
-            case .events:
-                Image(systemName: Icons.Tabbar.events.rawValue)
-            case .messages:
-                Image(systemName: Icons.Tabbar.messages.rawValue)
-            case .journal:
-                Image(systemName: Icons.Tabbar.journals.rawValue)
-            case .profile:
-                Image(systemName: Icons.Tabbar.profile.rawValue)
+            ForEach(TabViewModel.Tab.allCases, id: \.rawValue) { tab in
+                tab.screen
+                    .tabItem { tab.tabItemLabel }
+                    .tag(tab)
             }
         }
+        .navigationViewStyle(.stack)
+        .animation(.spring(), value: defaults.isAuthorized)
     }
 }
 
@@ -68,6 +23,7 @@ struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         RootView()
             .environmentObject(DefaultsService())
+            .environmentObject(TabViewModel())
     }
 }
 #endif

SwiftUI-WorkoutApp/Screens/Root/TabViewModel.swift

@@ -1,4 +1,5 @@
-import Foundation
+import DesignSystem
+import SwiftUI
 
 final class TabViewModel: ObservableObject {
     @Published var selectedTab = Tab.map
@@ -7,10 +8,10 @@ final class TabViewModel: ObservableObject {
 }
 
 extension TabViewModel {
-    enum Tab: Int, Hashable {
+    enum Tab: Int, Hashable, CaseIterable {
         case map = 0, events, messages, journal, profile
 
-        var title: String {
+        private var title: String {
             switch self {
             case .map:
                 return "Площадки"
@@ -24,5 +25,45 @@ extension TabViewModel {
                 return "Профиль"
             }
         }
+
+        @ViewBuilder
+        private var icon: some View {
+            switch self {
+            case .map:
+                Image.sportsGroundIcon
+            case .events:
+                Image(systemName: Icons.Tabbar.events.rawValue)
+            case .messages:
+                Image(systemName: Icons.Tabbar.messages.rawValue)
+            case .journal:
+                Image(systemName: Icons.Tabbar.journals.rawValue)
+            case .profile:
+                Image(systemName: Icons.Tabbar.profile.rawValue)
+            }
+        }
+
+        var tabItemLabel: some View {
+            Label(
+                title: { Text(title) },
+                icon: { icon }
+            )
+            .environment(\.symbolVariants, .none)
+        }
+
+        @ViewBuilder
+        var screen: some View {
+            switch self {
+            case .map:
+                SportsGroundsMapView()
+            case .events:
+                EventsListView()
+            case .messages:
+                DialogsScreen()
+            case .journal:
+                JournalsScreen()
+            case .profile:
+                ProfileScreen()
+            }
+        }
     }
 }