Fixed bugs.

Karkatov · May 30, 2022 · 649c6b6 · 649c6b6
1 parent 5621745
commit 649c6b6
Show file tree

Hide file tree

Showing 16 changed files with 223 additions and 93 deletions.
diff --git a/FirebaseToDo.xcodeproj/project.pbxproj b/FirebaseToDo.xcodeproj/project.pbxproj
@@ -573,12 +573,13 @@
 				DEVELOPMENT_TEAM = 842TDBHB38;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = FirebaseToDo/Info.plist;
+				INFOPLIST_KEY_LSApplicationCategoryType = "";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Для определения вашей геопозиции, необходимо ваше разрешение.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
-				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -603,12 +604,13 @@
 				DEVELOPMENT_TEAM = 842TDBHB38;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = FirebaseToDo/Info.plist;
+				INFOPLIST_KEY_LSApplicationCategoryType = "";
+				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Для определения вашей геопозиции, необходимо ваше разрешение.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
-				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/FirebaseToDo.xcodeproj/xcuserdata/duxxless.xcuserdatad/xcschemes/xcschememanagement.plist b/FirebaseToDo.xcodeproj/xcuserdata/duxxless.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>FirebaseToDo.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>24</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/FirebaseToDo/Controllers/DetailWeatherVC.swift b/FirebaseToDo/Controllers/DetailWeatherVC.swift
@@ -22,14 +22,14 @@ class DetailWeatherVC: UIViewController {
 
     private func setTableView() {
         tableView.isScrollEnabled = false
-        self.view.backgroundColor = .systemGray5
-        tableView.backgroundColor = .white
+        self.view.backgroundColor = .myGray()
+        tableView.backgroundColor = .darkWhite()
         let nameCity = detail.removeFirst().uppercased()
         navigationItem.title = "\(nameCity)"
         tableView.delegate = self
         tableView.dataSource = self
         tableView.register(UITableViewCell.self, forCellReuseIdentifier: "myCell")
-        tableView.frame = CGRect(x: 10, y: 100, width: self.view.bounds.size.width - 20, height: self.view.bounds.size.height / 3.1)
+        tableView.frame = CGRect(x: 10, y: 100, width: self.view.bounds.size.width - 20, height: self.view.bounds.size.height / 2.7)
         tableView.layer.cornerRadius = 20
         view.addSubview(tableView)
     }

diff --git a/FirebaseToDo/Controllers/LoginViewController.swift b/FirebaseToDo/Controllers/LoginViewController.swift
@@ -127,8 +127,8 @@ class LoginViewController: UIViewController {
         loginButton.isEnabled = true
         navigationController?.navigationBar.barStyle = UIBarStyle.black
         tabBarController?.tabBar.isHidden = true
-        //passwordTF.text = "qwerty"
-        //emailTF.text = "[email protected]"
+        passwordTF.text = "qwerty"
+        emailTF.text = "[email protected]"
     }
 }
 

diff --git a/FirebaseToDo/Controllers/ValuteViewController.swift b/FirebaseToDo/Controllers/ValuteViewController.swift
@@ -31,7 +31,7 @@ class ValuteViewController: UIViewController {
     private func setView() {
         let backgroundColor = UIColor(red: 25/255,  green: 75/255, blue: 109/255, alpha: 1)
         let myView = UIView()
-        myView.backgroundColor = .systemGray4
+        myView.backgroundColor = .myGray()
         myView.frame = CGRect(x: 0, y: 0, width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height)
         view.addSubview(myView)
         self.view.backgroundColor = backgroundColor

diff --git a/FirebaseToDo/Controllers/WeatherViewController.swift b/FirebaseToDo/Controllers/WeatherViewController.swift
@@ -23,7 +23,7 @@ class WeatherViewController: UIViewController {
         let imageView = UIImageView()
         imageView.translatesAutoresizingMaskIntoConstraints = false
         imageView.image = UIImage(systemName: "nil")
-        imageView.tintColor = UIColor(named: "DarkWhite")
+        imageView.tintColor = .darkWhite()
         imageView.contentMode = .scaleAspectFill
         return imageView
     }()
@@ -56,16 +56,16 @@ class WeatherViewController: UIViewController {
         label.font = UIFont.systemFont(ofSize: 22)
         label.text = ""
         label.textAlignment = .center
-        label.textColor = UIColor(named: "DarkWhite")
+        label.textColor = .darkWhite()
         return label
     }()
     let cityLabel: UILabel = {
         let label = UILabel()
         label.translatesAutoresizingMaskIntoConstraints = false
         label.textAlignment = .right
         label.text = ""
-        label.font = UIFont.boldSystemFont(ofSize: 34)
-        label.textColor = UIColor(named: "DarkWhite")
+        label.font = UIFont.boldSystemFont(ofSize: 24)
+        label.textColor = .darkWhite()
         return label
     }()
     let searchCityButton: UIButton = {
@@ -74,7 +74,7 @@ class WeatherViewController: UIViewController {
         button.translatesAutoresizingMaskIntoConstraints = false
         let searchImage = UIImage(systemName: "magnifyingglass.circle.fill")
         button.setBackgroundImage(searchImage, for: .normal)
-        button.tintColor = UIColor(named: "DarkWhite")
+        button.tintColor = .darkWhite()
         return button
     }()
     let detailButton: UIButton = {
@@ -83,7 +83,7 @@ class WeatherViewController: UIViewController {
         button.translatesAutoresizingMaskIntoConstraints = false
         let weatherWeekImage = UIImage(systemName: "line.3.horizontal.circle.fill")
         button.setBackgroundImage(weatherWeekImage, for: .normal)
-        button.tintColor = UIColor(named: "DarkWhite")
+        button.tintColor = .darkWhite()
         return button
     }()
     let locationButton: UIButton = {
@@ -92,14 +92,14 @@ class WeatherViewController: UIViewController {
         button.translatesAutoresizingMaskIntoConstraints = false
         let locationImage = UIImage(systemName: "location.circle.fill")
         button.setBackgroundImage(locationImage, for: .normal)
-        button.tintColor = UIColor(named: "DarkWhite")
+        button.tintColor = .darkWhite()
         return button
     }()
     let spiner: UIActivityIndicatorView = {
         let activity = UIActivityIndicatorView()
         activity.translatesAutoresizingMaskIntoConstraints = false
         activity.style = .large
-        activity.color = UIColor(named: "DarkWhite")
+        activity.color = .darkWhite()
         activity.hidesWhenStopped = true
         return activity
     }()
@@ -148,13 +148,13 @@ extension WeatherViewController {
 
     private func makeTemperatureText(temperature: String) -> NSAttributedString {
         let boldAttributes: [NSAttributedString.Key : Any] = [
-            .strokeColor: UIColor(named: "DarkWhite") ?? UIColor(),
-            .foregroundColor : UIColor(named: "DarkWhite") ?? UIColor(),
+            .strokeColor: .darkWhite() ?? UIColor(),
+            .foregroundColor : .darkWhite() ?? UIColor(),
             .font : UIFont.boldSystemFont(ofSize: 80)
         ]
         let celciusAttributes: [NSAttributedString.Key : Any] = [
             .font : UIFont.systemFont(ofSize: 60),
-            .foregroundColor : UIColor(named: "DarkWhite") ?? UIColor()
+            .foregroundColor : .darkWhite() ?? UIColor()
         ]
         let attributedString = NSMutableAttributedString(string: temperature, attributes: boldAttributes)
         attributedString.append(NSAttributedString(string: "℃", attributes: celciusAttributes))
@@ -259,7 +259,7 @@ extension WeatherViewController {
             backgroundImageView.rightAnchor.constraint(equalTo: view.rightAnchor),
             backgroundImageView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: +65),
 
-            cityLabel.bottomAnchor.constraint(equalTo: searchCityButton.bottomAnchor),
+            cityLabel.centerYAnchor.constraint(equalTo: searchCityButton.centerYAnchor),
             cityLabel.leadingAnchor.constraint(greaterThanOrEqualToSystemSpacingAfter: view.leadingAnchor, multiplier: 2),
             cityLabel.trailingAnchor.constraint(equalTo: searchCityButton.leadingAnchor, constant: -20),
 

diff --git a/FirebaseToDo/Helpers/Extension UIColor.swift b/FirebaseToDo/Helpers/Extension UIColor.swift
@@ -11,6 +11,9 @@ extension UIColor {
     static func darkWhite() -> UIColor {
         return UIColor(named: "DarkWhite")!
     }
+    static func myGray() -> UIColor {
+        return UIColor(named: "myGray")!
+    }
 
     static func colorArray() -> [UIColor] {
         let colors: [UIColor] = [.systemRed, .systemBlue, .systemGreen, .systemBrown, .systemIndigo, .systemTeal, .systemYellow, .systemCyan, .systemMint, .systemRed, .systemBlue, .systemPink, .systemBrown, .systemIndigo, .systemPurple, .systemTeal, .systemPurple, .systemYellow, .systemCyan, .systemMint, .systemGreen, .systemRed, .systemBlue, .systemGreen, .systemBrown, .systemIndigo, .systemTeal, .systemYellow, .systemCyan, .systemMint, .systemRed, .systemBlue, .systemPink, .systemBrown, .systemIndigo, .systemPurple, .systemTeal, .systemPurple, .systemYellow, .systemCyan, .systemMint, .systemGreen]

diff --git a/FirebaseToDo/Info.plist b/FirebaseToDo/Info.plist
@@ -2,8 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Для определения вашей геопозиции, необходимо ваше разрешение.</string>
+	<key>User Interface Style</key>
+	<string>Light</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -25,10 +30,5 @@
 	</dict>
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleDefault</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 </dict>
 </plist>
diff --git a/FirebaseToDo/Supporting Files/SceneDelegate.swift b/FirebaseToDo/Supporting Files/SceneDelegate.swift
@@ -10,18 +10,15 @@ import UIKit
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
-
+    var tabBar: UITabBarController!
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
 
         guard let windowScene = (scene as? UIWindowScene) else { return }
         let window = UIWindow(windowScene: windowScene)
 
         //TabBarController
-
-        let tabBar = createTabBarController()
-
+        tabBar = createTabBarController()
         window.rootViewController = tabBar
-//        
         self.window = window
         window.makeKeyAndVisible()
 
@@ -42,11 +39,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
 
     func sceneWillEnterForeground(_ scene: UIScene) {
-        // Called as the scene transitions from the background to the foreground.
-        // Use this method to undo the changes made on entering the background.
     }
 
     func sceneDidEnterBackground(_ scene: UIScene) {
+        tabBar = createTabBarController()
+        window?.rootViewController = tabBar
         // Called as the scene transitions from the foreground to the background.
         // Use this method to save data, release shared resources, and store enough scene-specific state information
         // to restore the scene back to its current state.

diff --git a/FirebaseToDo/View/Assets.xcassets/DarkWhite.colorset/Contents.json b/FirebaseToDo/View/Assets.xcassets/DarkWhite.colorset/Contents.json
@@ -19,15 +19,6 @@
           "value" : "dark"
         }
       ],
-      "color" : {
-        "color-space" : "display-p3",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.000",
-          "green" : "0.000",
-          "red" : "0.000"
-        }
-      },
       "idiom" : "universal"
     }
   ],

diff --git a/FirebaseToDo/View/Assets.xcassets/myGray.colorset/Contents.json b/FirebaseToDo/View/Assets.xcassets/myGray.colorset/Contents.json
@@ -0,0 +1,29 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.850",
+          "green" : "0.850",
+          "red" : "0.850"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/FirebaseToDo/View/TasksListsViewController.swift b/FirebaseToDo/View/TasksListsViewController.swift
@@ -182,7 +182,7 @@ extension TasksListsViewController {
     func showTabBar(_ originX: Double, originY: Double) {
         UIView.animate(withDuration: 1, delay: 0.7, usingSpringWithDamping: 0.8, initialSpringVelocity: 0.7, options: .curveEaseInOut) {
 
-            self.tabBarController?.tabBar.frame.origin = CGPoint(x: originX, y: self.view.frame.size.height - originY)
+            self.tabBarController?.tabBar.frame.origin = CGPoint(x: 20, y: self.view.frame.size.height - originY)
         }
     }
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -560,4 +560,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 57c45133d8ec96308cdb4f30614d2918cab68f32
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
Original file line number	Diff line number	Diff line change
Expand Up		@@ -560,4 +560,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 57c45133d8ec96308cdb4f30614d2918cab68f32

		COCOAPODS: 1.11.2
		COCOAPODS: 1.11.3