From 6d8d780e7e054f02a95b547715d7ee1b1f7859d1 Mon Sep 17 00:00:00 2001 From: ltranframgia Date: Sun, 25 Jun 2017 22:36:24 +0700 Subject: [PATCH] change storyboard to base localization --- BaseMVC.xcodeproj/project.pbxproj | 222 ++++++++++-------- .../Sources/Helpers/{ => Define}/Config.swift | 0 .../Helpers/{ => Define}/Constants.swift | 0 .../Helpers/{ => Define}/EnumDefine.swift | 0 .../Sources/Helpers/{ => Define}/Func.swift | 0 .../Sources/Helpers/{ => Define}/Keys.swift | 0 .../{ => Define}/LocalizableString.swift | 0 .../Helpers/{ => Define}/StructDefine.swift | 0 .../Helpers/{ => Define}/ViewDefine.swift | 0 .../{ => Helpers}/Extensions/Color+Ext.swift | 0 .../{ => Helpers}/Extensions/Date+Ext.swift | 0 .../{ => Helpers}/Extensions/String+Ext.swift | 0 .../Extensions/UITableView+Ext.swift | 0 .../{ => Helpers}/Extensions/UIView+Ext.swift | 0 .../Extensions/UIViewController+Ext.swift | 0 .../Managers/LocationManager.swift | 0 .../{ => Helpers}/Managers/RealmManager.swift | 0 .../Managers/TransitionManager.swift | 0 .../Views/{ => Base.lproj}/Message.storyboard | 0 .../{ => Base.lproj}/Timeline.storyboard | 0 .../Views/{ => Base.lproj}/User.storyboard | 0 Podfile | 1 - Podfile.lock | 2 +- 23 files changed, 128 insertions(+), 97 deletions(-) rename BaseMVC/Sources/Helpers/{ => Define}/Config.swift (100%) rename BaseMVC/Sources/Helpers/{ => Define}/Constants.swift (100%) rename BaseMVC/Sources/Helpers/{ => Define}/EnumDefine.swift (100%) rename BaseMVC/Sources/Helpers/{ => Define}/Func.swift (100%) rename BaseMVC/Sources/Helpers/{ => Define}/Keys.swift (100%) rename BaseMVC/Sources/Helpers/{ => Define}/LocalizableString.swift (100%) rename BaseMVC/Sources/Helpers/{ => Define}/StructDefine.swift (100%) rename BaseMVC/Sources/Helpers/{ => Define}/ViewDefine.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Extensions/Color+Ext.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Extensions/Date+Ext.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Extensions/String+Ext.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Extensions/UITableView+Ext.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Extensions/UIView+Ext.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Extensions/UIViewController+Ext.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Managers/LocationManager.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Managers/RealmManager.swift (100%) rename BaseMVC/Sources/{ => Helpers}/Managers/TransitionManager.swift (100%) rename BaseMVC/Sources/Views/{ => Base.lproj}/Message.storyboard (100%) rename BaseMVC/Sources/Views/{ => Base.lproj}/Timeline.storyboard (100%) rename BaseMVC/Sources/Views/{ => Base.lproj}/User.storyboard (100%) diff --git a/BaseMVC.xcodeproj/project.pbxproj b/BaseMVC.xcodeproj/project.pbxproj index 38da24c..dd159e0 100644 --- a/BaseMVC.xcodeproj/project.pbxproj +++ b/BaseMVC.xcodeproj/project.pbxproj @@ -11,20 +11,6 @@ 8234BE651EF9887D009A5DE5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE231EF9887D009A5DE5 /* AppDelegate.swift */; }; 8234BE661EF9887D009A5DE5 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE251EF9887D009A5DE5 /* BaseViewController.swift */; }; 8234BE6B1EF9887D009A5DE5 /* StartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE2A1EF9887D009A5DE5 /* StartViewController.swift */; }; - 8234BE6D1EF9887D009A5DE5 /* Color+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE2D1EF9887D009A5DE5 /* Color+Ext.swift */; }; - 8234BE6E1EF9887D009A5DE5 /* Date+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE2E1EF9887D009A5DE5 /* Date+Ext.swift */; }; - 8234BE6F1EF9887D009A5DE5 /* String+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE2F1EF9887D009A5DE5 /* String+Ext.swift */; }; - 8234BE701EF9887D009A5DE5 /* UITableView+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE301EF9887D009A5DE5 /* UITableView+Ext.swift */; }; - 8234BE711EF9887D009A5DE5 /* UIView+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE311EF9887D009A5DE5 /* UIView+Ext.swift */; }; - 8234BE721EF9887D009A5DE5 /* UIViewController+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE321EF9887D009A5DE5 /* UIViewController+Ext.swift */; }; - 8234BE731EF9887D009A5DE5 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE341EF9887D009A5DE5 /* Config.swift */; }; - 8234BE741EF9887D009A5DE5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE351EF9887D009A5DE5 /* Constants.swift */; }; - 8234BE751EF9887D009A5DE5 /* EnumDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE361EF9887D009A5DE5 /* EnumDefine.swift */; }; - 8234BE761EF9887D009A5DE5 /* Func.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE371EF9887D009A5DE5 /* Func.swift */; }; - 8234BE771EF9887D009A5DE5 /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE381EF9887D009A5DE5 /* Keys.swift */; }; - 8234BE781EF9887D009A5DE5 /* LocalizableString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE391EF9887D009A5DE5 /* LocalizableString.swift */; }; - 8234BE791EF9887D009A5DE5 /* StructDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE3A1EF9887D009A5DE5 /* StructDefine.swift */; }; - 8234BE7A1EF9887D009A5DE5 /* ViewDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE3B1EF9887D009A5DE5 /* ViewDefine.swift */; }; 8234BE7E1EF9887D009A5DE5 /* RStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE421EF9887D009A5DE5 /* RStore.swift */; }; 8234BE7F1EF9887D009A5DE5 /* RUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8234BE431EF9887D009A5DE5 /* RUser.swift */; }; 8234BE801EF9887D009A5DE5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8234BE451EF9887D009A5DE5 /* Assets.xcassets */; }; @@ -35,14 +21,28 @@ 8234BE861EF9887D009A5DE5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8234BE501EF9887D009A5DE5 /* LaunchScreen.storyboard */; }; 8234BE881EF9887D009A5DE5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8234BE541EF9887D009A5DE5 /* Main.storyboard */; }; 825778691EFAC78C0057DACB /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 825778681EFAC78C0057DACB /* MainTabBarController.swift */; }; - 8257786B1EFACA470057DACB /* User.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8257786A1EFACA470057DACB /* User.storyboard */; }; 8257786D1EFACAA60057DACB /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8257786C1EFACAA60057DACB /* LoginViewController.swift */; }; - 825778701EFACC5C0057DACB /* Timeline.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8257786F1EFACC5C0057DACB /* Timeline.storyboard */; }; - 825778721EFACC760057DACB /* Message.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 825778711EFACC760057DACB /* Message.storyboard */; }; + 8272E3C71F00A4D400EB1170 /* User.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8272E3C91F00A4D400EB1170 /* User.storyboard */; }; + 8272E3CA1F00A4D800EB1170 /* Timeline.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8272E3CC1F00A4D800EB1170 /* Timeline.storyboard */; }; + 8272E3CD1F00A4DC00EB1170 /* Message.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8272E3CF1F00A4DC00EB1170 /* Message.storyboard */; }; + 82A3D5891F000AFE009BFB2E /* Color+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D57F1F000AFE009BFB2E /* Color+Ext.swift */; }; + 82A3D58A1F000AFE009BFB2E /* Date+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5801F000AFE009BFB2E /* Date+Ext.swift */; }; + 82A3D58B1F000AFE009BFB2E /* String+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5811F000AFE009BFB2E /* String+Ext.swift */; }; + 82A3D58C1F000AFE009BFB2E /* UITableView+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5821F000AFE009BFB2E /* UITableView+Ext.swift */; }; + 82A3D58D1F000AFE009BFB2E /* UIView+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5831F000AFE009BFB2E /* UIView+Ext.swift */; }; + 82A3D58E1F000AFE009BFB2E /* UIViewController+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5841F000AFE009BFB2E /* UIViewController+Ext.swift */; }; + 82A3D58F1F000AFE009BFB2E /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5861F000AFE009BFB2E /* LocationManager.swift */; }; + 82A3D5901F000AFE009BFB2E /* RealmManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5871F000AFE009BFB2E /* RealmManager.swift */; }; + 82A3D5911F000AFE009BFB2E /* TransitionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5881F000AFE009BFB2E /* TransitionManager.swift */; }; + 82A3D59D1F000B42009BFB2E /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5951F000B42009BFB2E /* Config.swift */; }; + 82A3D59E1F000B42009BFB2E /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5961F000B42009BFB2E /* Constants.swift */; }; + 82A3D59F1F000B42009BFB2E /* EnumDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5971F000B42009BFB2E /* EnumDefine.swift */; }; + 82A3D5A01F000B42009BFB2E /* Func.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5981F000B42009BFB2E /* Func.swift */; }; + 82A3D5A11F000B42009BFB2E /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D5991F000B42009BFB2E /* Keys.swift */; }; + 82A3D5A21F000B42009BFB2E /* LocalizableString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D59A1F000B42009BFB2E /* LocalizableString.swift */; }; + 82A3D5A31F000B42009BFB2E /* StructDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D59B1F000B42009BFB2E /* StructDefine.swift */; }; + 82A3D5A41F000B42009BFB2E /* ViewDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A3D59C1F000B42009BFB2E /* ViewDefine.swift */; }; 82B455C31EFE5F2C0099161D /* UserDao.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82B455C21EFE5F2C0099161D /* UserDao.swift */; }; - 82E4AD721EFFE0790027261D /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82E4AD6F1EFFE0790027261D /* LocationManager.swift */; }; - 82E4AD731EFFE0790027261D /* RealmManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82E4AD701EFFE0790027261D /* RealmManager.swift */; }; - 82E4AD741EFFE0790027261D /* TransitionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82E4AD711EFFE0790027261D /* TransitionManager.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -54,20 +54,6 @@ 8234BE231EF9887D009A5DE5 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 8234BE251EF9887D009A5DE5 /* BaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = ""; }; 8234BE2A1EF9887D009A5DE5 /* StartViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StartViewController.swift; sourceTree = ""; }; - 8234BE2D1EF9887D009A5DE5 /* Color+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Color+Ext.swift"; sourceTree = ""; }; - 8234BE2E1EF9887D009A5DE5 /* Date+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Date+Ext.swift"; sourceTree = ""; }; - 8234BE2F1EF9887D009A5DE5 /* String+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Ext.swift"; sourceTree = ""; }; - 8234BE301EF9887D009A5DE5 /* UITableView+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+Ext.swift"; sourceTree = ""; }; - 8234BE311EF9887D009A5DE5 /* UIView+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Ext.swift"; sourceTree = ""; }; - 8234BE321EF9887D009A5DE5 /* UIViewController+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Ext.swift"; sourceTree = ""; }; - 8234BE341EF9887D009A5DE5 /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = ""; }; - 8234BE351EF9887D009A5DE5 /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; - 8234BE361EF9887D009A5DE5 /* EnumDefine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumDefine.swift; sourceTree = ""; }; - 8234BE371EF9887D009A5DE5 /* Func.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Func.swift; sourceTree = ""; }; - 8234BE381EF9887D009A5DE5 /* Keys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = ""; }; - 8234BE391EF9887D009A5DE5 /* LocalizableString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalizableString.swift; sourceTree = ""; }; - 8234BE3A1EF9887D009A5DE5 /* StructDefine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StructDefine.swift; sourceTree = ""; }; - 8234BE3B1EF9887D009A5DE5 /* ViewDefine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewDefine.swift; sourceTree = ""; }; 8234BE421EF9887D009A5DE5 /* RStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RStore.swift; sourceTree = ""; }; 8234BE431EF9887D009A5DE5 /* RUser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RUser.swift; sourceTree = ""; }; 8234BE451EF9887D009A5DE5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -79,14 +65,28 @@ 8234BE511EF9887D009A5DE5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 8234BE551EF9887D009A5DE5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 825778681EFAC78C0057DACB /* MainTabBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = ""; }; - 8257786A1EFACA470057DACB /* User.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = User.storyboard; sourceTree = ""; }; 8257786C1EFACAA60057DACB /* LoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = ""; }; - 8257786F1EFACC5C0057DACB /* Timeline.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Timeline.storyboard; sourceTree = ""; }; - 825778711EFACC760057DACB /* Message.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Message.storyboard; sourceTree = ""; }; + 8272E3C81F00A4D400EB1170 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/User.storyboard; sourceTree = ""; }; + 8272E3CB1F00A4D800EB1170 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Timeline.storyboard; sourceTree = ""; }; + 8272E3CE1F00A4DC00EB1170 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Message.storyboard; sourceTree = ""; }; + 82A3D57F1F000AFE009BFB2E /* Color+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Color+Ext.swift"; sourceTree = ""; }; + 82A3D5801F000AFE009BFB2E /* Date+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Date+Ext.swift"; sourceTree = ""; }; + 82A3D5811F000AFE009BFB2E /* String+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Ext.swift"; sourceTree = ""; }; + 82A3D5821F000AFE009BFB2E /* UITableView+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+Ext.swift"; sourceTree = ""; }; + 82A3D5831F000AFE009BFB2E /* UIView+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Ext.swift"; sourceTree = ""; }; + 82A3D5841F000AFE009BFB2E /* UIViewController+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Ext.swift"; sourceTree = ""; }; + 82A3D5861F000AFE009BFB2E /* LocationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationManager.swift; sourceTree = ""; }; + 82A3D5871F000AFE009BFB2E /* RealmManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmManager.swift; sourceTree = ""; }; + 82A3D5881F000AFE009BFB2E /* TransitionManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionManager.swift; sourceTree = ""; }; + 82A3D5951F000B42009BFB2E /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = ""; }; + 82A3D5961F000B42009BFB2E /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; + 82A3D5971F000B42009BFB2E /* EnumDefine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumDefine.swift; sourceTree = ""; }; + 82A3D5981F000B42009BFB2E /* Func.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Func.swift; sourceTree = ""; }; + 82A3D5991F000B42009BFB2E /* Keys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = ""; }; + 82A3D59A1F000B42009BFB2E /* LocalizableString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalizableString.swift; sourceTree = ""; }; + 82A3D59B1F000B42009BFB2E /* StructDefine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StructDefine.swift; sourceTree = ""; }; + 82A3D59C1F000B42009BFB2E /* ViewDefine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewDefine.swift; sourceTree = ""; }; 82B455C21EFE5F2C0099161D /* UserDao.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDao.swift; sourceTree = ""; }; - 82E4AD6F1EFFE0790027261D /* LocationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationManager.swift; sourceTree = ""; }; - 82E4AD701EFFE0790027261D /* RealmManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmManager.swift; sourceTree = ""; }; - 82E4AD711EFFE0790027261D /* TransitionManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionManager.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -143,9 +143,7 @@ 8234BE231EF9887D009A5DE5 /* AppDelegate.swift */, 8234BE441EF9887D009A5DE5 /* Resources */, 8234BE331EF9887D009A5DE5 /* Helpers */, - 8234BE2C1EF9887D009A5DE5 /* Extensions */, 8234BE3C1EF9887D009A5DE5 /* Libraries */, - 82E4AD6E1EFFE0790027261D /* Managers */, 8234BE491EF9887D009A5DE5 /* Services */, 82B455C11EFE5F100099161D /* Dao */, 8234BE401EF9887D009A5DE5 /* Models */, @@ -164,30 +162,12 @@ path = Controllers; sourceTree = ""; }; - 8234BE2C1EF9887D009A5DE5 /* Extensions */ = { - isa = PBXGroup; - children = ( - 8234BE2D1EF9887D009A5DE5 /* Color+Ext.swift */, - 8234BE2E1EF9887D009A5DE5 /* Date+Ext.swift */, - 8234BE2F1EF9887D009A5DE5 /* String+Ext.swift */, - 8234BE301EF9887D009A5DE5 /* UITableView+Ext.swift */, - 8234BE311EF9887D009A5DE5 /* UIView+Ext.swift */, - 8234BE321EF9887D009A5DE5 /* UIViewController+Ext.swift */, - ); - path = Extensions; - sourceTree = ""; - }; 8234BE331EF9887D009A5DE5 /* Helpers */ = { isa = PBXGroup; children = ( - 8234BE341EF9887D009A5DE5 /* Config.swift */, - 8234BE351EF9887D009A5DE5 /* Constants.swift */, - 8234BE361EF9887D009A5DE5 /* EnumDefine.swift */, - 8234BE371EF9887D009A5DE5 /* Func.swift */, - 8234BE381EF9887D009A5DE5 /* Keys.swift */, - 8234BE391EF9887D009A5DE5 /* LocalizableString.swift */, - 8234BE3A1EF9887D009A5DE5 /* StructDefine.swift */, - 8234BE3B1EF9887D009A5DE5 /* ViewDefine.swift */, + 82A3D5941F000B42009BFB2E /* Define */, + 82A3D57E1F000AFE009BFB2E /* Extensions */, + 82A3D5851F000AFE009BFB2E /* Managers */, ); path = Helpers; sourceTree = ""; @@ -241,9 +221,9 @@ children = ( 8234BE501EF9887D009A5DE5 /* LaunchScreen.storyboard */, 8234BE541EF9887D009A5DE5 /* Main.storyboard */, - 8257786A1EFACA470057DACB /* User.storyboard */, - 8257786F1EFACC5C0057DACB /* Timeline.storyboard */, - 825778711EFACC760057DACB /* Message.storyboard */, + 8272E3C91F00A4D400EB1170 /* User.storyboard */, + 8272E3CC1F00A4D800EB1170 /* Timeline.storyboard */, + 8272E3CF1F00A4DC00EB1170 /* Message.storyboard */, ); name = Storyboards; sourceTree = ""; @@ -256,24 +236,52 @@ name = User; sourceTree = ""; }; - 82B455C11EFE5F100099161D /* Dao */ = { + 82A3D57E1F000AFE009BFB2E /* Extensions */ = { isa = PBXGroup; children = ( - 82B455C21EFE5F2C0099161D /* UserDao.swift */, + 82A3D57F1F000AFE009BFB2E /* Color+Ext.swift */, + 82A3D5801F000AFE009BFB2E /* Date+Ext.swift */, + 82A3D5811F000AFE009BFB2E /* String+Ext.swift */, + 82A3D5821F000AFE009BFB2E /* UITableView+Ext.swift */, + 82A3D5831F000AFE009BFB2E /* UIView+Ext.swift */, + 82A3D5841F000AFE009BFB2E /* UIViewController+Ext.swift */, ); - path = Dao; + path = Extensions; sourceTree = ""; }; - 82E4AD6E1EFFE0790027261D /* Managers */ = { + 82A3D5851F000AFE009BFB2E /* Managers */ = { isa = PBXGroup; children = ( - 82E4AD6F1EFFE0790027261D /* LocationManager.swift */, - 82E4AD701EFFE0790027261D /* RealmManager.swift */, - 82E4AD711EFFE0790027261D /* TransitionManager.swift */, + 82A3D5861F000AFE009BFB2E /* LocationManager.swift */, + 82A3D5871F000AFE009BFB2E /* RealmManager.swift */, + 82A3D5881F000AFE009BFB2E /* TransitionManager.swift */, ); path = Managers; sourceTree = ""; }; + 82A3D5941F000B42009BFB2E /* Define */ = { + isa = PBXGroup; + children = ( + 82A3D5951F000B42009BFB2E /* Config.swift */, + 82A3D5961F000B42009BFB2E /* Constants.swift */, + 82A3D5971F000B42009BFB2E /* EnumDefine.swift */, + 82A3D5981F000B42009BFB2E /* Func.swift */, + 82A3D5991F000B42009BFB2E /* Keys.swift */, + 82A3D59A1F000B42009BFB2E /* LocalizableString.swift */, + 82A3D59B1F000B42009BFB2E /* StructDefine.swift */, + 82A3D59C1F000B42009BFB2E /* ViewDefine.swift */, + ); + path = Define; + sourceTree = ""; + }; + 82B455C11EFE5F100099161D /* Dao */ = { + isa = PBXGroup; + children = ( + 82B455C21EFE5F2C0099161D /* UserDao.swift */, + ); + path = Dao; + sourceTree = ""; + }; 82F485B01EF98C81008D82A9 /* Main */ = { isa = PBXGroup; children = ( @@ -356,12 +364,12 @@ buildActionMask = 2147483647; files = ( 8234BE801EF9887D009A5DE5 /* Assets.xcassets in Resources */, - 825778701EFACC5C0057DACB /* Timeline.storyboard in Resources */, - 8257786B1EFACA470057DACB /* User.storyboard in Resources */, + 8272E3CA1F00A4D800EB1170 /* Timeline.storyboard in Resources */, + 8272E3C71F00A4D400EB1170 /* User.storyboard in Resources */, 8234BE861EF9887D009A5DE5 /* LaunchScreen.storyboard in Resources */, 8234BE881EF9887D009A5DE5 /* Main.storyboard in Resources */, 8234BE811EF9887D009A5DE5 /* Localizable.strings in Resources */, - 825778721EFACC760057DACB /* Message.storyboard in Resources */, + 8272E3CD1F00A4DC00EB1170 /* Message.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -434,34 +442,34 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 82A3D58C1F000AFE009BFB2E /* UITableView+Ext.swift in Sources */, + 82A3D5A41F000B42009BFB2E /* ViewDefine.swift in Sources */, + 82A3D59F1F000B42009BFB2E /* EnumDefine.swift in Sources */, + 82A3D59E1F000B42009BFB2E /* Constants.swift in Sources */, + 82A3D5A31F000B42009BFB2E /* StructDefine.swift in Sources */, 8234BE6B1EF9887D009A5DE5 /* StartViewController.swift in Sources */, - 8234BE731EF9887D009A5DE5 /* Config.swift in Sources */, 8234BE7F1EF9887D009A5DE5 /* RUser.swift in Sources */, 82B455C31EFE5F2C0099161D /* UserDao.swift in Sources */, - 8234BE791EF9887D009A5DE5 /* StructDefine.swift in Sources */, - 8234BE781EF9887D009A5DE5 /* LocalizableString.swift in Sources */, 8234BE821EF9887D009A5DE5 /* ApiClient.swift in Sources */, - 8234BE761EF9887D009A5DE5 /* Func.swift in Sources */, - 8234BE721EF9887D009A5DE5 /* UIViewController+Ext.swift in Sources */, - 8234BE751EF9887D009A5DE5 /* EnumDefine.swift in Sources */, - 8234BE771EF9887D009A5DE5 /* Keys.swift in Sources */, - 8234BE6D1EF9887D009A5DE5 /* Color+Ext.swift in Sources */, - 82E4AD721EFFE0790027261D /* LocationManager.swift in Sources */, + 82A3D58D1F000AFE009BFB2E /* UIView+Ext.swift in Sources */, + 82A3D5891F000AFE009BFB2E /* Color+Ext.swift in Sources */, + 82A3D5A01F000B42009BFB2E /* Func.swift in Sources */, + 82A3D58F1F000AFE009BFB2E /* LocationManager.swift in Sources */, + 82A3D58B1F000AFE009BFB2E /* String+Ext.swift in Sources */, + 82A3D5901F000AFE009BFB2E /* RealmManager.swift in Sources */, + 82A3D5911F000AFE009BFB2E /* TransitionManager.swift in Sources */, 8234BE651EF9887D009A5DE5 /* AppDelegate.swift in Sources */, - 82E4AD731EFFE0790027261D /* RealmManager.swift in Sources */, + 82A3D58A1F000AFE009BFB2E /* Date+Ext.swift in Sources */, 8234BE841EF9887D009A5DE5 /* OAuthHandler.swift in Sources */, - 82E4AD741EFFE0790027261D /* TransitionManager.swift in Sources */, - 8234BE741EF9887D009A5DE5 /* Constants.swift in Sources */, 8234BE661EF9887D009A5DE5 /* BaseViewController.swift in Sources */, 8234BE7E1EF9887D009A5DE5 /* RStore.swift in Sources */, 825778691EFAC78C0057DACB /* MainTabBarController.swift in Sources */, - 8234BE711EF9887D009A5DE5 /* UIView+Ext.swift in Sources */, - 8234BE701EF9887D009A5DE5 /* UITableView+Ext.swift in Sources */, - 8234BE6E1EF9887D009A5DE5 /* Date+Ext.swift in Sources */, - 8234BE6F1EF9887D009A5DE5 /* String+Ext.swift in Sources */, + 82A3D59D1F000B42009BFB2E /* Config.swift in Sources */, + 82A3D5A21F000B42009BFB2E /* LocalizableString.swift in Sources */, 8234BE831EF9887D009A5DE5 /* AppRouter.swift in Sources */, + 82A3D58E1F000AFE009BFB2E /* UIViewController+Ext.swift in Sources */, 8257786D1EFACAA60057DACB /* LoginViewController.swift in Sources */, - 8234BE7A1EF9887D009A5DE5 /* ViewDefine.swift in Sources */, + 82A3D5A11F000B42009BFB2E /* Keys.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -492,6 +500,30 @@ name = Main.storyboard; sourceTree = ""; }; + 8272E3C91F00A4D400EB1170 /* User.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8272E3C81F00A4D400EB1170 /* Base */, + ); + name = User.storyboard; + sourceTree = ""; + }; + 8272E3CC1F00A4D800EB1170 /* Timeline.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8272E3CB1F00A4D800EB1170 /* Base */, + ); + name = Timeline.storyboard; + sourceTree = ""; + }; + 8272E3CF1F00A4DC00EB1170 /* Message.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 8272E3CE1F00A4DC00EB1170 /* Base */, + ); + name = Message.storyboard; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -596,7 +628,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = BaseMVC/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = thl.mvc.vn; + PRODUCT_BUNDLE_IDENTIFIER = vn.thl.mvc; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 3.0; @@ -611,7 +643,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = BaseMVC/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = thl.mvc.vn; + PRODUCT_BUNDLE_IDENTIFIER = vn.thl.mvc; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 3.0; diff --git a/BaseMVC/Sources/Helpers/Config.swift b/BaseMVC/Sources/Helpers/Define/Config.swift similarity index 100% rename from BaseMVC/Sources/Helpers/Config.swift rename to BaseMVC/Sources/Helpers/Define/Config.swift diff --git a/BaseMVC/Sources/Helpers/Constants.swift b/BaseMVC/Sources/Helpers/Define/Constants.swift similarity index 100% rename from BaseMVC/Sources/Helpers/Constants.swift rename to BaseMVC/Sources/Helpers/Define/Constants.swift diff --git a/BaseMVC/Sources/Helpers/EnumDefine.swift b/BaseMVC/Sources/Helpers/Define/EnumDefine.swift similarity index 100% rename from BaseMVC/Sources/Helpers/EnumDefine.swift rename to BaseMVC/Sources/Helpers/Define/EnumDefine.swift diff --git a/BaseMVC/Sources/Helpers/Func.swift b/BaseMVC/Sources/Helpers/Define/Func.swift similarity index 100% rename from BaseMVC/Sources/Helpers/Func.swift rename to BaseMVC/Sources/Helpers/Define/Func.swift diff --git a/BaseMVC/Sources/Helpers/Keys.swift b/BaseMVC/Sources/Helpers/Define/Keys.swift similarity index 100% rename from BaseMVC/Sources/Helpers/Keys.swift rename to BaseMVC/Sources/Helpers/Define/Keys.swift diff --git a/BaseMVC/Sources/Helpers/LocalizableString.swift b/BaseMVC/Sources/Helpers/Define/LocalizableString.swift similarity index 100% rename from BaseMVC/Sources/Helpers/LocalizableString.swift rename to BaseMVC/Sources/Helpers/Define/LocalizableString.swift diff --git a/BaseMVC/Sources/Helpers/StructDefine.swift b/BaseMVC/Sources/Helpers/Define/StructDefine.swift similarity index 100% rename from BaseMVC/Sources/Helpers/StructDefine.swift rename to BaseMVC/Sources/Helpers/Define/StructDefine.swift diff --git a/BaseMVC/Sources/Helpers/ViewDefine.swift b/BaseMVC/Sources/Helpers/Define/ViewDefine.swift similarity index 100% rename from BaseMVC/Sources/Helpers/ViewDefine.swift rename to BaseMVC/Sources/Helpers/Define/ViewDefine.swift diff --git a/BaseMVC/Sources/Extensions/Color+Ext.swift b/BaseMVC/Sources/Helpers/Extensions/Color+Ext.swift similarity index 100% rename from BaseMVC/Sources/Extensions/Color+Ext.swift rename to BaseMVC/Sources/Helpers/Extensions/Color+Ext.swift diff --git a/BaseMVC/Sources/Extensions/Date+Ext.swift b/BaseMVC/Sources/Helpers/Extensions/Date+Ext.swift similarity index 100% rename from BaseMVC/Sources/Extensions/Date+Ext.swift rename to BaseMVC/Sources/Helpers/Extensions/Date+Ext.swift diff --git a/BaseMVC/Sources/Extensions/String+Ext.swift b/BaseMVC/Sources/Helpers/Extensions/String+Ext.swift similarity index 100% rename from BaseMVC/Sources/Extensions/String+Ext.swift rename to BaseMVC/Sources/Helpers/Extensions/String+Ext.swift diff --git a/BaseMVC/Sources/Extensions/UITableView+Ext.swift b/BaseMVC/Sources/Helpers/Extensions/UITableView+Ext.swift similarity index 100% rename from BaseMVC/Sources/Extensions/UITableView+Ext.swift rename to BaseMVC/Sources/Helpers/Extensions/UITableView+Ext.swift diff --git a/BaseMVC/Sources/Extensions/UIView+Ext.swift b/BaseMVC/Sources/Helpers/Extensions/UIView+Ext.swift similarity index 100% rename from BaseMVC/Sources/Extensions/UIView+Ext.swift rename to BaseMVC/Sources/Helpers/Extensions/UIView+Ext.swift diff --git a/BaseMVC/Sources/Extensions/UIViewController+Ext.swift b/BaseMVC/Sources/Helpers/Extensions/UIViewController+Ext.swift similarity index 100% rename from BaseMVC/Sources/Extensions/UIViewController+Ext.swift rename to BaseMVC/Sources/Helpers/Extensions/UIViewController+Ext.swift diff --git a/BaseMVC/Sources/Managers/LocationManager.swift b/BaseMVC/Sources/Helpers/Managers/LocationManager.swift similarity index 100% rename from BaseMVC/Sources/Managers/LocationManager.swift rename to BaseMVC/Sources/Helpers/Managers/LocationManager.swift diff --git a/BaseMVC/Sources/Managers/RealmManager.swift b/BaseMVC/Sources/Helpers/Managers/RealmManager.swift similarity index 100% rename from BaseMVC/Sources/Managers/RealmManager.swift rename to BaseMVC/Sources/Helpers/Managers/RealmManager.swift diff --git a/BaseMVC/Sources/Managers/TransitionManager.swift b/BaseMVC/Sources/Helpers/Managers/TransitionManager.swift similarity index 100% rename from BaseMVC/Sources/Managers/TransitionManager.swift rename to BaseMVC/Sources/Helpers/Managers/TransitionManager.swift diff --git a/BaseMVC/Sources/Views/Message.storyboard b/BaseMVC/Sources/Views/Base.lproj/Message.storyboard similarity index 100% rename from BaseMVC/Sources/Views/Message.storyboard rename to BaseMVC/Sources/Views/Base.lproj/Message.storyboard diff --git a/BaseMVC/Sources/Views/Timeline.storyboard b/BaseMVC/Sources/Views/Base.lproj/Timeline.storyboard similarity index 100% rename from BaseMVC/Sources/Views/Timeline.storyboard rename to BaseMVC/Sources/Views/Base.lproj/Timeline.storyboard diff --git a/BaseMVC/Sources/Views/User.storyboard b/BaseMVC/Sources/Views/Base.lproj/User.storyboard similarity index 100% rename from BaseMVC/Sources/Views/User.storyboard rename to BaseMVC/Sources/Views/Base.lproj/User.storyboard diff --git a/Podfile b/Podfile index ead1708..0a4f817 100644 --- a/Podfile +++ b/Podfile @@ -9,5 +9,4 @@ target 'BaseMVC' do pod 'Alamofire', '~> 4.4' pod 'SwiftyJSON' pod 'RealmSwift' - end diff --git a/Podfile.lock b/Podfile.lock index 61f53e4..aa93b7e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -18,6 +18,6 @@ SPEC CHECKSUMS: RealmSwift: 4764ca7657f2193c256fb032c0b123926f70dbcd SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220 -PODFILE CHECKSUM: 85c5158b9d1f2572801568da02b6a23bbed20411 +PODFILE CHECKSUM: c96156d331df90a14bae75c7e7487d003fd3e32c COCOAPODS: 1.2.1