move tab config out of json

PlatformRouting/PlatformRouting/_ViewController/RoutingTabBarController.swift

@@ -52,16 +52,6 @@ open class RoutingTabBarController: UITabBarController, ParsingProtocol {
 
     private var actionPath: String?
 
-    @IBInspectable open var routingMap: String? {
-        didSet {
-            if routingMap != oldValue {
-                if let destinations = parser.asArray(JsonLoader.load(bundles: Bundle.particles, fileName: routingMap)) {
-                    parse(array: destinations)
-                }
-            }
-        }
-    }
-
     var previousController: UIViewController?
 
     override open func viewDidLoad() {
@@ -104,18 +94,6 @@ open class RoutingTabBarController: UITabBarController, ParsingProtocol {
         }
     }
 
-    public func parse(array: [Any]) {
-        if let data = array as? [[String: Any]] {
-            var maps = [TabbarItemInfo]()
-            for dictionary in data {
-                let routing = TabbarItemInfo()
-                routing.parse(dictionary: dictionary)
-                maps.append(routing)
-            }
-            self.maps = maps
-        }
-    }
-
     open func diff(current: [TabbarItemInfo], old: [TabbarItemInfo]) -> Diff {
         return old.diff(current) { (object1, object2) -> Bool in
             object1.path == object2.path
@@ -160,8 +138,8 @@ open class RoutingTabBarController: UITabBarController, ParsingProtocol {
     }
 
     private func path(info: TabbarItemInfo) -> String? {
-        if let router = Router.shared as? MappedUIKitRouter, let path = info.path {
-            let request = RoutingRequest(path: path)
+        if let router = Router.shared as? MappedUIKitRouter {
+            let request = RoutingRequest(path: info.path)
             return router.transform(request: request).path
         } else {
             return nil
@@ -225,13 +203,11 @@ open class RoutingTabBarController: UITabBarController, ParsingProtocol {
 
     private func setup(viewController: UIViewController, info: TabbarItemInfo) {
         let tabbarItem = UITabBarItem()
-        tabbarItem.title = info.title?.localized ?? " "
-        if let image = info.image {
-            tabbarItem.image = UIImage.named(image, bundles: Bundle.particles)
-        }
-        if let selected = info.selected {
-            tabbarItem.selectedImage = UIImage.named(selected, bundles: Bundle.particles)
-        }
+        tabbarItem.title = info.title
+        tabbarItem.image = UIImage.named(info.image, bundles: Bundle.particles)
+//        if let selected = info.selected {
+//            tabbarItem.selectedImage = UIImage.named(selected, bundles: Bundle.particles)
+//        }
         viewController.tabBarItem = tabbarItem
     }
 
@@ -241,11 +217,7 @@ open class RoutingTabBarController: UITabBarController, ParsingProtocol {
                 let viewController = viewControllers[i]
                 if let tabbarItem = viewController.tabBarItem {
                     let map = maps[i]
-                    if let path = map.path {
-                        tabbarItem.badgeValue = badging?.badge(for: path)
-                    } else {
-                        tabbarItem.badgeValue = nil
-                    }
+                    tabbarItem.badgeValue = badging?.badge(for: map.path)
                 }
             }
         }
@@ -276,24 +248,21 @@ open class RoutingTabBarController: UITabBarController, ParsingProtocol {
     }
 }
 
-public class TabbarItemInfo: NSObject, ParsingProtocol {
-    override open var parser: Parser {
-        return RoutingTabBarController.parserOverwrite ?? super.parser
+public struct TabbarItemInfo: Equatable {
+    public init(path: String,
+                title: String?,
+                image: String,
+                split: Bool) {
+        self.path = path
+        self.title = title
+        self.image = image
+        self.split = split
     }
-
-    public var path: String?
+    
+    public var path: String
     public var title: String?
-    public var image: String?
-    public var selected: String?
-    public var split: Bool?
-
-    public func parse(dictionary: [String: Any]) {
-        path = parser.asString(dictionary["path"])
-        title = parser.asString(dictionary["title"])
-        image = parser.asString(dictionary["image"])
-        selected = parser.asString(dictionary["selected"])
-        split = parser.asBoolean(dictionary["split"])?.boolValue
-    }
+    public var image: String
+    public var split: Bool
 }
 
 extension RoutingTabBarController: UITabBarControllerDelegate {

dydx/dydxPresenters/dydxPresenters/_Features/tabs_v4.json

@@ -2,7 +2,7 @@
     {
         "path":"/portfolio",
         "title":"",
-        "image":"icon_wallet",
+        "image":"icon_portfolio",
         "split":true
     },
     {

dydx/dydxPresenters/dydxPresenters/_Features/tabs_v4_vault.json

@@ -3,7 +3,7 @@
     {
         "path":"/portfolio",
         "title":"",
-        "image":"icon_wallet",
+        "image":"icon_portfolio",
         "split":true
     },
     {

dydx/dydxPresenters/dydxPresenters/_v4/RootTab/dydxV4TabBarBuilder.swift

@@ -32,20 +32,11 @@ public class dydxV4TabBarBuilder: NSObject, ObjectBuilderProtocol {
         }
     }
 
-    override public var selectedIndex: Int {
-        didSet {
-            if selectedIndex != oldValue {
-                update(index: oldValue, selected: false)
-                update(index: selectedIndex, selected: true)
-            }
-        }
-    }
-
     public override func viewDidLoad() {
         super.viewDidLoad()
 
         createCenterButton()
-        routingMap = dydxBoolFeatureFlag.isVaultEnabled.isEnabled ? "tabs_v4_vault.json" : "tabs_v4.json"
+        maps = dydxBoolFeatureFlag.isVaultEnabled.isEnabled ? Self.tabBarItemInfosV2 : Self.tabBarItemInfos
     }
 
     override public func viewWillAppear(_ animated: Bool) {
@@ -87,28 +78,53 @@ public class dydxV4TabBarBuilder: NSObject, ObjectBuilderProtocol {
     private func updateCenterButton() {
         centerButton?.buttonImage = UIImage.named("icon_trade", bundles: Bundle.particles)
     }
+}
 
-    private func update(index: Int, selected: Bool) {
-        if index != NSNotFound {
-            if let item = tabBar.items?[index] {
-                update(item: item, index: index, selected: selected)
-            }
-        }
-    }
-
-     private func update(item: UITabBarItem, index: Int, selected: Bool) {
-        item.title = selected ? "●" : " "
-//        if selected, [0, 3, 4].contains(index), wallet === nil {
-//            promptLogin()
-//        }
-    }
-
-    override public func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-        if let items = tabBar.items {
-            for index in 0 ..< items.count {
-                let tab = items[index]
-                update(item: tab, index: index, selected: tab === item)
-            }
-        }
-    }
+private extension dydxV4TabBarController {
+    static let tabBarItemInfos: [TabbarItemInfo] = [
+        .init(path: "/portfolio",
+              title: DataLocalizer.localize(path: "APP.PORTFOLIO.PORTFOLIO"),
+              image: "icon_portfolio",
+              split: true),
+        .init(path: "/markets",
+                title: DataLocalizer.localize(path: "APP.GENERAL.MARKETS"),
+                image: "icon_market",
+                split: true),
+        .init(path: "/trade",
+              title: DataLocalizer.localize(path: "APP.GENERAL.TRADE"),
+              image: "icon_trade",
+              split: true),
+        .init(path: "/alerts",
+              title: DataLocalizer.localize(path: "APP.GENERAL.ALERTS"),
+              image: "icon_alerts",
+              split: true),
+        .init(path: "/my-profile",
+              title: DataLocalizer.localize(path: "APP.GENERAL.PROFILE"),
+              image: "icon_profile",
+              split: true)
+    ]
+
+    static let tabBarItemInfosV2: [TabbarItemInfo] = [
+        .init(path: "/portfolio",
+              title: DataLocalizer.localize(path: "APP.PORTFOLIO.PORTFOLIO"),
+              image: "icon_portfolio",
+              split: true),
+        .init(path: "/markets",
+                title: DataLocalizer.localize(path: "APP.GENERAL.MARKETS"),
+                image: "icon_market",
+                split: true),
+        .init(path: "/trade",
+              title: DataLocalizer.localize(path: "APP.GENERAL.TRADE"),
+              image: "icon_trade",
+              split: true),
+        .init(path: "/vault",
+              title: DataLocalizer.localize(path: "APP.VAULTS.EARN"),
+              image: "icon_earn",
+              split: true),
+        .init(path: "/my-profile",
+              title: DataLocalizer.localize(path: "APP.GENERAL.PROFILE"),
+              image: "icon_profile",
+              split: true)
+    ]
 }
+

dydx/dydxViews/dydxViews/Media.xcassets/icon_market.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Vector-23.pdf",
+      "filename" : "icon_market.pdf",
       "idiom" : "universal"
     }
   ],

dydx/dydxViews/dydxViews/Media.xcassets/icon_portfolio.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icon_portfolio.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

dydx/dydxViews/dydxViews/Media.xcassets/icon_profile.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Vector-25.pdf",
+      "filename" : "icon_profile.pdf",
       "idiom" : "universal"
     }
   ],