🔀 :: [#170] ControlCenter 위젯 추가

.gitignore

@@ -10,6 +10,7 @@
 #           - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
 Pods/
 GoogleService-Info.plist
+GoogleService-QA-Info.plist
 ### fastlane ###
 # fastlane - A streamlined workflow tool for Cocoa deployment
 #

Package.resolved

@@ -68,8 +68,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/groue/GRDB.swift.git",
       "state" : {
-        "revision" : "77b85bed259b7f107710a0b78c439b1c5839dc45",
-        "version" : "6.26.0"
+        "revision" : "2cf6c756e1e5ef6901ebae16576a7e4e4b834622",
+        "version" : "6.29.3"
       }
     },
     {

Package.swift

@@ -24,7 +24,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.7.0"),
         .package(url: "https://github.com/SwiftyJSON/SwiftyJSON", from: "5.0.0"),
-        .package(url: "https://github.com/groue/GRDB.swift.git", from: "6.24.2"),
+        .package(url: "https://github.com/groue/GRDB.swift.git", from: "6.29.3"),
         .package(url: "https://github.com/sindresorhus/LaunchAtLogin.git", from: "5.0.0"),
         .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.20.0"),
         .package(url: "https://github.com/kean/Nuke.git", from: "12.4.0")

Projects/App/Intents/TodayWhatAppOpenIntent.swift

@@ -0,0 +1,27 @@
+import AppIntents
+
+@available(iOS 16, *)
+struct TodayWhatAppOpenIntent: OpenIntent {
+    static let title: LocalizedStringResource = "오늘 급식/시간표 보러가기"
+    static let description = IntentDescription("오늘뭐임 앱 열기")
+
+    static var openAppWhenRun: Bool = true
+
+    @Parameter(title: "화면 위치", default: .home)
+    var target: TodayWhatAppOpenControlAppEnum
+
+    func perform() async throws -> some IntentResult {
+        return .result()
+    }
+}
+
+@available(iOS 16, *)
+enum TodayWhatAppOpenControlAppEnum: String, AppEnum {
+    case home
+
+    static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "홈")
+
+    static let caseDisplayRepresentations: [TodayWhatAppOpenControlAppEnum: DisplayRepresentation] = [
+        .home: "Home"
+    ]
+}

Projects/App/Project.swift

@@ -21,7 +21,7 @@ let settings: Settings = .settings(
     defaultSettings: .recommended
 )
 
-let scripts: [TargetScript] = generateEnvironment.scripts
+let scripts: [TargetScript] = [.swiftLint]
 
 let targets: [Target] = [
     .target(
@@ -31,10 +31,10 @@ let targets: [Target] = [
         bundleId: "\(env.organizationName).\(env.name)",
         deploymentTargets: .iOS("15.0"),
         infoPlist: .file(path: "iOS/Support/Info.plist"),
-        sources: ["iOS/Sources/**"],
+        sources: ["iOS/Sources/**", "Intents/**"],
         resources: ["iOS/Resources/**"],
         entitlements: .file(path: "iOS/Support/TodayWhat.entitlements"),
-        scripts: scripts + [.firebaseCrashlytics],
+        scripts: generateEnvironment.iOSScripts,
         dependencies: [
             .feature(target: .RootFeature),
             .shared(target: .KeychainClient),
@@ -51,7 +51,7 @@ let targets: [Target] = [
         bundleId: "\(env.organizationName).\(env.name).TodayWhatWidget",
         deploymentTargets: .iOS("15.0"),
         infoPlist: .file(path: "iOS-Widget/Support/Info.plist"),
-        sources: ["iOS-Widget/Sources/**"],
+        sources: ["iOS-Widget/Sources/**", "Intents/**"],
         resources: ["iOS-Widget/Resources/**"],
         entitlements: .file(path: "iOS-Widget/Support/TodayWhatWidget.entitlements"),
         scripts: scripts,
@@ -101,7 +101,7 @@ let targets: [Target] = [
         sources: ["macOS/Sources/**"],
         resources: ["macOS/Resources/**"],
         entitlements: .file(path: "macOS/Support/TodayWhat_Mac_App.entitlements"),
-        scripts: scripts + [.launchAtLogin],
+        scripts: generateEnvironment.macOSScripts,
         dependencies: [
             .SPM.LaunchAtScreen,
             .shared(target: .ComposableArchitectureWrapper),

Projects/App/iOS-Widget/Resources/Assets.xcassets/MealControlCenter.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "rice_control_center.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/App/iOS-Widget/Sources/MealControlWidget/MealControlWidget.swift

@@ -0,0 +1,39 @@
+import AppIntents
+import SwiftUI
+import WidgetKit
+
+@available(iOSApplicationExtension 18.0, *)
+struct MealControlWidget: ControlWidget {
+    static let kind: String = "TodayWhatMealControlWidget"
+
+    var body: some ControlWidgetConfiguration {
+        StaticControlConfiguration(
+            kind: MealControlWidget.kind,
+            provider: MealControlValueProvider()
+        ) { value in
+            ControlWidgetButton(action: TodayWhatAppOpenIntent()) {
+                Label {
+                    Text(value.partTime.display)
+                } icon: {
+                    Image(systemName: "fork.knife")
+                }
+            }
+        }
+    }
+}
+
+struct MealControlValueProvider: ControlValueProvider {
+    struct Value {
+        let partTime: MealPartTime
+    }
+
+    var previewValue: Value = .init(
+        partTime: .breakfast
+    )
+
+    func currentValue() async throws -> Value {
+        let today = Date()
+        let partTime = MealPartTime(hour: today)
+        return .init(partTime: partTime)
+    }
+}

Projects/App/iOS-Widget/Sources/TimeTableControlWidget/TimeTableControlWidget.swift

@@ -0,0 +1,22 @@
+import AppIntents
+import SwiftUI
+import WidgetKit
+
+@available(iOSApplicationExtension 18.0, *)
+struct TimeTableControlWidget: ControlWidget {
+    static let kind: String = "TodayWhatTimeTableControlWidget"
+
+    var body: some ControlWidgetConfiguration {
+        StaticControlConfiguration(
+            kind: TimeTableControlWidget.kind
+        ) {
+            ControlWidgetButton(action: TodayWhatAppOpenIntent()) {
+                Label {
+                    Text("시간표")
+                } icon: {
+                    Image(systemName: "clock.fill")
+                }
+            }
+        }
+    }
+}

Projects/App/iOS-Widget/Sources/TodayWhatWidget.swift

@@ -14,6 +14,11 @@ struct TodayWhatWidget: WidgetBundle {
         TodayWhatMealTimeTableWidget()
         TodayWhatMealWidget()
         TodayWhatTimeTableWidget()
+
+        if #available(iOS 18.0, *) {
+            MealControlWidget()
+            TimeTableControlWidget()
+        }
     }
 }
 

Tuist/ProjectDescriptionHelpers/Action/Action+Template.swift

@@ -22,14 +22,30 @@ public extension TargetScript {
         name: "Launch At Login Helper"
     )
 
-    static let firebaseInfoByConfiguration = TargetScript.post(
+    static let firebaseInfoByIOSConfiguration = TargetScript.post(
         script: """
             case "${CONFIGURATION}" in
               "Release" )
-                cp -r "$SRCROOT/Resources/GoogleService-Info.plist" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist"
+                cp -r "$SRCROOT/iOS/Resources/GoogleService-Info.plist" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist"
                 ;;
               *)
-                cp -r "$SRCROOT/Resources/GoogleService-QA-Info.plist" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist"
+                cp -r "$SRCROOT/iOS/Resources/GoogleService-QA-Info.plist" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist"
+                ;;
+            esac
+
+            """,
+        name: "Firebase Info copy by Configuration",
+        basedOnDependencyAnalysis: false
+    )
+
+    static let firebaseInfoByMacOSConfiguration = TargetScript.post(
+        script: """
+            case "${CONFIGURATION}" in
+              "Release" )
+                cp -r "$SRCROOT/macOS/Resources/GoogleService-Info.plist" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist"
+                ;;
+              *)
+                cp -r "$SRCROOT/macOS/Resources/GoogleService-QA-Info.plist" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist"
                 ;;
             esac
 

Tuist/ProjectDescriptionHelpers/GenerateEnvironment.swift

@@ -12,16 +12,29 @@ let environment = ProcessInfo.processInfo.environment["TUIST_ENV"] ?? ""
 public let generateEnvironment = GenerateEnvironment(rawValue: environment) ?? .dev
 
 public extension GenerateEnvironment {
-    var scripts: [TargetScript] {
+    var iOSScripts: [TargetScript] {
         switch self {
         case .ci:
             return []
 
         case .cd:
-            return [.firebaseInfoByConfiguration]
+            return [.firebaseInfoByIOSConfiguration, .firebaseCrashlytics]
 
         case .dev:
-            return [.swiftLint, .firebaseInfoByConfiguration]
+            return [.swiftLint, .firebaseCrashlytics, .firebaseInfoByIOSConfiguration]
+        }
+    }
+
+    var macOSScripts: [TargetScript] {
+        switch self {
+        case .ci:
+            return [.launchAtLogin]
+
+        case .cd:
+            return [.firebaseInfoByMacOSConfiguration, .launchAtLogin]
+
+        case .dev:
+            return [.swiftLint, .firebaseInfoByMacOSConfiguration, .launchAtLogin]
         }
     }
 }

Tuist/ProjectDescriptionHelpers/Project/Project+makeModule.swift

@@ -33,7 +33,7 @@ public extension Project {
         additionalFiles: [FileElement] = [],
         configurations: [Configuration] = []
     ) -> Project {
-        let scripts: [TargetScript] = generateEnvironment.scripts
+        let scripts: [TargetScript] = [.swiftLint]
         let ldFlagsSettings: SettingsDictionary = product == .framework ?
         ["OTHER_LDFLAGS": .string("$(inherited) -all_load")] :
         ["OTHER_LDFLAGS": .string("$(inherited)")]

Tuist/ProjectDescriptionHelpers/Target/TargetSpec.swift

@@ -39,7 +39,7 @@ public struct TargetSpec: Configurable {
         copyFiles: [CopyFilesAction]? = nil,
         headers: Headers? = nil,
         entitlements: Entitlements? = nil,
-        scripts: [TargetScript] = generateEnvironment.scripts,
+        scripts: [TargetScript] = [.swiftLint],
         dependencies: [TargetDependency] = [],
         settings: Settings? = nil,
         coreDataModels: [CoreDataModel] = [],