diff --git a/.gitignore b/.gitignore index 64584e4..5c1dfa6 100755 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -dundun.xcodeproj -dundun.xcworkspace /Pods Podfile.lock .DS_Store diff --git a/dundun.xcodeproj/project.pbxproj b/dundun.xcodeproj/project.pbxproj index e54d9f8..92b3e51 100644 --- a/dundun.xcodeproj/project.pbxproj +++ b/dundun.xcodeproj/project.pbxproj @@ -7,19 +7,20 @@ objects = { /* Begin PBXBuildFile section */ - A920B1A11CB49EA800A6DA3F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920B1A01CB49EA800A6DA3F /* AppDelegate.swift */; }; - A920B1A31CB49EA800A6DA3F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920B1A21CB49EA800A6DA3F /* ViewController.swift */; }; - A920B1A61CB49EA800A6DA3F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A920B1A41CB49EA800A6DA3F /* Main.storyboard */; }; - A920B1A81CB49EA800A6DA3F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A920B1A71CB49EA800A6DA3F /* Assets.xcassets */; }; - A920B1AB1CB49EA800A6DA3F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A920B1A91CB49EA800A6DA3F /* LaunchScreen.storyboard */; }; A920B1B61CB49EA800A6DA3F /* dundunTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920B1B51CB49EA800A6DA3F /* dundunTests.swift */; }; A920B1C11CB49EA800A6DA3F /* dundunUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920B1C01CB49EA800A6DA3F /* dundunUITests.swift */; }; A920B2801CB5385A00A6DA3F /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A920B27D1CB5385A00A6DA3F /* RxCocoa.framework */; }; A920B2811CB5385A00A6DA3F /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A920B27E1CB5385A00A6DA3F /* RxSwift.framework */; }; A920B2821CB5385A00A6DA3F /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A920B27F1CB5385A00A6DA3F /* SnapKit.framework */; }; - A920B2841CB53B3B00A6DA3F /* RegistViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920B2831CB53B3B00A6DA3F /* RegistViewController.swift */; }; - A9EE06B21CB652B5002B6CAD /* ExtensionUIviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9EE06B11CB652B5002B6CAD /* ExtensionUIviewController.swift */; }; - A9EE06C31CB67636002B6CAD /* LoginTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9EE06C21CB67636002B6CAD /* LoginTextField.swift */; }; + A9323E771CB68EDD00FE8E1C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9323E731CB68EDD00FE8E1C /* LaunchScreen.storyboard */; }; + A9323E781CB68EDD00FE8E1C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9323E751CB68EDD00FE8E1C /* Main.storyboard */; }; + A9323E7A1CB68EF600FE8E1C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9323E791CB68EF600FE8E1C /* Assets.xcassets */; }; + A9323E7C1CB68F0000FE8E1C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9323E7B1CB68F0000FE8E1C /* AppDelegate.swift */; }; + A9323E7F1CB68F5100FE8E1C /* ExtensionUIviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9323E7E1CB68F5100FE8E1C /* ExtensionUIviewController.swift */; }; + A9323E811CB68F6B00FE8E1C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9323E801CB68F6B00FE8E1C /* ViewController.swift */; }; + A9323E831CB68F7400FE8E1C /* RegistViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9323E821CB68F7400FE8E1C /* RegistViewController.swift */; }; + A9323E851CB68F8700FE8E1C /* LoginTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9323E841CB68F8700FE8E1C /* LoginTextField.swift */; }; + A9323E871CB68FD300FE8E1C /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A9323E861CB68FD300FE8E1C /* Info.plist */; }; B713E4F090F4DDBA5F10095A /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2F8095EFCD135BC30B38567 /* Pods.framework */; }; /* End PBXBuildFile section */ @@ -44,12 +45,6 @@ 1E435089563AF4BD100FE906 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; 98D00E090CF999839EB810C3 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; A920B19D1CB49EA800A6DA3F /* dundun.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dundun.app; sourceTree = BUILT_PRODUCTS_DIR; }; - A920B1A01CB49EA800A6DA3F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = dundun/AppDelegate.swift; sourceTree = SOURCE_ROOT; }; - A920B1A21CB49EA800A6DA3F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = ../ViewController.swift; sourceTree = ""; }; - A920B1A51CB49EA800A6DA3F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - A920B1A71CB49EA800A6DA3F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = ../../Assets.xcassets; sourceTree = ""; }; - A920B1AA1CB49EA800A6DA3F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - A920B1AC1CB49EA800A6DA3F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../../Info.plist; sourceTree = ""; }; A920B1B11CB49EA800A6DA3F /* dundunTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = dundunTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A920B1B51CB49EA800A6DA3F /* dundunTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dundunTests.swift; sourceTree = ""; }; A920B1B71CB49EA800A6DA3F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -59,9 +54,15 @@ A920B27D1CB5385A00A6DA3F /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = "../../../../Library/Developer/Xcode/DerivedData/dundun-euvjiviiaawkoxdjjziofushyyra/Build/Products/Debug-iphonesimulator/RxCocoa.framework"; sourceTree = ""; }; A920B27E1CB5385A00A6DA3F /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = "../../../../Library/Developer/Xcode/DerivedData/dundun-euvjiviiaawkoxdjjziofushyyra/Build/Products/Debug-iphonesimulator/RxSwift.framework"; sourceTree = ""; }; A920B27F1CB5385A00A6DA3F /* SnapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SnapKit.framework; path = "../../../../Library/Developer/Xcode/DerivedData/dundun-euvjiviiaawkoxdjjziofushyyra/Build/Products/Debug-iphonesimulator/SnapKit.framework"; sourceTree = ""; }; - A920B2831CB53B3B00A6DA3F /* RegistViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RegistViewController.swift; path = ../../RegistViewController.swift; sourceTree = ""; }; - A9EE06B11CB652B5002B6CAD /* ExtensionUIviewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ExtensionUIviewController.swift; path = ../../ExtensionUIviewController.swift; sourceTree = ""; }; - A9EE06C21CB67636002B6CAD /* LoginTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoginTextField.swift; path = ../../LoginTextField.swift; sourceTree = ""; }; + A9323E741CB68EDD00FE8E1C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + A9323E761CB68EDD00FE8E1C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + A9323E791CB68EF600FE8E1C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + A9323E7B1CB68F0000FE8E1C /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + A9323E7E1CB68F5100FE8E1C /* ExtensionUIviewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExtensionUIviewController.swift; sourceTree = ""; }; + A9323E801CB68F6B00FE8E1C /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + A9323E821CB68F7400FE8E1C /* RegistViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistViewController.swift; sourceTree = ""; }; + A9323E841CB68F8700FE8E1C /* LoginTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginTextField.swift; sourceTree = ""; }; + A9323E861CB68FD300FE8E1C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../../Info.plist; sourceTree = ""; }; C2F8095EFCD135BC30B38567 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -172,6 +173,7 @@ children = ( ); name = Moldes; + path = Models; sourceTree = ""; }; A9EE06B71CB66336002B6CAD /* Views */ = { @@ -185,7 +187,7 @@ A9EE06B81CB66341002B6CAD /* Controllers */ = { isa = PBXGroup; children = ( - A920B1A21CB49EA800A6DA3F /* ViewController.swift */, + A9323E801CB68F6B00FE8E1C /* ViewController.swift */, A9EE06C11CB675EF002B6CAD /* Login */, ); path = Controllers; @@ -220,7 +222,7 @@ A9EE06BD1CB674A8002B6CAD /* plists */ = { isa = PBXGroup; children = ( - A920B1AC1CB49EA800A6DA3F /* Info.plist */, + A9323E861CB68FD300FE8E1C /* Info.plist */, ); path = plists; sourceTree = ""; @@ -228,8 +230,8 @@ A9EE06BE1CB674B5002B6CAD /* storyboards */ = { isa = PBXGroup; children = ( - A920B1A41CB49EA800A6DA3F /* Main.storyboard */, - A920B1A91CB49EA800A6DA3F /* LaunchScreen.storyboard */, + A9323E731CB68EDD00FE8E1C /* LaunchScreen.storyboard */, + A9323E751CB68EDD00FE8E1C /* Main.storyboard */, ); path = storyboards; sourceTree = ""; @@ -237,7 +239,7 @@ A9EE06BF1CB67541002B6CAD /* AppDelegate */ = { isa = PBXGroup; children = ( - A920B1A01CB49EA800A6DA3F /* AppDelegate.swift */, + A9323E7B1CB68F0000FE8E1C /* AppDelegate.swift */, ); path = AppDelegate; sourceTree = ""; @@ -245,7 +247,7 @@ A9EE06C01CB6755D002B6CAD /* images */ = { isa = PBXGroup; children = ( - A920B1A71CB49EA800A6DA3F /* Assets.xcassets */, + A9323E791CB68EF600FE8E1C /* Assets.xcassets */, ); path = images; sourceTree = ""; @@ -253,7 +255,7 @@ A9EE06C11CB675EF002B6CAD /* Login */ = { isa = PBXGroup; children = ( - A920B2831CB53B3B00A6DA3F /* RegistViewController.swift */, + A9323E821CB68F7400FE8E1C /* RegistViewController.swift */, ); path = Login; sourceTree = ""; @@ -261,7 +263,7 @@ A9EE06C41CB6763F002B6CAD /* Login */ = { isa = PBXGroup; children = ( - A9EE06C21CB67636002B6CAD /* LoginTextField.swift */, + A9323E841CB68F8700FE8E1C /* LoginTextField.swift */, ); path = Login; sourceTree = ""; @@ -269,7 +271,7 @@ A9EE06C51CB67665002B6CAD /* ViewController */ = { isa = PBXGroup; children = ( - A9EE06B11CB652B5002B6CAD /* ExtensionUIviewController.swift */, + A9323E7E1CB68F5100FE8E1C /* ExtensionUIviewController.swift */, ); path = ViewController; sourceTree = ""; @@ -381,9 +383,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - A920B1AB1CB49EA800A6DA3F /* LaunchScreen.storyboard in Resources */, - A920B1A81CB49EA800A6DA3F /* Assets.xcassets in Resources */, - A920B1A61CB49EA800A6DA3F /* Main.storyboard in Resources */, + A9323E871CB68FD300FE8E1C /* Info.plist in Resources */, + A9323E771CB68EDD00FE8E1C /* LaunchScreen.storyboard in Resources */, + A9323E7A1CB68EF600FE8E1C /* Assets.xcassets in Resources */, + A9323E781CB68EDD00FE8E1C /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -456,11 +459,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A920B1A31CB49EA800A6DA3F /* ViewController.swift in Sources */, - A9EE06B21CB652B5002B6CAD /* ExtensionUIviewController.swift in Sources */, - A920B1A11CB49EA800A6DA3F /* AppDelegate.swift in Sources */, - A9EE06C31CB67636002B6CAD /* LoginTextField.swift in Sources */, - A920B2841CB53B3B00A6DA3F /* RegistViewController.swift in Sources */, + A9323E831CB68F7400FE8E1C /* RegistViewController.swift in Sources */, + A9323E811CB68F6B00FE8E1C /* ViewController.swift in Sources */, + A9323E7F1CB68F5100FE8E1C /* ExtensionUIviewController.swift in Sources */, + A9323E7C1CB68F0000FE8E1C /* AppDelegate.swift in Sources */, + A9323E851CB68F8700FE8E1C /* LoginTextField.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -496,22 +499,20 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - A920B1A41CB49EA800A6DA3F /* Main.storyboard */ = { + A9323E731CB68EDD00FE8E1C /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - A920B1A51CB49EA800A6DA3F /* Base */, + A9323E741CB68EDD00FE8E1C /* Base */, ); - name = Main.storyboard; - path = ../..; + name = LaunchScreen.storyboard; sourceTree = ""; }; - A920B1A91CB49EA800A6DA3F /* LaunchScreen.storyboard */ = { + A9323E751CB68EDD00FE8E1C /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - A920B1AA1CB49EA800A6DA3F /* Base */, + A9323E761CB68EDD00FE8E1C /* Base */, ); - name = LaunchScreen.storyboard; - path = ../..; + name = Main.storyboard; sourceTree = ""; }; /* End PBXVariantGroup section */ diff --git a/dundun.xcworkspace/xcuserdata/liurong.xcuserdatad/UserInterfaceState.xcuserstate b/dundun.xcworkspace/xcuserdata/liurong.xcuserdatad/UserInterfaceState.xcuserstate index 21e52ac..88f9e43 100644 Binary files a/dundun.xcworkspace/xcuserdata/liurong.xcuserdatad/UserInterfaceState.xcuserstate and b/dundun.xcworkspace/xcuserdata/liurong.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/dundun/AppDelegate.swift b/dundun/AppDelegate/AppDelegate.swift similarity index 100% rename from dundun/AppDelegate.swift rename to dundun/AppDelegate/AppDelegate.swift diff --git a/dundun/RegistViewController.swift b/dundun/Controllers/Login/RegistViewController.swift similarity index 100% rename from dundun/RegistViewController.swift rename to dundun/Controllers/Login/RegistViewController.swift diff --git a/dundun/ViewController.swift b/dundun/Controllers/ViewController.swift similarity index 100% rename from dundun/ViewController.swift rename to dundun/Controllers/ViewController.swift diff --git a/dundun/Assets.xcassets/AppIcon.appiconset/Contents.json b/dundun/Resources/images/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/AppIcon.appiconset/Contents.json rename to dundun/Resources/images/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/dundun/Assets.xcassets/Contents.json b/dundun/Resources/images/Assets.xcassets/Contents.json similarity index 100% rename from dundun/Assets.xcassets/Contents.json rename to dundun/Resources/images/Assets.xcassets/Contents.json diff --git a/dundun/Assets.xcassets/icon/Contents.json b/dundun/Resources/images/Assets.xcassets/icon/Contents.json similarity index 100% rename from dundun/Assets.xcassets/icon/Contents.json rename to dundun/Resources/images/Assets.xcassets/icon/Contents.json diff --git a/dundun/Assets.xcassets/login/Contents.json b/dundun/Resources/images/Assets.xcassets/login/Contents.json similarity index 100% rename from dundun/Assets.xcassets/login/Contents.json rename to dundun/Resources/images/Assets.xcassets/login/Contents.json diff --git a/dundun/Assets.xcassets/login/tx_pho.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/login/tx_pho.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/login/tx_pho.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/login/tx_pho.imageset/Contents.json diff --git a/dundun/Assets.xcassets/login/tx_pho.imageset/tx_pho.png b/dundun/Resources/images/Assets.xcassets/login/tx_pho.imageset/tx_pho.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_pho.imageset/tx_pho.png rename to dundun/Resources/images/Assets.xcassets/login/tx_pho.imageset/tx_pho.png diff --git a/dundun/Assets.xcassets/login/tx_pho.imageset/tx_pho@2x.png b/dundun/Resources/images/Assets.xcassets/login/tx_pho.imageset/tx_pho@2x.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_pho.imageset/tx_pho@2x.png rename to dundun/Resources/images/Assets.xcassets/login/tx_pho.imageset/tx_pho@2x.png diff --git a/dundun/Assets.xcassets/login/tx_pho.imageset/tx_pho@3x.png b/dundun/Resources/images/Assets.xcassets/login/tx_pho.imageset/tx_pho@3x.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_pho.imageset/tx_pho@3x.png rename to dundun/Resources/images/Assets.xcassets/login/tx_pho.imageset/tx_pho@3x.png diff --git a/dundun/Assets.xcassets/login/tx_psd.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/login/tx_psd.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/login/tx_psd.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/login/tx_psd.imageset/Contents.json diff --git a/dundun/Assets.xcassets/login/tx_psd.imageset/tx_psd.png b/dundun/Resources/images/Assets.xcassets/login/tx_psd.imageset/tx_psd.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_psd.imageset/tx_psd.png rename to dundun/Resources/images/Assets.xcassets/login/tx_psd.imageset/tx_psd.png diff --git a/dundun/Assets.xcassets/login/tx_psd.imageset/tx_psd@2x.png b/dundun/Resources/images/Assets.xcassets/login/tx_psd.imageset/tx_psd@2x.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_psd.imageset/tx_psd@2x.png rename to dundun/Resources/images/Assets.xcassets/login/tx_psd.imageset/tx_psd@2x.png diff --git a/dundun/Assets.xcassets/login/tx_psd.imageset/tx_psd@3x.png b/dundun/Resources/images/Assets.xcassets/login/tx_psd.imageset/tx_psd@3x.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_psd.imageset/tx_psd@3x.png rename to dundun/Resources/images/Assets.xcassets/login/tx_psd.imageset/tx_psd@3x.png diff --git a/dundun/Assets.xcassets/login/tx_sms.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/login/tx_sms.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/login/tx_sms.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/login/tx_sms.imageset/Contents.json diff --git a/dundun/Assets.xcassets/login/tx_sms.imageset/tx_sms.png b/dundun/Resources/images/Assets.xcassets/login/tx_sms.imageset/tx_sms.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_sms.imageset/tx_sms.png rename to dundun/Resources/images/Assets.xcassets/login/tx_sms.imageset/tx_sms.png diff --git a/dundun/Assets.xcassets/login/tx_sms.imageset/tx_sms@2x.png b/dundun/Resources/images/Assets.xcassets/login/tx_sms.imageset/tx_sms@2x.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_sms.imageset/tx_sms@2x.png rename to dundun/Resources/images/Assets.xcassets/login/tx_sms.imageset/tx_sms@2x.png diff --git a/dundun/Assets.xcassets/login/tx_sms.imageset/tx_sms@3x.png b/dundun/Resources/images/Assets.xcassets/login/tx_sms.imageset/tx_sms@3x.png similarity index 100% rename from dundun/Assets.xcassets/login/tx_sms.imageset/tx_sms@3x.png rename to dundun/Resources/images/Assets.xcassets/login/tx_sms.imageset/tx_sms@3x.png diff --git a/dundun/Assets.xcassets/nav/Contents.json b/dundun/Resources/images/Assets.xcassets/nav/Contents.json similarity index 100% rename from dundun/Assets.xcassets/nav/Contents.json rename to dundun/Resources/images/Assets.xcassets/nav/Contents.json diff --git a/dundun/Assets.xcassets/nav/nav_back.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/nav/nav_back.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/nav/nav_back.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/nav/nav_back.imageset/Contents.json diff --git a/dundun/Assets.xcassets/nav/nav_back.imageset/nav_back.png b/dundun/Resources/images/Assets.xcassets/nav/nav_back.imageset/nav_back.png similarity index 100% rename from dundun/Assets.xcassets/nav/nav_back.imageset/nav_back.png rename to dundun/Resources/images/Assets.xcassets/nav/nav_back.imageset/nav_back.png diff --git a/dundun/Assets.xcassets/nav/nav_back.imageset/nav_back@2x.png b/dundun/Resources/images/Assets.xcassets/nav/nav_back.imageset/nav_back@2x.png similarity index 100% rename from dundun/Assets.xcassets/nav/nav_back.imageset/nav_back@2x.png rename to dundun/Resources/images/Assets.xcassets/nav/nav_back.imageset/nav_back@2x.png diff --git a/dundun/Assets.xcassets/nav/nav_back.imageset/nav_back@3x.png b/dundun/Resources/images/Assets.xcassets/nav/nav_back.imageset/nav_back@3x.png similarity index 100% rename from dundun/Assets.xcassets/nav/nav_back.imageset/nav_back@3x.png rename to dundun/Resources/images/Assets.xcassets/nav/nav_back.imageset/nav_back@3x.png diff --git a/dundun/Assets.xcassets/nav/nav_msg.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/nav/nav_msg.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/nav/nav_msg.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/nav/nav_msg.imageset/Contents.json diff --git a/dundun/Assets.xcassets/nav/nav_msg.imageset/nav_msg.png b/dundun/Resources/images/Assets.xcassets/nav/nav_msg.imageset/nav_msg.png similarity index 100% rename from dundun/Assets.xcassets/nav/nav_msg.imageset/nav_msg.png rename to dundun/Resources/images/Assets.xcassets/nav/nav_msg.imageset/nav_msg.png diff --git a/dundun/Assets.xcassets/nav/nav_msg.imageset/nav_msg@2x.png b/dundun/Resources/images/Assets.xcassets/nav/nav_msg.imageset/nav_msg@2x.png similarity index 100% rename from dundun/Assets.xcassets/nav/nav_msg.imageset/nav_msg@2x.png rename to dundun/Resources/images/Assets.xcassets/nav/nav_msg.imageset/nav_msg@2x.png diff --git a/dundun/Assets.xcassets/nav/nav_msg.imageset/nav_msg@3x.png b/dundun/Resources/images/Assets.xcassets/nav/nav_msg.imageset/nav_msg@3x.png similarity index 100% rename from dundun/Assets.xcassets/nav/nav_msg.imageset/nav_msg@3x.png rename to dundun/Resources/images/Assets.xcassets/nav/nav_msg.imageset/nav_msg@3x.png diff --git a/dundun/Assets.xcassets/tab/Contents.json b/dundun/Resources/images/Assets.xcassets/tab/Contents.json similarity index 100% rename from dundun/Assets.xcassets/tab/Contents.json rename to dundun/Resources/images/Assets.xcassets/tab/Contents.json diff --git a/dundun/Assets.xcassets/user/Contents.json b/dundun/Resources/images/Assets.xcassets/user/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/Contents.json diff --git a/dundun/Assets.xcassets/user/user_auth.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_auth.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_auth.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_auth.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_auth.imageset/user_auth.png b/dundun/Resources/images/Assets.xcassets/user/user_auth.imageset/user_auth.png similarity index 100% rename from dundun/Assets.xcassets/user/user_auth.imageset/user_auth.png rename to dundun/Resources/images/Assets.xcassets/user/user_auth.imageset/user_auth.png diff --git a/dundun/Assets.xcassets/user/user_auth.imageset/user_auth@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_auth.imageset/user_auth@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_auth.imageset/user_auth@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_auth.imageset/user_auth@2x.png diff --git a/dundun/Assets.xcassets/user/user_auth.imageset/user_auth@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_auth.imageset/user_auth@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_auth.imageset/user_auth@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_auth.imageset/user_auth@3x.png diff --git a/dundun/Assets.xcassets/user/user_clean.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_clean.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_clean.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_clean.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_clean.imageset/user_clean.png b/dundun/Resources/images/Assets.xcassets/user/user_clean.imageset/user_clean.png similarity index 100% rename from dundun/Assets.xcassets/user/user_clean.imageset/user_clean.png rename to dundun/Resources/images/Assets.xcassets/user/user_clean.imageset/user_clean.png diff --git a/dundun/Assets.xcassets/user/user_clean.imageset/user_clean@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_clean.imageset/user_clean@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_clean.imageset/user_clean@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_clean.imageset/user_clean@2x.png diff --git a/dundun/Assets.xcassets/user/user_clean.imageset/user_clean@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_clean.imageset/user_clean@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_clean.imageset/user_clean@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_clean.imageset/user_clean@3x.png diff --git a/dundun/Assets.xcassets/user/user_feedback.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_feedback.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_feedback.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_feedback.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_feedback.imageset/user_feedback.png b/dundun/Resources/images/Assets.xcassets/user/user_feedback.imageset/user_feedback.png similarity index 100% rename from dundun/Assets.xcassets/user/user_feedback.imageset/user_feedback.png rename to dundun/Resources/images/Assets.xcassets/user/user_feedback.imageset/user_feedback.png diff --git a/dundun/Assets.xcassets/user/user_feedback.imageset/user_feedback@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_feedback.imageset/user_feedback@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_feedback.imageset/user_feedback@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_feedback.imageset/user_feedback@2x.png diff --git a/dundun/Assets.xcassets/user/user_feedback.imageset/user_feedback@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_feedback.imageset/user_feedback@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_feedback.imageset/user_feedback@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_feedback.imageset/user_feedback@3x.png diff --git a/dundun/Assets.xcassets/user/user_help.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_help.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_help.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_help.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_help.imageset/user_help.png b/dundun/Resources/images/Assets.xcassets/user/user_help.imageset/user_help.png similarity index 100% rename from dundun/Assets.xcassets/user/user_help.imageset/user_help.png rename to dundun/Resources/images/Assets.xcassets/user/user_help.imageset/user_help.png diff --git a/dundun/Assets.xcassets/user/user_help.imageset/user_help@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_help.imageset/user_help@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_help.imageset/user_help@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_help.imageset/user_help@2x.png diff --git a/dundun/Assets.xcassets/user/user_help.imageset/user_help@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_help.imageset/user_help@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_help.imageset/user_help@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_help.imageset/user_help@3x.png diff --git a/dundun/Assets.xcassets/user/user_kefu.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_kefu.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_kefu.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_kefu.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_kefu.imageset/user_kefu.png b/dundun/Resources/images/Assets.xcassets/user/user_kefu.imageset/user_kefu.png similarity index 100% rename from dundun/Assets.xcassets/user/user_kefu.imageset/user_kefu.png rename to dundun/Resources/images/Assets.xcassets/user/user_kefu.imageset/user_kefu.png diff --git a/dundun/Assets.xcassets/user/user_kefu.imageset/user_kefu@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_kefu.imageset/user_kefu@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_kefu.imageset/user_kefu@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_kefu.imageset/user_kefu@2x.png diff --git a/dundun/Assets.xcassets/user/user_kefu.imageset/user_kefu@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_kefu.imageset/user_kefu@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_kefu.imageset/user_kefu@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_kefu.imageset/user_kefu@3x.png diff --git a/dundun/Assets.xcassets/user/user_list.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_list.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_list.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_list.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_list.imageset/user_list.png b/dundun/Resources/images/Assets.xcassets/user/user_list.imageset/user_list.png similarity index 100% rename from dundun/Assets.xcassets/user/user_list.imageset/user_list.png rename to dundun/Resources/images/Assets.xcassets/user/user_list.imageset/user_list.png diff --git a/dundun/Assets.xcassets/user/user_list.imageset/user_list@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_list.imageset/user_list@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_list.imageset/user_list@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_list.imageset/user_list@2x.png diff --git a/dundun/Assets.xcassets/user/user_list.imageset/user_list@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_list.imageset/user_list@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_list.imageset/user_list@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_list.imageset/user_list@3x.png diff --git a/dundun/Assets.xcassets/user/user_safe.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_safe.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_safe.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_safe.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_safe.imageset/user_safe.png b/dundun/Resources/images/Assets.xcassets/user/user_safe.imageset/user_safe.png similarity index 100% rename from dundun/Assets.xcassets/user/user_safe.imageset/user_safe.png rename to dundun/Resources/images/Assets.xcassets/user/user_safe.imageset/user_safe.png diff --git a/dundun/Assets.xcassets/user/user_safe.imageset/user_safe@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_safe.imageset/user_safe@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_safe.imageset/user_safe@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_safe.imageset/user_safe@2x.png diff --git a/dundun/Assets.xcassets/user/user_safe.imageset/user_safe@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_safe.imageset/user_safe@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_safe.imageset/user_safe@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_safe.imageset/user_safe@3x.png diff --git a/dundun/Assets.xcassets/user/user_setting.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_setting.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_setting.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_setting.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_setting.imageset/user_setting.png b/dundun/Resources/images/Assets.xcassets/user/user_setting.imageset/user_setting.png similarity index 100% rename from dundun/Assets.xcassets/user/user_setting.imageset/user_setting.png rename to dundun/Resources/images/Assets.xcassets/user/user_setting.imageset/user_setting.png diff --git a/dundun/Assets.xcassets/user/user_setting.imageset/user_setting@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_setting.imageset/user_setting@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_setting.imageset/user_setting@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_setting.imageset/user_setting@2x.png diff --git a/dundun/Assets.xcassets/user/user_setting.imageset/user_setting@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_setting.imageset/user_setting@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_setting.imageset/user_setting@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_setting.imageset/user_setting@3x.png diff --git a/dundun/Assets.xcassets/user/user_wallet.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user/user_wallet.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user/user_wallet.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user/user_wallet.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user/user_wallet.imageset/user_wallet.png b/dundun/Resources/images/Assets.xcassets/user/user_wallet.imageset/user_wallet.png similarity index 100% rename from dundun/Assets.xcassets/user/user_wallet.imageset/user_wallet.png rename to dundun/Resources/images/Assets.xcassets/user/user_wallet.imageset/user_wallet.png diff --git a/dundun/Assets.xcassets/user/user_wallet.imageset/user_wallet@2x.png b/dundun/Resources/images/Assets.xcassets/user/user_wallet.imageset/user_wallet@2x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_wallet.imageset/user_wallet@2x.png rename to dundun/Resources/images/Assets.xcassets/user/user_wallet.imageset/user_wallet@2x.png diff --git a/dundun/Assets.xcassets/user/user_wallet.imageset/user_wallet@3x.png b/dundun/Resources/images/Assets.xcassets/user/user_wallet.imageset/user_wallet@3x.png similarity index 100% rename from dundun/Assets.xcassets/user/user_wallet.imageset/user_wallet@3x.png rename to dundun/Resources/images/Assets.xcassets/user/user_wallet.imageset/user_wallet@3x.png diff --git a/dundun/Assets.xcassets/user_invite.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user_invite.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user_invite.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user_invite.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user_invite.imageset/user_invite.png b/dundun/Resources/images/Assets.xcassets/user_invite.imageset/user_invite.png similarity index 100% rename from dundun/Assets.xcassets/user_invite.imageset/user_invite.png rename to dundun/Resources/images/Assets.xcassets/user_invite.imageset/user_invite.png diff --git a/dundun/Assets.xcassets/user_sign.imageset/Contents.json b/dundun/Resources/images/Assets.xcassets/user_sign.imageset/Contents.json similarity index 100% rename from dundun/Assets.xcassets/user_sign.imageset/Contents.json rename to dundun/Resources/images/Assets.xcassets/user_sign.imageset/Contents.json diff --git a/dundun/Assets.xcassets/user_sign.imageset/user_sign.png b/dundun/Resources/images/Assets.xcassets/user_sign.imageset/user_sign.png similarity index 100% rename from dundun/Assets.xcassets/user_sign.imageset/user_sign.png rename to dundun/Resources/images/Assets.xcassets/user_sign.imageset/user_sign.png diff --git a/dundun/Base.lproj/LaunchScreen.storyboard b/dundun/Resources/storyboards/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from dundun/Base.lproj/LaunchScreen.storyboard rename to dundun/Resources/storyboards/Base.lproj/LaunchScreen.storyboard diff --git a/dundun/Base.lproj/Main.storyboard b/dundun/Resources/storyboards/Base.lproj/Main.storyboard similarity index 100% rename from dundun/Base.lproj/Main.storyboard rename to dundun/Resources/storyboards/Base.lproj/Main.storyboard diff --git a/dundun/ExtensionUIviewController.swift b/dundun/Tools/ViewController/ExtensionUIviewController.swift similarity index 100% rename from dundun/ExtensionUIviewController.swift rename to dundun/Tools/ViewController/ExtensionUIviewController.swift diff --git a/dundun/LoginTextField.swift b/dundun/Views/Login/LoginTextField.swift similarity index 100% rename from dundun/LoginTextField.swift rename to dundun/Views/Login/LoginTextField.swift