fix

iOSClient/CCGlobal.h

@@ -82,7 +82,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         87
+#define k_databaseSchemaVersion                         88
 
 // Intro selector
 #define k_intro_login                                   0

iOSClient/Database/NCDatabase.swift

@@ -489,6 +489,7 @@ class tableTag: Object {
 class tableTrash: Object {
     
     @objc dynamic var account = ""
+    @objc dynamic var contentType = ""
     @objc dynamic var date = NSDate()
     @objc dynamic var directory: Bool = false
     @objc dynamic var fileId = ""

iOSClient/Images.xcassets/grid.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Untitled.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

iOSClient/Images.xcassets/grid.imageset/Untitled.pdf

@@ -0,0 +1,52 @@
+%PDF-1.4
+%Óëéá
+1 0 obj
+<</Creator (Mozilla/5.0 \(Macintosh; Intel Mac OS X 10_15_3\) AppleWebKit/537.36 \(KHTML, like Gecko\) BoxySVG/3.33.4 Chrome/73.0.3683.121 Electron/5.0.13 Safari/537.36)
+/Producer (Skia/PDF m73)
+/CreationDate (D:20200307121645+00'00')
+/ModDate (D:20200307121645+00'00')>>
+endobj
+3 0 obj
+<</ca 1
+/BM /Normal>>
+endobj
+4 0 obj
+<</Filter /FlateDecode
+/Length 241>> stream
+xœUŽKN1D÷>EÖHlÇ÷	fÍjÐⳘAî/á_¡ÓJÙ©W:�-¾†¶N}iY¹oO^ï7ø÷‰ž·Nsα–߯pyhŸÆˆ
ÚdÄ´ÿ�
y<�öþl³Û
Äö+XúGÖÙZ:i;Ø	:Ô˜:­®Û¶í1,æÀñ%ºïäÕe¹@‹wìð
êe<ÈäÑ4ÑCâÐ!’€H„J¤ 
F‘°r×ðI2ÊnÅXÓH!¹kÅ‘džR$y¨¤&¨ÉIÚ%ÌXÁ³‚g2Þµ‚+xVðÌ@Æ?•ƒÔ59I»$ƒßàÅÖ/}Dt¾
+endstream
+endobj
+2 0 obj
+<</Type /Page
+/Resources <</ProcSets [/PDF /Text /ImageB /ImageC /ImageI]
+/ExtGState <</G3 3 0 R>>>>
+/MediaBox [0 0 282.95999 282.95999]
+/Contents 4 0 R
+/StructParents 0
+/Parent 5 0 R>>
+endobj
+5 0 obj
+<</Type /Pages
+/Count 1
+/Kids [2 0 R]>>
+endobj
+6 0 obj
+<</Type /Catalog
+/Pages 5 0 R>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000015 00000 n 
+0000000650 00000 n 
+0000000302 00000 n 
+0000000339 00000 n 
+0000000851 00000 n 
+0000000906 00000 n 
+trailer
+<</Size 7
+/Root 6 0 R
+/Info 1 0 R>>
+startxref
+953
+%%EOF

iOSClient/Images.xcassets/switchGridChange.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "switchGridChange.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "switchGridChange@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "switchGridChange@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Media/NCMedia.swift

@@ -70,8 +70,9 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: UIImage(named: "more"), style: .plain, target: self, action: #selector(touchUpInsideMenuButtonMore))
-        self.navigationItem.leftBarButtonItem = UIBarButtonItem(image: UIImage(named: "switchGridChange"), style: .plain, target: self, action: #selector(touchUpInsideMenuButtonSwitch))
+        self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: CCGraphics.changeThemingColorImage(UIImage(named: "more"), width: 50, height: 50, color: NCBrandColor.sharedInstance.textView), style: .plain, target: self, action: #selector(touchUpInsideMenuButtonMore))
+        
+        self.navigationItem.leftBarButtonItem = UIBarButtonItem(image: CCGraphics.changeThemingColorImage(UIImage(named: "grid"), width: 50, height: 50, color: NCBrandColor.sharedInstance.textView), style: .plain, target: self, action: #selector(touchUpInsideMenuButtonSwitch))
 
         // Cell
         collectionView.register(UINib.init(nibName: "NCGridMediaCell", bundle: nil), forCellWithReuseIdentifier: "gridCell")