PZAccountKit & PZWidgetsKit // Add necessary assets, etc.

pizza-studio · Oct 26, 2024 · 8f0a683 · 8f0a683
1 parent 0fa0b73
commit 8f0a683
Show file tree

Hide file tree

Showing 131 changed files with 2,948 additions and 373 deletions.
diff --git a/...r/Sources/PZHelper/PZH_Frontends/PZH_Features/TodayDashboard/InAppDailyNoteCardView.swift b/...r/Sources/PZHelper/PZH_Frontends/PZH_Features/TodayDashboard/InAppDailyNoteCardView.swift
@@ -207,7 +207,12 @@ private struct NoteView: View {
         InformationRowView("app.dailynote.card.resin.label".i18nPZHelper) {
             let resinIntel = dailyNote.resinInfo
             HStack(spacing: 10) {
-                AccountKit.imageAsset("gi_note_resin")
+                let staminaIconName = switch dailyNote.game {
+                case .genshinImpact: "gi_note_resin"
+                case .starRail: "hsr_note_trailblazePower"
+                case .zenlessZone: "zzz_note_battery"
+                }
+                AccountKit.imageAsset(staminaIconName)
                     .resizable()
                     .scaledToFit()
                     .scaleEffect(1.1)

diff --git a/...untKit/Resources/Media.xcassets/DailyNoteIcons/gi_note_transformer.imageset/Contents.json b/...untKit/Resources/Media.xcassets/DailyNoteIcons/gi_note_transformer.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "gi_note_transformer.heic",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...urces/Media.xcassets/DailyNoteIcons/gi_note_transformer.imageset/gi_note_transformer.heic b/...urces/Media.xcassets/DailyNoteIcons/gi_note_transformer.imageset/gi_note_transformer.heic
diff --git a/...ntKit/Resources/Media.xcassets/DailyNoteIcons/gi_note_weeklyBosses.imageset/Contents.json b/...ntKit/Resources/Media.xcassets/DailyNoteIcons/gi_note_weeklyBosses.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "gi_note_weeklyBosses.heic",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ces/Media.xcassets/DailyNoteIcons/gi_note_weeklyBosses.imageset/gi_note_weeklyBosses.heic b/...ces/Media.xcassets/DailyNoteIcons/gi_note_weeklyBosses.imageset/gi_note_weeklyBosses.heic
diff --git a/...ountKit/Resources/Media.xcassets/DailyNoteIcons/hsr_note_dailyTask.imageset/Contents.json b/...ountKit/Resources/Media.xcassets/DailyNoteIcons/hsr_note_dailyTask.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "hsr_note_dailyTask.heic",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...sources/Media.xcassets/DailyNoteIcons/hsr_note_dailyTask.imageset/hsr_note_dailyTask.heic b/...sources/Media.xcassets/DailyNoteIcons/hsr_note_dailyTask.imageset/hsr_note_dailyTask.heic
diff --git a/...Resources/Media.xcassets/DailyNoteIcons/hsr_note_simulatedUniverse.imageset/Contents.json b/...Resources/Media.xcassets/DailyNoteIcons/hsr_note_simulatedUniverse.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "hsr_note_simulatedUniverse.heic",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...assets/DailyNoteIcons/hsr_note_simulatedUniverse.imageset/hsr_note_simulatedUniverse.heic b/...assets/DailyNoteIcons/hsr_note_simulatedUniverse.imageset/hsr_note_simulatedUniverse.heic
diff --git a/...tKit/Resources/Media.xcassets/DailyNoteIcons/hsr_note_weeklyBosses.imageset/Contents.json b/...tKit/Resources/Media.xcassets/DailyNoteIcons/hsr_note_weeklyBosses.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "hsr_note_weeklyBosses.heic",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...s/Media.xcassets/DailyNoteIcons/hsr_note_weeklyBosses.imageset/hsr_note_weeklyBosses.heic b/...s/Media.xcassets/DailyNoteIcons/hsr_note_weeklyBosses.imageset/hsr_note_weeklyBosses.heic
diff --git a/...getsKit/Sources/PZWidgetsKit/Modules/LiveActivityWidget/ResinRecoveryActivityWidget.swift b/...getsKit/Sources/PZWidgetsKit/Modules/LiveActivityWidget/ResinRecoveryActivityWidget.swift
@@ -29,20 +29,20 @@ struct ResinRecoveryActivityWidget: Widget {
                         Image(systemSymbol: .personFill)
                         Text(context.attributes.accountName)
                     }
-                    .foregroundColor(Color("textColor.appIconLike"))
+                    .foregroundColor(Color("textColor.appIconLike", bundle: .module))
                     .font(.caption2)
                     .padding(.leading)
                 }
                 .contentMargins(.trailing, 15)
                 DynamicIslandExpandedRegion(.trailing) {
                     HStack(alignment: .center, spacing: 4) {
-                        Image("AppIconSmall")
+                        Image("AppIcon")
                             .resizable()
                             .scaledToFit()
                             .clipShape(RoundedRectangle(cornerRadius: 5))
                             .frame(width: 15)
-                        Text("app.title.full")
-                            .foregroundColor(Color("textColor.appIconLike"))
+                        Text("app.title.full", bundle: .module)
+                            .foregroundColor(Color("textColor.appIconLike", bundle: .module))
                             .font(.caption2)
                     }
                     .padding(.trailing)
@@ -52,12 +52,12 @@ struct ResinRecoveryActivityWidget: Widget {
                     HStack {
                         if Date() < context.state.next20ResinRecoveryTime {
                             HStack {
-                                Image("树脂")
+                                AccountKit.imageAsset(resinImageAssetName(context))
                                     .resizable()
                                     .scaledToFit()
                                     .frame(maxHeight: 40)
                                 VStack(alignment: .leading) {
-                                    Text("widget.next20Resin:\(context.state.next20ResinCount)")
+                                    Text("widget.next20Resin:\(context.state.next20ResinCount)", bundle: .module)
                                         .font(.caption2)
                                     Text(
                                         timerInterval: Date() ... context.state
@@ -67,23 +67,22 @@ struct ResinRecoveryActivityWidget: Widget {
                                     .multilineTextAlignment(.leading)
                                     .font(.system(.title2, design: .rounded))
                                     .foregroundColor(
-                                        Color("textColor.originResin")
+                                        Color("textColor.originResin", bundle: .module)
                                     )
                                 }
                                 .gridColumnAlignment(.leading)
                                 .frame(width: 100)
                             }
                         }
                         Spacer()
-                        if Date() < context.state
-                            .resinRecoveryTime {
+                        if Date() < context.state.resinRecoveryTime {
                             HStack {
-                                Image("浓缩树脂")
+                                AccountKit.imageAsset("gi_note_resin_condensed")
                                     .resizable()
                                     .scaledToFit()
                                     .frame(maxHeight: 40)
                                 VStack(alignment: .leading) {
-                                    Text("widget.nextMaxResin")
+                                    Text("widget.nextMaxResin", bundle: .module)
                                         .font(.caption2)
 
                                     Text(
@@ -94,18 +93,18 @@ struct ResinRecoveryActivityWidget: Widget {
                                     .multilineTextAlignment(.leading)
                                     .font(.system(.title2, design: .rounded))
                                     .foregroundColor(
-                                        Color("textColor.originResin")
+                                        Color("textColor.originResin", bundle: .module)
                                     )
                                 }
                                 .gridColumnAlignment(.leading)
                                 .frame(width: 100)
                             }
                         }
                     }
-                    .foregroundColor(Color("textColor3"))
+                    .foregroundColor(Color("textColor3", bundle: .module))
                 }
             } compactLeading: {
-                Image("树脂").resizable().scaledToFit()
+                AccountKit.imageAsset(resinImageAssetName(context)).resizable().scaledToFit()
             } compactTrailing: {
                 if Date() < context.state
                     .next20ResinRecoveryTime {
@@ -118,13 +117,21 @@ struct ResinRecoveryActivityWidget: Widget {
                     .monospacedDigit()
                     .multilineTextAlignment(.center)
                     .frame(width: 60)
-                    .foregroundColor(Color("textColor2"))
+                    .foregroundColor(Color("textColor2", bundle: .module))
                 }
             } minimal: {
-                Image("树脂").resizable().scaledToFit()
+                AccountKit.imageAsset(resinImageAssetName(context)).resizable().scaledToFit()
             }
         }
     }
+
+    func resinImageAssetName(_ context: ActivityViewContext<ResinRecoveryAttributes>) -> String {
+        switch context.state.game {
+        case .genshinImpact: "gi_note_resin"
+        case .starRail: "hsr_note_trailblazePower"
+        case .zenlessZone: "zzz_note_battery"
+        }
+    }
 }
 
 struct ResinRecoveryActivityWidgetLockScreenView: View {
@@ -134,6 +141,14 @@ struct ResinRecoveryActivityWidgetLockScreenView: View {
 
     var useNoBackground: Bool { context.state.background == .noBackground }
 
+    var resinImageAssetName: String {
+        switch context.state.game {
+        case .genshinImpact: "gi_note_resin"
+        case .starRail: "hsr_note_trailblazePower"
+        case .zenlessZone: "zzz_note_battery"
+        }
+    }
+
     @MainActor var body: some View {
         let mainContent = contentView
         #if !os(watchOS)
@@ -179,12 +194,12 @@ struct ResinRecoveryActivityWidgetLockScreenView: View {
             Grid(verticalSpacing: 7) {
                 if #available(iOS 17, *) {
                     GridRow {
-                        Image("树脂")
+                        AccountKit.imageAsset(resinImageAssetName)
                             .resizable()
                             .scaledToFit()
                             .frame(maxHeight: 38)
                         VStack(alignment: .leading) {
-                            Text("widget.currentResin")
+                            Text("widget.currentResin", bundle: .module)
                                 .font(.caption2)
                             HStack(alignment: .lastTextBaseline, spacing: 0) {
                                 Text(verbatim: "\(context.state.currentResin)")
@@ -199,12 +214,12 @@ struct ResinRecoveryActivityWidgetLockScreenView: View {
                     if context.state.showNext20Resin,
                        Date() < context.state.next20ResinRecoveryTime {
                         GridRow {
-                            Image("树脂")
+                            AccountKit.imageAsset(resinImageAssetName)
                                 .resizable()
                                 .scaledToFit()
                                 .frame(maxHeight: 38)
                             VStack(alignment: .leading) {
-                                Text("widget.next20Resin:\(context.state.next20ResinCount)")
+                                Text("widget.next20Resin:\(context.state.next20ResinCount)", bundle: .module)
                                     .font(.caption2)
                                 Text(
                                     timerInterval: Date() ... context.state
@@ -218,15 +233,14 @@ struct ResinRecoveryActivityWidgetLockScreenView: View {
                         }
                     }
                 }
-                if Date() < context.state
-                    .resinRecoveryTime {
+                if context.state.game == .genshinImpact, Date() < context.state.resinRecoveryTime {
                     GridRow {
-                        Image("浓缩树脂")
+                        AccountKit.imageAsset("gi_note_resin_condensed")
                             .resizable()
                             .scaledToFit()
                             .frame(maxHeight: 35)
                         VStack(alignment: .leading) {
-                            Text("widget.nextMaxResin")
+                            Text("widget.nextMaxResin", bundle: .module)
                                 .font(.caption2)
                             Text(
                                 timerInterval: Date() ... context.state
@@ -240,16 +254,14 @@ struct ResinRecoveryActivityWidgetLockScreenView: View {
                         //                    .frame(width: 140)
                     }
                 }
-                if context.state.showExpedition,
-                   let time = context.state.expeditionAllCompleteTime,
-                   Date() < time {
+                if context.state.showExpedition, let time = context.state.expeditionAllCompleteTime, Date() < time {
                     GridRow {
-                        Image("派遣探索")
+                        AccountKit.imageAsset("gi_note_expedition")
                             .resizable()
                             .scaledToFit()
                             .frame(maxHeight: 29)
                         VStack(alignment: .leading) {
-                            Text("widget.expedition.timeToAllCompletion")
+                            Text("widget.expedition.timeToAllCompletion", bundle: .module)
                                 .font(.caption2)
                             Text(
                                 timerInterval: Date() ... time,
@@ -287,7 +299,7 @@ struct ResinRecoveryActivityWidgetLockScreenView: View {
             }
         }
         .shadow(radius: useNoBackground ? 0 : 0.8)
-        .foregroundColor(useNoBackground ? .primary : Color("textColor3"))
+        .foregroundColor(useNoBackground ? .primary : Color("textColor3", bundle: .module))
         .padding()
     }
 }

diff --git a/...ZWidgetsKit/Sources/PZWidgetsKit/Modules/LiveActivityWidget/ResinRecoveryAttributes.swift b/...ZWidgetsKit/Sources/PZWidgetsKit/Modules/LiveActivityWidget/ResinRecoveryAttributes.swift
@@ -29,25 +29,31 @@ struct ResinRecoveryAttributes: ActivityAttributes, Sendable {
             self.resinRecoveryTime = dailyNote.staminaFullTimeOnFinish
             switch dailyNote {
             case let data as WidgetNote4GI:
+                self.game = .genshinImpact
                 self.expeditionAllCompleteTime = nil
                 self.showExpedition = showExpedition
             case let data as GeneralNote4GI:
+                self.game = .genshinImpact
                 self.expeditionAllCompleteTime = data.expeditions.expeditions.map(\.finishTime).max() ?? .now
                 self.showExpedition = showExpedition
             case let data as Note4HSR:
+                self.game = .starRail
                 self.expeditionAllCompleteTime = data.assignmentInfo.assignments.map(\.finishedTime).max() ?? .now
                 self.showExpedition = showExpedition
             case let data as Note4ZZZ:
+                self.game = .zenlessZone
                 self.showExpedition = false
                 self.expeditionAllCompleteTime = nil
             default:
+                self.game = .genshinImpact // 乱填。
                 self.showExpedition = false
                 self.expeditionAllCompleteTime = nil
             }
         }
 
         // MARK: Internal
 
+        let game: Pizza.SupportedGame
         let resinCountWhenUpdated: Int
         let resinRecoveryTime: Date
         let expeditionAllCompleteTime: Date?

diff --git a/...enWidgets/AlternativeLockScreenResinWidget/AlternativeLockScreenResinWidgetCircular.swift b/...enWidgets/AlternativeLockScreenResinWidget/AlternativeLockScreenResinWidgetCircular.swift
@@ -15,9 +15,21 @@ struct AlternativeLockScreenResinWidgetCircular: View {
 
     let result: Result<any DailyNoteProtocol, any Error>
 
+    var staminaMonochromeIconAssetName: String {
+        switch result {
+        case let .success(data):
+            return switch data.game {
+            case .genshinImpact: "icon.resin"
+            case .starRail: "icon.trailblazePower"
+            case .zenlessZone: "icon.zzzBattery"
+            }
+        case .failure: return "icon.resin"
+        }
+    }
+
     @MainActor var body: some View {
         VStack(spacing: 0) {
-            let img = Image("icon.resin")
+            let img = Image(staminaMonochromeIconAssetName, bundle: .module)
                 .resizable()
                 .scaledToFit()
             switch widgetRenderingMode {
@@ -40,7 +52,7 @@ struct AlternativeLockScreenResinWidgetCircular: View {
             case let .success(data):
                 switch data {
                 case let data as any Note4GI:
-                    Text("\(data.resinInfo.currentResinDynamic)")
+                    Text(verbatim: "\(data.resinInfo.currentResinDynamic)")
                         .font(.system(.body, design: .rounded).weight(.medium))
                         .minimumScaleFactor(0.1)
                 default: