소스 검색

coding

Signed-off-by: marinofaggiana <marino.faggiana@nextcloud.com>
marinofaggiana 2 년 전
부모
커밋
3359702490
3개의 변경된 파일17개의 추가작업 그리고 16개의 파일을 삭제
  1. 1 0
      .swiftlint.yml
  2. 2 3
      Widget/Nextcloud/NextcloudData.swift
  3. 14 13
      Widget/Nextcloud/NextcloudWidgetView.swift

+ 1 - 0
.swiftlint.yml

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

+ 2 - 3
Widget/Nextcloud/NextcloudData.swift

@@ -49,8 +49,7 @@ let recentDatasTest: [RecentData] = [
     .init(id: "2", image: UIImage(named: "AppIcon")!, title: "title2", subTitle: "subTitle-description2", url: URL(string: "https://nextcloud.com/")!),
     .init(id: "3", image: UIImage(named: "AppIcon")!, title: "title3", subTitle: "subTitle-description3", url: URL(string: "https://nextcloud.com/")!),
     .init(id: "4", image: UIImage(named: "AppIcon")!, title: "title4", subTitle: "subTitle-description4", url: URL(string: "https://nextcloud.com/")!),
-    .init(id: "5", image: UIImage(named: "AppIcon")!, title: "title5", subTitle: "subTitle-description5", url: URL(string: "https://nextcloud.com/")!),
-    .init(id: "6", image: UIImage(named: "AppIcon")!, title: "title6", subTitle: "subTitle-description6", url: URL(string: "https://nextcloud.com/")!)
+    .init(id: "5", image: UIImage(named: "AppIcon")!, title: "title5", subTitle: "subTitle-description5", url: URL(string: "https://nextcloud.com/")!)
 ]
 
 func getDataEntry(isPreview: Bool, displaySize: CGSize, completion: @escaping (_ entry: NextcloudDataEntry) -> Void) {
@@ -191,7 +190,7 @@ func getDataEntry(isPreview: Bool, displaySize: CGSize, completion: @escaping (_
                 let image:UIImage = NCUtilityGUI.shared.createFilePreviewImage(metadata: metadata, size: imageSize * 3, createPreview: false) ?? UIImage(named: "file")!
                 let recentData = RecentData.init(id: metadata.ocId, image: image, title: metadata.fileName, subTitle: subTitle, url: url)
                 recentDatas.append(recentData)
-                if recentDatas.count == 6 { break}
+                if recentDatas.count == 5 { break}
             }
 
             let fileInUpload = NCManageDatabase.shared.getNumMetadatasInUpload()

+ 14 - 13
Widget/Nextcloud/NextcloudWidgetView.swift

@@ -68,20 +68,21 @@ struct NextcloudWidgetView: View {
                         }
                     }
                     Spacer()
-                        .frame(width: geo.size.width, height: 16.0)
-                    /*
-                    HStack(spacing: 5) {
-                        Image(systemName: "arrow.triangle.2.circlepath")
-                            .foregroundColor(Color(NCBrandColor.shared.brand))
-                        Text("Uploading")
-                            .font(.system(size: 12))
-                            .textCase(.uppercase)
-                    }
-                    .padding(.leading, 10)
-                    HStack(spacing: spacingImageUpload) {
+                        .frame(width: geo.size.width, height: 6.0)
+
+                    HStack(spacing: 1) {
+                        Button(action: {
+                                    //Place the functionality
+                        }) {
+                            Image(systemName: "trash")
+                                .padding(5)
+                                .background(Color.red)
+                                .font(.system(size: 25))
+                                .foregroundColor(.white)
+                                .clipShape(Circle())
+                        }
                     }
-                    .frame(width: geo.size.width, alignment: .center)
-                    */
+                    .frame(width: geo.size.width, height: 40, alignment: .center)
                 }
                 .padding(.top, 45)
                 .redacted(reason: entry.isPlaceholder ? .placeholder : [])