瀏覽代碼

coding

Signed-off-by: marinofaggiana <marino.faggiana@nextcloud.com>
marinofaggiana 2 年之前
父節點
當前提交
8b082d4ba7

+ 1 - 1
Nextcloud.xcodeproj/project.pbxproj

@@ -1370,8 +1370,8 @@
 			isa = PBXGroup;
 			children = (
 				F72EA95728B7BC4F00C88F0C /* NextcloudData.swift */,
-				F72EA95328B7BABA00C88F0C /* NextcloudWidgetProvider.swift */,
 				F72EA95928B7BD0D00C88F0C /* NextcloudWidgetView.swift */,
+				F72EA95328B7BABA00C88F0C /* NextcloudWidgetProvider.swift */,
 			);
 			path = Nextcloud;
 			sourceTree = "<group>";

+ 5 - 1
Widget/Nextcloud/NextcloudData.swift

@@ -65,7 +65,11 @@ let uploadDatasTest: [UploadData] = [
     .init(id: "8", image: UIImage(named: "nextcloud")!, task: 0)
 ]
 
-func getDataEntry(completion: @escaping (_ entry: NextcloudDataEntry) -> Void) {
+func getDataEntry(isPreview: Bool, completion: @escaping (_ entry: NextcloudDataEntry) -> Void) {
+
+    if isPreview {
+        completion(NextcloudDataEntry(date: Date(), recentDatas: recentDatasTest, uploadDatas: uploadDatasTest, isPlaceholder: true, footerText: ""))
+    }
 
     guard let account = NCManageDatabase.shared.getActiveAccount() else {
         return completion(NextcloudDataEntry(date: Date(), recentDatas: recentDatasTest, uploadDatas: uploadDatasTest,isPlaceholder: true, footerText: NSLocalizedString("_no_active_account_", value: "No account found", comment: "")))

+ 2 - 2
Widget/Nextcloud/NextcloudWidgetProvider.swift

@@ -33,13 +33,13 @@ struct NextcloudWidgetProvider: TimelineProvider {
     }
 
     func getSnapshot(in context: Context, completion: @escaping (Entry) -> Void) {
-        getDataEntry { entry in
+        getDataEntry(isPreview: context.isPreview) { entry in
             completion(entry)
         }
     }
 
     func getTimeline(in context: Context, completion: @escaping (Timeline<Entry>) -> Void) {
-        getDataEntry { entry in
+        getDataEntry(isPreview: context.isPreview) { entry in
             let timeLine = Timeline(entries: [entry], policy: .atEnd)
             completion(timeLine)
         }

+ 2 - 3
Widget/Nextcloud/NextcloudWidgetView.swift

@@ -34,7 +34,7 @@ struct NextcloudWidgetView: View {
                     .scaledToFit()
                     .frame(width: 18, height: 18)
                     .cornerRadius(4)
-                Text(NCBrandOptions.shared.brand + "")
+                Text(NCBrandOptions.shared.brand + "dd")
                     .font(.system(size: 12))
                     .textCase(.uppercase)
             }
@@ -67,7 +67,7 @@ struct NextcloudWidgetView: View {
                     }
                 }
                 Spacer()
-                    .frame(width: .infinity, height: 15.0)
+                    .frame(width: .none, height: 15.0)
                 Text("File in upload ...")
                     .font(.system(size: 12))
                     .frame(maxWidth: .infinity, alignment: .center)
@@ -85,7 +85,6 @@ struct NextcloudWidgetView: View {
                         }
                     }
                 }
-                .frame(maxWidth: .infinity, alignment: .trailing)
                 .padding(.trailing, 15)
             }
             .padding(.top, 45)