Added testing menu, made layout changes, optimised DataFetcher.swift, removed Alamofire dependency

2019-10-13 16:53:08 +02:00
parent 882c6acecc
commit f34392041f
59 changed files with 3865 additions and 10543 deletions
@@ -62,15 +62,16 @@ class MenuViewController : UICollectionViewController, UICollectionViewDelegateM
    }
    
    @objc private func objDoAsync(_ sender: Any) {
-        df.doAsync(do: "menu") { menuItems in
-            self.items = menuItems as! [String]
-            
+        df.doAsync(do: "menu") {
+            DispatchQueue.main.async {
+                self.items = self.df.readMenu()
 //            UIView.performWithoutAnimation {
                self.collectionView.reloadData()
 //            }
-            
-            self.refreshControl.endRefreshing()
-            self.df.setTabBarBadge(for: self.tabBarController?.tabBar.items)
+                
+                self.refreshControl.endRefreshing()
+                self.df.setTabBarBadge(for: self.tabBarController?.tabBar.items)
+            }
        }
    }