فهرست منبع

normalized

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 سال پیش
والد
کامیت
406b3ec453

+ 7 - 1
Widget/Dashboard/DashboardData.swift

@@ -91,9 +91,15 @@ func getDashboardDataEntry(intent: Applications, isPreview: Bool, displaySize: C
     }
 
     guard let account = NCManageDatabase.shared.getActiveAccount() else {
-        return completion(DashboardDataEntry(date: Date(), datas: datasPlaceholder, tableDashboard: nil, tableButton: nil, isPlaceholder: true, titleImage: UIImage(named: "widget")!, title: "Dashboard", footerImage: "xmark.icloud", footerText: NSLocalizedString("_no_active_account_", value: "No account found", comment: "")))
+        return completion(DashboardDataEntry(date: Date(), datas: datasPlaceholder, tableDashboard: nil, tableButton: nil, isPlaceholder: true, titleImage: UIImage(named: "widget")!, title: "Dashboard", footerImage: "xmark.icloud", footerText: NSLocalizedString("_no_active_account_", comment: "")))
     }
     
+    let serverVersionMajor = NCManageDatabase.shared.getCapabilitiesServerInt(account: account.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor)
+
+    guard serverVersionMajor >= NCGlobal.shared.nextcloudVersion25 else {
+        return completion(DashboardDataEntry(date: Date(), datas: datasPlaceholder, tableDashboard: nil, tableButton: nil, isPlaceholder: true, titleImage: UIImage(named: "widget")!, title: "Dashboard", footerImage: "xmark.icloud", footerText: NSLocalizedString("_widget_available_nc25_", comment: "")))
+    }
+        
     // NETWORKING
     let password = CCUtility.getPassword(account.account)!
     NKCommon.shared.setup(

+ 1 - 1
iOSClient/Images.xcassets/microphone.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icons8-microfono-480.svg",
+      "filename" : "icons8-microfono-400.svg",
       "idiom" : "universal"
     }
   ],

+ 4 - 0
iOSClient/Images.xcassets/microphone.imageset/icons8-microfono-400.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg fill="#000000" viewBox="0 0 48 48" width="400px" height="400px" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 24 2 C 19.047281 2 15 6.0472805 15 11 L 15 26 C 15 30.952719 19.047281 35 24 35 C 28.952719 35 33 30.952719 33 26 L 33 11 C 33 6.0472805 28.952719 2 24 2 z M 10.476562 20.978516 A 1.50015 1.50015 0 0 0 9 22.5 L 9 26 C 9 33.760508 14.934038 40.16812 22.5 40.923828 L 22.5 45.5 A 1.50015 1.50015 0 1 0 25.5 45.5 L 25.5 40.923828 C 33.065962 40.16812 39 33.760508 39 26 L 39 22.5 A 1.50015 1.50015 0 1 0 36 22.5 L 36 26 C 36 32.585372 30.739679 37.894735 24.177734 37.990234 A 1.50015 1.50015 0 0 0 23.976562 37.978516 A 1.50015 1.50015 0 0 0 23.8125 37.990234 C 17.255134 37.889572 12 32.582085 12 26 L 12 22.5 A 1.50015 1.50015 0 0 0 10.476562 20.978516 z" style="fill: rgb(255, 255, 255);"/>
+</svg>

+ 0 - 4
iOSClient/Images.xcassets/microphone.imageset/icons8-microfono-480.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg fill="#000000" viewBox="0 0 30 30" width="480px" height="480px" xmlns="http://www.w3.org/2000/svg">
-  <path d="M 15 2 C 13.343 2 12 3.343 12 5 L 12 17 C 12 18.657 13.343 20 15 20 C 16.657 20 18 18.657 18 17 L 18 5 C 18 3.343 16.657 2 15 2 z M 8.984375 11.986328 A 1.0001 1.0001 0 0 0 8 13 L 8 17 C 8 20.513997 10.617426 23.430774 14 23.919922 L 14 26 L 11 26 A 1.0001 1.0001 0 1 0 11 28 L 14.832031 28 A 1.0001 1.0001 0 0 0 15.158203 28 L 19 28 A 1.0001 1.0001 0 1 0 19 26 L 16 26 L 16 23.919922 C 19.382574 23.430774 22 20.513997 22 17 L 22 13 A 1.0001 1.0001 0 1 0 20 13 L 20 17 C 20 19.735431 17.833516 21.933922 15.113281 21.994141 A 1.0001 1.0001 0 0 0 14.984375 21.986328 A 1.0001 1.0001 0 0 0 14.875 21.994141 C 12.16029 21.92784 10 19.731486 10 17 L 10 13 A 1.0001 1.0001 0 0 0 8.984375 11.986328 z" style="fill: rgb(255, 255, 255);"/>
-</svg>