first test

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

.swiftlint.yml

@@ -42,6 +42,7 @@ excluded:
   - File Provider Extension/FileProviderUtility.swift
   - Notification Service Extension/NotificationService.swift
   - Widget/Dashboard/DashboardData.swift
+  - Widget/Dashboard/DashboardWidgetView.swift
   - Widget/Nextcloud/NextcloudData.swift
   - Widget/Nextcloud/NextcloudWidgetView.swift
   - iOSClient/Activity/NCActivity.swift

Widget/Dashboard/DashboardData.swift

@@ -24,7 +24,7 @@
 import WidgetKit
 import NextcloudKit
 
-let dashboaardItems = 4
+let dashboaardItems = 6
 
 struct DashboardDataEntry: TimelineEntry {
     let date: Date

Widget/Dashboard/DashboardWidgetView.swift

@@ -25,50 +25,130 @@ import SwiftUI
 import WidgetKit
 
 struct DashboardWidgetView: View {
+
     var entry: DashboardDataEntry
+    
     var body: some View {
-        ZStack(alignment: .top) {
-            VStack {
-                Text(entry.title)
-                    .font(.title3)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                VStack(spacing: 5) {
-                    ForEach(entry.datas, id: \.id) { element in
-                        Link(destination: element.url) {
-                            HStack {
-                                Image(uiImage: element.image)
-                                    .resizable()
-                                    .aspectRatio(contentMode: .fit)
-                                    .frame(width: 40, height: 40)
-                                    .clipShape(Circle())
-                                VStack(alignment: .leading) {
-                                    Text(element.title)
-                                        .font(.headline)
-                                    Text(element.subTitle)
-                                        .font(.subheadline)
-                                        .foregroundColor(Color(white: 0.4745))
+        
+        GeometryReader { geo in
+
+            ZStack(alignment: .topLeading) {
+
+                HStack() {
+                    
+                    Image(uiImage: entry.titleImage)
+                        .resizable()
+                        .scaledToFill()
+                        .frame(width: 20, height: 20)
+                        .clipped()
+                        .cornerRadius(5)
+                    
+                    Text(entry.title)
+                        .font(.system(size: 15))
+                        .fontWeight(.bold)
+                        .multilineTextAlignment(.center)
+                        .textCase(.uppercase)
+                        .lineLimit(1)
+                }
+                .frame(width: geo.size.width - 20)
+                .padding([.top, .leading, .trailing], 10)
+                
+                VStack(alignment: .leading) {
+                    
+                    VStack(spacing: 0) {
+                        
+                        let datasCount = CGFloat(entry.datas.count)
+                        let heightFrame = (geo.size.height - 80) / datasCount
+                        let addSizeIcon = heightFrame / datasCount
+                        let spacing = (addSizeIcon - datasCount) / 2
+                        
+                        ForEach(entry.datas, id: \.id) { element in
+                            
+                            Link(destination: element.url) {
+                                
+                                HStack {
+                                    
+                                    let subTitleColor = Color(white: 0.5)
+                                    let imageSize:CGFloat = 30
+                                    
+                                    Image(uiImage: element.image)
+                                        .resizable()
+                                        .scaledToFill()
+                                        .frame(width: imageSize+addSizeIcon, height: imageSize+addSizeIcon)
+                                        .clipped()
+                                        .cornerRadius(5)
+
+                                    VStack(alignment: .leading, spacing: spacing) {
+
+                                        Text(element.title)
+                                            .font(.system(size: 12))
+                                            .fontWeight(.regular)
+
+                                        Text(element.subTitle)
+                                            .font(.system(size: CGFloat(10)))
+                                            .foregroundColor(subTitleColor)
+                                    }
+                                    Spacer()
                                 }
-                                Spacer()
+                                .padding(.leading, 10)
+                                .frame(height: heightFrame)
                             }
-                            .padding(5)
+                            Divider()
+                                .padding(.leading, 48 + addSizeIcon)
                         }
                     }
                 }
-            }.padding(5)
+                .padding(.top, 40)
                 .redacted(reason: entry.isPlaceholder ? .placeholder : [])
-            Text(entry.footerText)
-                    .font(.caption2)
-                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomTrailing)
-                    .padding(.trailing, 10.0)
-                    .padding(.bottom, 5.0)
+
+                /*
+                HStack(spacing: 0) {
+
+                    let sizeButton: CGFloat = 40
+                    let placeholderColor = Color(white: 0.8)
+                    let brandColor = Color(NCBrandColor.shared.brand)
+                    let brandTextColor = Color(NCBrandColor.shared.brandText)
+                    
+                    Link(destination: entry.isPlaceholder ? NCGlobal.shared.widgetActionNoAction : NCGlobal.shared.widgetActionVoiceMemo, label: {
+                        Image("microphone")
+                            .resizable()
+                            .renderingMode(.template)
+                            .foregroundColor(entry.isPlaceholder ? placeholderColor : brandTextColor)
+                            .padding(10)
+                            .background(entry.isPlaceholder ? placeholderColor : brandColor)
+                            .clipShape(Circle())
+                            .scaledToFit()
+                            .frame(width: geo.size.width, height: sizeButton)
+                    })
+                }
+                .frame(width: geo.size.width, height: geo.size.height - 25, alignment: .bottomTrailing)
+                .redacted(reason: entry.isPlaceholder ? .placeholder : [])
+                */
+                
+                HStack {
+
+                    let placeholderColor = Color(white: 0.2)
+                    let brandColor = Color(NCBrandColor.shared.brand)
+
+                    Image(systemName: entry.footerImage)
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 15, height: 15)
+                        .foregroundColor(entry.isPlaceholder ? placeholderColor : brandColor)
+
+                    Text(entry.footerText)
+                        .font(.caption2)
+                        .padding(.trailing, 13.0)
+                }
+                .frame(maxWidth: geo.size.width - 5, maxHeight: geo.size.height - 2, alignment: .bottomTrailing)
+            }
         }
     }
 }
 
 struct DashboardWidget_Previews: PreviewProvider {
     static var previews: some View {
-        let datas = Array(dashboardDatasTest[0...3])
+        let datas = Array(dashboardDatasTest[0...dashboaardItems - 1])
         let title = "Dashboard"
         let titleImage = UIImage(named: "nextcloud")!
         let entry = DashboardDataEntry(date: Date(), datas: datas, isPlaceholder: false, titleImage: titleImage, title: title, footerImage: "checkmark.icloud", footerText: "Nextcloud widget")