Cleanup

Author: marcoroth

RubyEvents.xcodeproj/project.pbxproj

@@ -163,7 +163,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = NAQKG42NC3;
+				DEVELOPMENT_TEAM = 5UY2R75SM3;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = RubyEvents/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = RubyEvents;
@@ -173,11 +173,12 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.rubyevents.RubyEvents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -194,7 +195,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = NAQKG42NC3;
+				DEVELOPMENT_TEAM = 5UY2R75SM3;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = RubyEvents/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = RubyEvents;
@@ -204,11 +205,12 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 17.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.rubyevents.RubyEvents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

RubyEvents/App.swift

@@ -11,81 +11,89 @@ import UIKit
 
 class App {
   static var instance = App()
-
+  
   var isTabbed: Bool = true
-
+  
   var sceneDelegate: SceneDelegate?
-
+  
   lazy var navigator = Navigator(delegate: self)
   lazy var tabBarController = TabBarController(app: self)
-
+  
   private var currentUnreadMessagesCount: String?
-
+  
   var navigators: [Navigator] {
     if isTabbed {
       return tabBarController.navigators
     }
     return [navigator]
   }
-
+  
   var viewControllers: [UIViewController] {
     navigators.map(\.rootViewController)
   }
-
+  
   var window: UIWindow? {
     sceneDelegate?.window
   }
-
+  
   var isDebug: Bool {
-    #if DEBUG
-      return true
-    #else
-      return false
-    #endif
+#if DEBUG
+    return true
+#else
+    return false
+#endif
   }
-
+  
   var isTestFlight: Bool {
     Bundle.main.appStoreReceiptURL?.lastPathComponent == "sandboxReceipt"
   }
-
+  
   var environment: Environment {
     if isDebug {
       return .development
     }
-
+    
     if isTestFlight {
       return .staging
     }
-
+    
     return .production
   }
-
+  
   func start(sceneDelegate: SceneDelegate) {
     self.sceneDelegate = sceneDelegate
     self.tabBarController.setupTabs()
 
     switchToTabController()
   }
-
+  
   func switchToNavigationController() {
     sceneDelegate?.window?.rootViewController = navigator.rootViewController
     self.isTabbed = false
   }
-
+  
   func switchToTabController() {
     sceneDelegate?.window?.rootViewController = tabBarController
     self.isTabbed = true
   }
-
+  
   func navigatorFor(title: String) -> Navigator? {
     tabBarController.navigatorFor(title: title)
   }
 }
 
+extension UIHostingController {
+  func hideNavigationBar(animated: Bool = true) {
+    navigationController?.setNavigationBarHidden(true, animated: animated)
+  }
+  
+  func showNavigationBar(animated: Bool = true) {
+    navigationController?.setNavigationBarHidden(false, animated: animated)
+  }
+}
+
 extension App: NavigatorDelegate {
   func handle(proposal: VisitProposal) -> ProposalResult {
-
-    print("viewController \(proposal.viewController)")
 
     switch proposal.viewController {
     case "home":
@@ -94,7 +102,8 @@ extension App: NavigatorDelegate {
           navigator: App.instance.navigatorFor(title: "Home")
         )
       )
-
+      viewController.hideNavigationBar()
+      
       return .acceptCustom(viewController)
     default:
       return .accept

RubyEvents/AppDelegate.swift

@@ -11,35 +11,35 @@ import UIKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
   func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-
+    
     let versionNumber = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
     let uniqueDeviceId = UIDevice.current.identifierForVendor?.uuidString ?? ""
-
+    
     Hotwire.config.applicationUserAgentPrefix = "Hotwire Native iOS; app_version: \(versionNumber); unique_device_id: \(uniqueDeviceId);"
-
+    
     Hotwire.registerBridgeComponents([
       ButtonComponent.self
     ])
-
+    
     Hotwire.config.showDoneButtonOnModals = true
     Hotwire.config.debugLoggingEnabled = true
-
+    
     Hotwire.loadPathConfiguration(from: [
       .server(Router.instance.path_configuration_url()),
       .file(Bundle.main.url(forResource: "path-configuration", withExtension: "json")!)
     ])
-
+    
     return true
   }
-
+  
   // MARK: UISceneSession Lifecycle
-
+  
   func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
     // Called when a new scene session is being created.
     // Use this method to select a configuration to create the new scene with.
     return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
   }
-
+  
   func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
     // Called when the user discards a scene session.
     // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.

RubyEvents/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.236",
-          "green" : "0.081",
-          "red" : "0.865"
+          "blue" : "0.037",
+          "green" : "0.023",
+          "red" : "0.008"
         }
       },
       "idiom" : "universal"

RubyEvents/Assets.xcassets/AppIcon.appiconset/AppIcon.png

@@ -2,7 +2,7 @@ import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
   var window: UIWindow?
-
+  
   func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
     App.instance.start(sceneDelegate: self)
   }

RubyEvents/Assets.xcassets/LaunchScreen.imageset/LaunchScreen.png

@@ -16,58 +16,55 @@ enum NetworkError: Error {
 
 class APIService {
   static let shared = APIService()
-
+  
   private init() {}
-
+  
   func fetchData<T: Decodable>(from endpoint: String, completion: @escaping (Result<T, NetworkError>) -> Void) {
     guard let url = URL(string: endpoint) else {
       completion(.failure(.invalidURL))
       return
     }
-
+    
     let task = URLSession.shared.dataTask(with: url) { data, response, error in
       if let error = error {
         completion(.failure(.requestFailed(error)))
         return
       }
-
+      
       guard let httpResponse = response as? HTTPURLResponse,
-          (200...299).contains(httpResponse.statusCode) else {
+            (200...299).contains(httpResponse.statusCode) else {
         completion(.failure(.invalidResponse))
         return
       }
-
+      
       guard let data = data else {
         completion(.failure(.invalidData))
         return
       }
-
+      
       do {
-        let json = try JSONSerialization.jsonObject(with: data) as? [String: Any]
-        print("JSON structure: \(json ?? [:])")
-
         let decodedData = try JSONDecoder().decode(T.self, from: data)
         completion(.success(decodedData))
       } catch {
         completion(.failure(.invalidData))
       }
     }
-
+    
     task.resume()
   }
-
+  
   func fetchData<T: Decodable>(from endpoint: String) async throws -> T {
     guard let url = URL(string: endpoint) else {
       throw NetworkError.invalidURL
     }
-
+    
     let (data, response) = try await URLSession.shared.data(from: url)
-
+    
     guard let httpResponse = response as? HTTPURLResponse,
-        (200...299).contains(httpResponse.statusCode) else {
+          (200...299).contains(httpResponse.statusCode) else {
       throw NetworkError.invalidResponse
     }
-
+    
     do {
       return try JSONDecoder().decode(T.self, from: data)
     } catch {