normalized

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

Widget/Dashboard/DashboardData.swift

@@ -115,6 +115,17 @@ func getDashboardDataEntry(isPreview: Bool, displaySize: CGSize, completion: @es
         
         var datas = [DashboardData]()
         
+        if let dashboardResults = dashboardResults {
+            for dashboardResult in dashboardResults {
+                let application = dashboardResult.application
+                if let entries = dashboardResult.dashboardEntries {
+                    for entry in entries {
+                        
+                    }
+                }
+            }
+        }
+        
         if error != .success {
             completion(DashboardDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, title: getTitleDashboard(), footerImage: "xmark.icloud", footerText: error.errorDescription))
         } else if datas.isEmpty {

Widget/Nextcloud/NextcloudData.swift

@@ -30,6 +30,7 @@ struct NextcloudDataEntry: TimelineEntry {
     let date: Date
     let datas: [NextcloudRecentData]
     let isPlaceholder: Bool
+    let tile: String
     let footerImage: String
     let footerText: String
 }
@@ -51,16 +52,37 @@ let recentDatasTest: [NextcloudRecentData] = [
     .init(id: "6", image: UIImage(named: "nextcloud")!, title: "title6", subTitle: "subTitle-description6", url: URL(string: "https://nextcloud.com/")!)
 ]
 
+func getTitleNextcloudWidget() -> String {
+
+    let hour = Calendar.current.component(.hour, from: Date())
+    var good = ""
+
+    switch hour {
+    case 6..<12: good = NSLocalizedString("_good_morning_", value: "Good morning", comment: "")
+    case 12: good = NSLocalizedString("_good_noon_", value: "Good noon", comment: "")
+    case 13..<17: good = NSLocalizedString("_good_afternoon_", value: "Good afternoon", comment: "")
+    case 17..<22: good = NSLocalizedString("_good_evening_", value: "Good evening", comment: "")
+    default: good = NSLocalizedString("_good_night_", value: "Good night", comment: "")
+    }
+
+    if let account = NCManageDatabase.shared.getActiveAccount() {
+        return good + ", " + account.displayName
+    } else {
+        return good
+    }
+}
+
 func getNextcloudDataEntry(isPreview: Bool, displaySize: CGSize, completion: @escaping (_ entry: NextcloudDataEntry) -> Void) {
 
     let datasPlaceholder = Array(recentDatasTest[0...nextcloudItems - 1])
+    let title = getTitleNextcloudWidget()
     
     if isPreview {
-        return completion(NextcloudDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget"))
+        return completion(NextcloudDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, tile: title, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget"))
     }
 
     guard let account = NCManageDatabase.shared.getActiveAccount() else {
-        return completion(NextcloudDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, footerImage: "xmark.icloud", footerText: NSLocalizedString("_no_active_account_", value: "No account found", comment: "")))
+        return completion(NextcloudDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, tile: title, footerImage: "xmark.icloud", footerText: NSLocalizedString("_no_active_account_", value: "No account found", comment: "")))
     }
 
     func isLive(file: NKFile, files: [NKFile]) -> Bool {
@@ -197,11 +219,11 @@ func getNextcloudDataEntry(isPreview: Bool, displaySize: CGSize, completion: @es
         }
 
         if error != .success {
-            completion(NextcloudDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, footerImage: "xmark.icloud", footerText: error.errorDescription))
+            completion(NextcloudDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, tile: title, footerImage: "xmark.icloud", footerText: error.errorDescription))
         } else if datas.isEmpty {
-            completion(NextcloudDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget"))
+            completion(NextcloudDataEntry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, tile: title, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget"))
         } else {
-            completion(NextcloudDataEntry(date: Date(), datas: datas, isPlaceholder: false, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget"))
+            completion(NextcloudDataEntry(date: Date(), datas: datas, isPlaceholder: false, tile: title, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget"))
         }
     }
 }

Widget/Nextcloud/NextcloudWidgetProvider.swift

@@ -30,7 +30,8 @@ struct NextcloudWidgetProvider: TimelineProvider {
 
     func placeholder(in context: Context) -> Entry {
         let datasPlaceholder = Array(recentDatasTest[0...nextcloudItems - 1])
-        return Entry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget")
+        let title = getTitleNextcloudWidget()
+        return Entry(date: Date(), datas: datasPlaceholder, isPlaceholder: true, tile: title, footerImage: "checkmark.icloud", footerText: NCBrandOptions.shared.brand + " widget")
     }
 
     func getSnapshot(in context: Context, completion: @escaping (Entry) -> Void) {

Widget/Nextcloud/NextcloudWidgetView.swift

@@ -34,17 +34,16 @@ struct NextcloudWidgetView: View {
             
             ZStack(alignment: .topLeading) {
                 
-                /*
-                HStack(spacing: 5) {
+                HStack() {
                     
-                    Text(NCBrandOptions.shared.brand)
-                        .font(.system(size: 13))
+                    Text(entry.tile)
+                        .font(.system(size: 12))
                         .fontWeight(.bold)
+                        .multilineTextAlignment(.center)
                         .textCase(.uppercase)
                 }
-                .padding(.leading, 10)
+                .frame(width: geo.size.width)
                 .padding(.top, 10)
-                */
                 
                 VStack(alignment: .leading) {
                     
@@ -91,12 +90,12 @@ struct NextcloudWidgetView: View {
                         }
                     }
                 }
-                .padding(.top, 10)
+                .padding(.top, 40)
                 .redacted(reason: entry.isPlaceholder ? .placeholder : [])
 
                 HStack(spacing: 0) {
 
-                    let sizeButton: CGFloat = 50
+                    let sizeButton: CGFloat = 45
                     let placeholderColor = Color(white: 0.8)
                     let brandColor = Color(NCBrandColor.shared.brand)
                     let brandTextColor = Color(NCBrandColor.shared.brandText)
@@ -149,7 +148,7 @@ struct NextcloudWidgetView: View {
                             .frame(width: geo.size.width / 4, height: sizeButton)
                     })
                 }
-                .frame(width: geo.size.width, height: geo.size.height - 35, alignment: .bottomTrailing)
+                .frame(width: geo.size.width, height: geo.size.height - 25, alignment: .bottomTrailing)
                 .redacted(reason: entry.isPlaceholder ? .placeholder : [])
 
                 HStack {
@@ -176,7 +175,7 @@ struct NextcloudWidgetView: View {
 struct NextcloudWidget_Previews: PreviewProvider {
     static var previews: some View {
         let datas = Array(recentDatasTest[0...3])
-        let entry = NextcloudDataEntry(date: Date(), datas: datas, isPlaceholder: false, footerImage: "checkmark.icloud", footerText: "Nextcloud widget")
+        let entry = NextcloudDataEntry(date: Date(), datas: datas, isPlaceholder: false, tile: "Good afternoon, Marino Faggiana", footerImage: "checkmark.icloud", footerText: "Nextcloud widget")
         NextcloudWidgetView(entry: entry).previewContext(WidgetPreviewContext(family: .systemLarge))
     }
 }