Browse Source

test

Signed-off-by: marinofaggiana <marino.faggiana@nextcloud.com>
marinofaggiana 2 năm trước cách đây
mục cha
commit
1f88d5df18

+ 7 - 5
DashboardWidget/DashBoardList.swift

@@ -10,14 +10,15 @@ import SwiftUI
 import WidgetKit
 
 struct DashBoardList: View {
+    var data: [DashboardData]
     var body: some View {
         VStack(alignment: .center) {
             Text("Good morning")
                 .font(.title)
                 .bold()
             VStack {
-                ForEach(NCDataDashboardList, id: \.id) { dataElement in
-                    DashboardElement(element: dataElement)
+                ForEach(data, id: \.id) { element in
+                    DashboardElement(element: element)
                 }
             }
         }.padding()
@@ -25,7 +26,7 @@ struct DashBoardList: View {
 }
 
 struct DashboardElement: View {
-    var element: NCDataDashboard
+    var element: DashboardData
     var body: some View {
         HStack {
             Image(element.image)
@@ -52,7 +53,8 @@ struct DashboardElement: View {
 
 struct NCElementDashboard_Previews: PreviewProvider {
     static var previews: some View {
-        DashBoardList()
-            .previewContext(WidgetPreviewContext(family: .systemLarge))
+        Group {
+            DashBoardList(data: DataDashboardPreview).previewContext(WidgetPreviewContext(family: .systemLarge))
+        }
     }
 }

+ 3 - 3
DashboardWidget/NCDataDashboard.swift → DashboardWidget/DashboardData.swift

@@ -1,5 +1,5 @@
 //
-//  NCDataDashboard.swift
+//  DashboardData.swift
 //  DashboardWidgetExtension
 //
 //  Created by Marino Faggiana on 20/08/22.
@@ -8,14 +8,14 @@
 
 import Foundation
 
-struct NCDataDashboard: Identifiable, Codable, Hashable {
+struct DashboardData: Identifiable, Codable, Hashable {
     var id: Int
     var image: String
     var title: String
     var subTitle: String
 }
 
-let NCDataDashboardList: [NCDataDashboard] = [
+let DataDashboardPreview: [DashboardData] = [
     .init(id: 1, image: "nextcloud", title: "The Weeknd", subTitle: "theweeknd-after-hours"),
     .init(id: 2, image: "nextcloud", title: "Lil Uzi", subTitle: "eternalatake-liluzivert"),
     .init(id: 3, image: "nextcloud", title: "Dua Lipa", subTitle: "dualipa-bReAK mY heART"),

+ 7 - 5
DashboardWidget/DashboardWidget.swift

@@ -10,6 +10,7 @@ import WidgetKit
 import SwiftUI
 
 struct Provider: TimelineProvider {
+
     func placeholder(in context: Context) -> SimpleEntry {
         SimpleEntry(date: Date())
     }
@@ -56,16 +57,17 @@ struct DashboardWidget: Widget {
     var body: some WidgetConfiguration {
         StaticConfiguration(kind: kind, provider: Provider()) { _ in
             // DashboardWidgetEntryView(entry: entry)
-            DashBoardList()
+            DashBoardList(data: DataDashboardPreview)
         }
-        .configurationDisplayName("My Widget")
-        .description("This is an example widget.")
+        .supportedFamilies([.systemLarge])
+        .configurationDisplayName("Nextcloud Dashboard Widget")
+        .description("Nextcloud Dashboard Widget.")
     }
 }
 
 struct DashboardWidget_Previews: PreviewProvider {
+
     static var previews: some View {
-        DashBoardList()
-            .previewContext(WidgetPreviewContext(family: .systemExtraLarge))
+        DashBoardList(data: DataDashboardPreview).previewContext(WidgetPreviewContext(family: .systemLarge))
     }
 }

+ 4 - 4
Nextcloud.xcodeproj/project.pbxproj

@@ -387,7 +387,7 @@
 		F7DBC37C23325E02001A85BA /* NCAppConfigView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DBC37B23325E01001A85BA /* NCAppConfigView.swift */; };
 		F7DFB7F0219C5B8000680748 /* NCCreateFormUploadAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DFB7EF219C5B8000680748 /* NCCreateFormUploadAssets.swift */; };
 		F7DFB7F4219C5CA800680748 /* NCCreateFormUploadScanDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DFB7F3219C5CA800680748 /* NCCreateFormUploadScanDocument.swift */; };
-		F7E0710128B13BB00001B882 /* NCDataDashboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E0710028B13BB00001B882 /* NCDataDashboard.swift */; };
+		F7E0710128B13BB00001B882 /* DashboardData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E0710028B13BB00001B882 /* DashboardData.swift */; };
 		F7E0CDCF265CE8610044854E /* NCUserStatus.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */; };
 		F7E4D9C422ED929B003675FD /* NCShareCommentsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E4D9C322ED929B003675FD /* NCShareCommentsCell.swift */; };
 		F7E572FD278F146C00F8C99E /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = F70B86802642CF5400ED5349 /* OpenSSL.xcframework */; };
@@ -954,7 +954,7 @@
 		F7DE9AB01F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		F7DFB7EF219C5B8000680748 /* NCCreateFormUploadAssets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadAssets.swift; sourceTree = "<group>"; };
 		F7DFB7F3219C5CA800680748 /* NCCreateFormUploadScanDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadScanDocument.swift; sourceTree = "<group>"; };
-		F7E0710028B13BB00001B882 /* NCDataDashboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCDataDashboard.swift; sourceTree = "<group>"; };
+		F7E0710028B13BB00001B882 /* DashboardData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardData.swift; sourceTree = "<group>"; };
 		F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCUserStatus.storyboard; sourceTree = "<group>"; };
 		F7E45E6D21E75BF200579249 /* ja-JP */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ja-JP"; path = "ja-JP.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		F7E4D9C322ED929B003675FD /* NCShareCommentsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCommentsCell.swift; sourceTree = "<group>"; };
@@ -1303,8 +1303,8 @@
 			children = (
 				F7346E2228B0FEBA006CE2D2 /* Assets.xcassets */,
 				F72A17D728B221E300F3F159 /* DashBoardList.swift */,
+				F7E0710028B13BB00001B882 /* DashboardData.swift */,
 				F7346E1528B0EF5C006CE2D2 /* DashboardWidget.swift */,
-				F7E0710028B13BB00001B882 /* NCDataDashboard.swift */,
 				F7346E2028B0FA3A006CE2D2 /* DashboardWidget-Brinding-header.h */,
 			);
 			path = DashboardWidget;
@@ -2581,7 +2581,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F7E0710128B13BB00001B882 /* NCDataDashboard.swift in Sources */,
+				F7E0710128B13BB00001B882 /* DashboardData.swift in Sources */,
 				F7346E1628B0EF5C006CE2D2 /* DashboardWidget.swift in Sources */,
 				F72A17D828B221E300F3F159 /* DashBoardList.swift in Sources */,
 			);