improve widgets

HabitRPG · Jun 27, 2024 · 719f4ef · 719f4ef
1 parent e9e35bc
commit 719f4ef
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 76 deletions.
diff --git a/HabitRPG/Strings/de.lproj/Mainstrings.strings b/HabitRPG/Strings/de.lproj/Mainstrings.strings
@@ -457,7 +457,7 @@
 /* (No Comment) */
 "tasks.reward" = "Belohnung";
 /* (No Comment) */
-"tasks.todo" = "To-Do";
+"tasks.todo" = "To Do";
 /* (No Comment) */
 "theme.blue" = "Blau";
 /* (No Comment) */
@@ -539,7 +539,7 @@
 "tasks.habits" = "Gewohnheiten";
 "tasks.dailies" = "Tägliche Aufgaben";
 "tasks.rewards" = "Belohnungen";
-"tasks.todos" = "To-Dos";
+"tasks.todos" = "To Dos";
 "tasks.form.accessibility.enable" = "Aktiviere %@";
 "tasks.form.accessibility.disable" = "Deaktiviere %@";
 "tasks.work" = "Arbeit";

diff --git a/HabitRPG/Utilities/SceneDelegate.swift b/HabitRPG/Utilities/SceneDelegate.swift
@@ -114,7 +114,8 @@ class SceneDelegate: NSObject, UIWindowSceneDelegate {
         WidgetCenter.shared.reloadTimelines(ofKind: "DailiesCountWidget")
         WidgetCenter.shared.reloadTimelines(ofKind: "StatsWidget")
         WidgetCenter.shared.reloadTimelines(ofKind: "TaskListWidget")
-
+        WidgetCenter.shared.reloadTimelines(ofKind: "TodoTaskListWidget")
+
         WidgetCenter.shared.getCurrentConfigurations { result in
             switch result {
             case let .success(info):

diff --git a/Habitica Widgets/HabiticaWidgets.swift b/Habitica Widgets/HabiticaWidgets.swift
@@ -14,7 +14,8 @@ struct HabiticaWidgets: WidgetBundle {
     @WidgetBundleBuilder
     var body: some Widget {
         DailiesCountWidget()
-        TaskListWidget()
+        DailyTaskListWidget()
+        TodoTaskListWidget()
         AddTaskWidgetSingle()
         AddTaskWidget()
         StatsWidget()

diff --git a/Habitica Widgets/RemainingDailiesWidget.swift b/Habitica Widgets/RemainingDailiesWidget.swift
@@ -13,7 +13,6 @@ import Habitica_Models
 import ReactiveSwift
 
 struct DailiesCountProvider: IntentTimelineProvider {
-
     func placeholder(in context: Context) -> DailiesCountWidgetEntry {
         DailiesCountWidgetEntry(date: Date(),
                   widgetFamily: context.family, totalCount: 42, completedCount: 10)
@@ -60,7 +59,7 @@ struct DailiesCountWidgetEntry: TimelineEntry {
     var needsCron = false
 }
 
-struct DailiesCountWidgetView : View {
+struct DailiesCountWidgetView: View {
     var entry: DailiesCountProvider.Entry
 
     private var isLockscreenWidget: Bool {

diff --git a/Habitica Widgets/TaskListWidget.swift b/Habitica Widgets/TaskListWidget.swift
diff --git a/...ica Widgets/DailiesCount.intentdefinition → Habitica Widgets/Widget.intentdefinition b/...ica Widgets/DailiesCount.intentdefinition → Habitica Widgets/Widget.intentdefinition
@@ -83,11 +83,11 @@
 	<key>INIntentDefinitionNamespace</key>
 	<string>fLm7kx</string>
 	<key>INIntentDefinitionSystemVersion</key>
-	<string>21G115</string>
+	<string>23A344</string>
 	<key>INIntentDefinitionToolsBuildVersion</key>
-	<string>14B47b</string>
+	<string>15F31d</string>
 	<key>INIntentDefinitionToolsVersion</key>
-	<string>14.1</string>
+	<string>15.4</string>
 	<key>INIntents</key>
 	<array>
 		<dict>

diff --git a/Habitica.xcodeproj/project.pbxproj b/Habitica.xcodeproj/project.pbxproj
@@ -378,8 +378,8 @@
 		29BEE6D7252E14F000D456F8 /* HabiticaWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE6C7252E144F00D456F8 /* HabiticaWidgets.swift */; };
 		29BEE6DC252E14F300D456F8 /* RemainingDailiesWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE6CD252E14C000D456F8 /* RemainingDailiesWidget.swift */; };
 		29BEE6E7252E1B7700D456F8 /* Color-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE6E1252E1B3600D456F8 /* Color-Extensions.swift */; };
-		29BEE6ED252E27B800D456F8 /* DailiesCount.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE6EC252E27B800D456F8 /* DailiesCount.intentdefinition */; };
-		29BEE73F252E2CC300D456F8 /* DailiesCount.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE6EC252E27B800D456F8 /* DailiesCount.intentdefinition */; };
+		29BEE6ED252E27B800D456F8 /* Widget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE6EC252E27B800D456F8 /* Widget.intentdefinition */; };
+		29BEE73F252E2CC300D456F8 /* Widget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE6EC252E27B800D456F8 /* Widget.intentdefinition */; };
 		29BEE755252E321F00D456F8 /* AvatarWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE754252E321F00D456F8 /* AvatarWidget.swift */; };
 		29BEE75A252E33AB00D456F8 /* Avatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29FEB277202B491600EA245A /* Avatar.swift */; };
 		29BEE760252E367600D456F8 /* URLImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29BEE75F252E367600D456F8 /* URLImage.swift */; };
@@ -1047,7 +1047,7 @@
 		29BEE6C7252E144F00D456F8 /* HabiticaWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HabiticaWidgets.swift; sourceTree = "<group>"; };
 		29BEE6CD252E14C000D456F8 /* RemainingDailiesWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemainingDailiesWidget.swift; sourceTree = "<group>"; };
 		29BEE6E1252E1B3600D456F8 /* Color-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color-Extensions.swift"; sourceTree = "<group>"; };
-		29BEE6EC252E27B800D456F8 /* DailiesCount.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = DailiesCount.intentdefinition; sourceTree = "<group>"; };
+		29BEE6EC252E27B800D456F8 /* Widget.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = Widget.intentdefinition; sourceTree = "<group>"; };
 		29BEE754252E321F00D456F8 /* AvatarWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarWidget.swift; sourceTree = "<group>"; };
 		29BEE75F252E367600D456F8 /* URLImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLImage.swift; sourceTree = "<group>"; };
 		29BEE7B4252EE92D00D456F8 /* AddTaskWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTaskWidget.swift; sourceTree = "<group>"; };
@@ -1861,7 +1861,7 @@
 				29BEE6CD252E14C000D456F8 /* RemainingDailiesWidget.swift */,
 				29BEE6E1252E1B3600D456F8 /* Color-Extensions.swift */,
 				29BEE631252CCFE100D456F8 /* StatsWidget.swift */,
-				29BEE6EC252E27B800D456F8 /* DailiesCount.intentdefinition */,
+				29BEE6EC252E27B800D456F8 /* Widget.intentdefinition */,
 				29BEE754252E321F00D456F8 /* AvatarWidget.swift */,
 				29BEE75F252E367600D456F8 /* URLImage.swift */,
 				29BEE7B4252EE92D00D456F8 /* AddTaskWidget.swift */,
@@ -3269,7 +3269,7 @@
 			files = (
 				29BEE64D252DD3F400D456F8 /* TaskManager.swift in Sources */,
 				29A9858125472D1700F04665 /* HabiticaAnalytics.swift in Sources */,
-				29BEE6ED252E27B800D456F8 /* DailiesCount.intentdefinition in Sources */,
+				29BEE6ED252E27B800D456F8 /* Widget.intentdefinition in Sources */,
 				29BEE755252E321F00D456F8 /* AvatarWidget.swift in Sources */,
 				2995F7FC25BAF3B600322CB3 /* RemoteLogger.swift in Sources */,
 				29BEE632252CCFE100D456F8 /* StatsWidget.swift in Sources */,
@@ -3634,7 +3634,7 @@
 				29C1360824EE917F00DBC6B3 /* UITableView-Extensions.swift in Sources */,
 				29D50B7B25F9037A0009CF55 /* AppDelegate-Notifications.swift in Sources */,
 				2927025724E3EEDE00BCAA77 /* ReportBugViewController.swift in Sources */,
-				29BEE73F252E2CC300D456F8 /* DailiesCount.intentdefinition in Sources */,
+				29BEE73F252E2CC300D456F8 /* Widget.intentdefinition in Sources */,
 				49EE3FD8201908AB00CD7608 /* ChallengeButtonStyleProvider.swift in Sources */,
 				D9CE90491E4DCF7D00702578 /* SubscriptionDetailView.swift in Sources */,
 				291666432BCFD5E70068FCBF /* AvatarShopItemView.swift in Sources */,