Remove ChouTi subdirectory

Ch0uti · May 13, 2019 · 19bcf8d · 19bcf8d
1 parent fb2af13
commit 19bcf8d
Show file tree

Hide file tree

Showing 464 changed files with 24 additions and 2,528 deletions.
diff --git a/ChouTi/.bundle/config → .bundle/config b/ChouTi/.bundle/config → .bundle/config
diff --git a/ChouTi/.codecov.yml → .codecov.yml b/ChouTi/.codecov.yml → .codecov.yml
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
 Notes/* linguist-documentation
-ChouTi/Pods/* linguist-vendored
+Pods/* linguist-vendored
diff --git a/.gitignore b/.gitignore
@@ -24,14 +24,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-#
-# **/Pods/
-
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
@@ -40,4 +32,4 @@ DerivedData
 Carthage/Build
 
 # Bundle
-ChouTi/Vendor/bundle
+Vendor/bundle
diff --git a/ChouTi/.swift-version → .swift-version b/ChouTi/.swift-version → .swift-version
diff --git a/.swiftformat b/.swiftformat
@@ -3,13 +3,13 @@
 
 # format options
 --decimalgrouping none
---header "Copyright © {year} Editor. All rights reserved."
+--header "Copyright © {year} ChouTi. All rights reserved."
 --hexgrouping none
 --importgrouping testable-bottom
---indent 2
+--indent 4
 --octalgrouping none
 --ranges nospace
 --self init-only
 
 # file options
---exclude Package.swift, Submodules, Pods
+--exclude Package.swift, Submodules, Pods, Sources/CodeSnippets
diff --git a/ChouTi/.swiftlint.yml → .swiftlint.yml b/ChouTi/.swiftlint.yml → .swiftlint.yml
@@ -58,8 +58,10 @@ opt_in_rules:
   - untyped_error_in_catch
   - unused_import
   - unused_private_declaration
+  - valid_docs
   - vertical_parameter_alignment_on_call
   - yoda_condition
+  - nslocalizedstring_require_bundle
 
 disabled_rules:
   - cyclomatic_complexity
@@ -87,6 +89,7 @@ excluded:
   - Carthage
   - Pods
   - Sources/CodeSnippets
+  - Tests
 
 line_length:
   warning: 180

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: swift
 osx_image: xcode10.1
 env:
   global:
-  - PROJECT_DIR="./ChouTi"
+  - PROJECT_DIR="."
   - WORKSPACE="ChouTi.xcworkspace"
   - IOS_FRAMEWORK_SCHEME="ChouTi iOS"
   - IOS_EXAMPLE_SCHEME="ChouTi Example iOS"

diff --git a/...ample iOS UITests/ChouTi_iOSUITests.swift → ...ample iOS UITests/ChouTi_iOSUITests.swift b/...ample iOS UITests/ChouTi_iOSUITests.swift → ...ample iOS UITests/ChouTi_iOSUITests.swift
diff --git a/ChouTi/ChouTi Example iOS UITests/Info.plist → ChouTi Example iOS UITests/Info.plist b/ChouTi/ChouTi Example iOS UITests/Info.plist → ChouTi Example iOS UITests/Info.plist
diff --git a/ChouTi/ChouTi Example iOS/AppDelegate.swift → ChouTi Example iOS/AppDelegate.swift b/ChouTi/ChouTi Example iOS/AppDelegate.swift → ChouTi Example iOS/AppDelegate.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...Example iOS/Assets.xcassets/Contents.json → ...Example iOS/Assets.xcassets/Contents.json b/...Example iOS/Assets.xcassets/Contents.json → ...Example iOS/Assets.xcassets/Contents.json
diff --git a/...le iOS/Base.lproj/LaunchScreen.storyboard → ...le iOS/Base.lproj/LaunchScreen.storyboard b/...le iOS/Base.lproj/LaunchScreen.storyboard → ...le iOS/Base.lproj/LaunchScreen.storyboard
diff --git a/ChouTi/ChouTi Example iOS/Info.plist → ChouTi Example iOS/Info.plist b/ChouTi/ChouTi Example iOS/Info.plist → ChouTi Example iOS/Info.plist
diff --git a/...orrectTableViewCellContentViewWidth.swift → ...orrectTableViewCellContentViewWidth.swift b/...orrectTableViewCellContentViewWidth.swift → ...orrectTableViewCellContentViewWidth.swift
@@ -1,6 +1,7 @@
 // Copyright © 2019 ChouTi. All rights reserved.
 
 import ChouTi
+import UIKit
 
 class Issue_IncorrectTableViewCellContentViewWidth: UIViewController {
     let cell = UITableViewCell()

diff --git a/...ue_LayoutMarginsGuideViewController.swift → ...ue_LayoutMarginsGuideViewController.swift b/...ue_LayoutMarginsGuideViewController.swift → ...ue_LayoutMarginsGuideViewController.swift
diff --git a/...sue_PreservesSuperviewLayoutMargins.swift → ...sue_PreservesSuperviewLayoutMargins.swift b/...sue_PreservesSuperviewLayoutMargins.swift → ...sue_PreservesSuperviewLayoutMargins.swift
@@ -1,6 +1,7 @@
 // Copyright © 2019 ChouTi. All rights reserved.
 
 import ChouTi
+import UIKit
 
 class Issue_PreservesSuperviewLayoutMargins: UIViewController {
     private let containerView = LayoutMarginView()

diff --git a/...Ti Example iOS/Issues/IssuesSection.swift → ...Ti Example iOS/Issues/IssuesSection.swift b/...Ti Example iOS/Issues/IssuesSection.swift → ...Ti Example iOS/Issues/IssuesSection.swift
diff --git a/...ouTi Example iOS/MainViewController.swift → ChouTi Example iOS/MainViewController.swift b/...ouTi Example iOS/MainViewController.swift → ChouTi Example iOS/MainViewController.swift
@@ -1,7 +1,7 @@
 // Copyright © 2019 ChouTi. All rights reserved.
 
 import ChouTi
-import Foundation
+import UIKit
 
 class MainViewController: UIViewController {
     let tableView = UITableView(frame: .zero, style: .grouped)

diff --git a/...us/DropPresentingDemoViewController.swift → ...us/DropPresentingDemoViewController.swift b/...us/DropPresentingDemoViewController.swift → ...us/DropPresentingDemoViewController.swift
diff --git a/...tionBarBottomLineDemoViewController.swift → ...tionBarBottomLineDemoViewController.swift b/...tionBarBottomLineDemoViewController.swift → ...tionBarBottomLineDemoViewController.swift
diff --git a/...ailingVSLeftRightDemoViewController.swift → ...ailingVSLeftRightDemoViewController.swift b/...ailingVSLeftRightDemoViewController.swift → ...ailingVSLeftRightDemoViewController.swift
diff --git a/.../Miscellaneous/MiscellaneousSection.swift → .../Miscellaneous/MiscellaneousSection.swift b/.../Miscellaneous/MiscellaneousSection.swift → .../Miscellaneous/MiscellaneousSection.swift
diff --git a/...neous/TableLayoutDemoViewController.swift → ...neous/TableLayoutDemoViewController.swift b/...neous/TableLayoutDemoViewController.swift → ...neous/TableLayoutDemoViewController.swift
diff --git a/...ctionRowExtensionDemoViewController.swift → ...ctionRowExtensionDemoViewController.swift b/...ctionRowExtensionDemoViewController.swift → ...ctionRowExtensionDemoViewController.swift
diff --git a/...Demo/Image Resources/BearImages/bear1.png → ...Demo/Image Resources/BearImages/bear1.png b/...Demo/Image Resources/BearImages/bear1.png → ...Demo/Image Resources/BearImages/bear1.png
diff --git a/...o/Image Resources/BearImages/bear1@2x.png → ...o/Image Resources/BearImages/bear1@2x.png b/...o/Image Resources/BearImages/bear1@2x.png → ...o/Image Resources/BearImages/bear1@2x.png
diff --git a/...Demo/Image Resources/BearImages/bear2.png → ...Demo/Image Resources/BearImages/bear2.png b/...Demo/Image Resources/BearImages/bear2.png → ...Demo/Image Resources/BearImages/bear2.png
diff --git a/...o/Image Resources/BearImages/bear2@2x.png → ...o/Image Resources/BearImages/bear2@2x.png b/...o/Image Resources/BearImages/bear2@2x.png → ...o/Image Resources/BearImages/bear2@2x.png
diff --git a/...Demo/Image Resources/BearImages/bear3.png → ...Demo/Image Resources/BearImages/bear3.png b/...Demo/Image Resources/BearImages/bear3.png → ...Demo/Image Resources/BearImages/bear3.png
diff --git a/...o/Image Resources/BearImages/bear3@2x.png → ...o/Image Resources/BearImages/bear3@2x.png b/...o/Image Resources/BearImages/bear3@2x.png → ...o/Image Resources/BearImages/bear3@2x.png
diff --git a/...Demo/Image Resources/BearImages/bear4.png → ...Demo/Image Resources/BearImages/bear4.png b/...Demo/Image Resources/BearImages/bear4.png → ...Demo/Image Resources/BearImages/bear4.png
diff --git a/...o/Image Resources/BearImages/bear4@2x.png → ...o/Image Resources/BearImages/bear4@2x.png b/...o/Image Resources/BearImages/bear4@2x.png → ...o/Image Resources/BearImages/bear4@2x.png
diff --git a/...Demo/Image Resources/BearImages/bear5.png → ...Demo/Image Resources/BearImages/bear5.png b/...Demo/Image Resources/BearImages/bear5.png → ...Demo/Image Resources/BearImages/bear5.png
diff --git a/...o/Image Resources/BearImages/bear5@2x.png → ...o/Image Resources/BearImages/bear5@2x.png b/...o/Image Resources/BearImages/bear5@2x.png → ...o/Image Resources/BearImages/bear5@2x.png
diff --git a/...Demo/Image Resources/BearImages/bear6.png → ...Demo/Image Resources/BearImages/bear6.png b/...Demo/Image Resources/BearImages/bear6.png → ...Demo/Image Resources/BearImages/bear6.png
diff --git a/...o/Image Resources/BearImages/bear6@2x.png → ...o/Image Resources/BearImages/bear6@2x.png b/...o/Image Resources/BearImages/bear6@2x.png → ...o/Image Resources/BearImages/bear6@2x.png
diff --git a/...Demo/Image Resources/BearImages/bear7.png → ...Demo/Image Resources/BearImages/bear7.png b/...Demo/Image Resources/BearImages/bear7.png → ...Demo/Image Resources/BearImages/bear7.png
diff --git a/...o/Image Resources/BearImages/bear7@2x.png → ...o/Image Resources/BearImages/bear7@2x.png b/...o/Image Resources/BearImages/bear7@2x.png → ...o/Image Resources/BearImages/bear7@2x.png
diff --git a/...Demo/Image Resources/BearImages/bear8.png → ...Demo/Image Resources/BearImages/bear8.png b/...Demo/Image Resources/BearImages/bear8.png → ...Demo/Image Resources/BearImages/bear8.png
diff --git a/...o/Image Resources/BearImages/bear8@2x.png → ...o/Image Resources/BearImages/bear8@2x.png b/...o/Image Resources/BearImages/bear8@2x.png → ...o/Image Resources/BearImages/bear8@2x.png
diff --git a/...ns Demo/UIImage+AnimatingImagesDemo.swift → ...ns Demo/UIImage+AnimatingImagesDemo.swift b/...ns Demo/UIImage+AnimatingImagesDemo.swift → ...ns Demo/UIImage+AnimatingImagesDemo.swift
@@ -1,7 +1,7 @@
 // Copyright © 2019 ChouTi. All rights reserved.
 
 import ChouTi
-import Foundation
+import UIKit
 
 class UIImage_AnimatingImagesDemoViewController: UIViewController {
     let bearImageView = UIImageView()

diff --git a/...sions Demo/UIImage+CroppedImageDemo.swift → ...sions Demo/UIImage+CroppedImageDemo.swift b/...sions Demo/UIImage+CroppedImageDemo.swift → ...sions Demo/UIImage+CroppedImageDemo.swift
@@ -1,7 +1,7 @@
 // Copyright © 2019 ChouTi. All rights reserved.
 
 import ChouTi
-import Foundation
+import UIKit
 
 class UIImage_CroppedImageDemoViewController: UIViewController {
     let sourceImage = UIImage(named: "bear1")

diff --git a/...ensions Demo/UIImage+ExtensionsDemo.swift → ...ensions Demo/UIImage+ExtensionsDemo.swift b/...ensions Demo/UIImage+ExtensionsDemo.swift → ...ensions Demo/UIImage+ExtensionsDemo.swift
diff --git a/...ViewController/CenterViewController.swift → ...ViewController/CenterViewController.swift b/...ViewController/CenterViewController.swift → ...ViewController/CenterViewController.swift
diff --git a/...moViewController/CenterViewController.xib → ...moViewController/CenterViewController.xib b/...moViewController/CenterViewController.xib → ...moViewController/CenterViewController.xib
diff --git a/... Example iOS/UITests/UITestsSection.swift → ... Example iOS/UITests/UITestsSection.swift b/... Example iOS/UITests/UITestsSection.swift → ... Example iOS/UITests/UITestsSection.swift
diff --git a/...trollers/MenuPageDemoViewController.swift → ...trollers/MenuPageDemoViewController.swift b/...trollers/MenuPageDemoViewController.swift → ...trollers/MenuPageDemoViewController.swift
diff --git a/...wControllers/PageViewDemoController.swift → ...wControllers/PageViewDemoController.swift b/...wControllers/PageViewDemoController.swift → ...wControllers/PageViewDemoController.swift
diff --git a/...trollers/Shared/DummyViewController.swift → ...trollers/Shared/DummyViewController.swift b/...trollers/Shared/DummyViewController.swift → ...trollers/Shared/DummyViewController.swift
diff --git a/...wControllers/ViewControllersSection.swift → ...wControllers/ViewControllersSection.swift b/...wControllers/ViewControllersSection.swift → ...wControllers/ViewControllersSection.swift
@@ -1,7 +1,7 @@
 // Copyright © 2019 ChouTi. All rights reserved.
 
 import ChouTi
-import Foundation
+import UIKit
 
 class ViewControllersSection: NSObject, TableViewSectionType {
     var headerTitle: String? = "View Controller Containers"

diff --git a/...s/AlertControllerDemoViewController.swift → ...s/AlertControllerDemoViewController.swift b/...s/AlertControllerDemoViewController.swift → ...s/AlertControllerDemoViewController.swift
diff --git a/...iOS/Views/ButtonsDemoViewController.swift → ...iOS/Views/ButtonsDemoViewController.swift b/...iOS/Views/ButtonsDemoViewController.swift → ...iOS/Views/ButtonsDemoViewController.swift
diff --git a/...ePickerControllerDemoViewController.swift → ...ePickerControllerDemoViewController.swift b/...ePickerControllerDemoViewController.swift → ...ePickerControllerDemoViewController.swift
diff --git a/...iews/DropDownMenuDemoViewController.swift → ...iews/DropDownMenuDemoViewController.swift b/...iews/DropDownMenuDemoViewController.swift → ...iews/DropDownMenuDemoViewController.swift
diff --git a/...Views/ImagePickerDemoViewController.swift → ...Views/ImagePickerDemoViewController.swift b/...Views/ImagePickerDemoViewController.swift → ...Views/ImagePickerDemoViewController.swift
diff --git a/...le iOS/Views/MenuViewDemoController.swift → ...le iOS/Views/MenuViewDemoController.swift b/...le iOS/Views/MenuViewDemoController.swift → ...le iOS/Views/MenuViewDemoController.swift
diff --git a/...ationBarStatusBarDemoViewController.swift → ...ationBarStatusBarDemoViewController.swift b/...ationBarStatusBarDemoViewController.swift → ...ationBarStatusBarDemoViewController.swift
diff --git a/...Views/PageControlDemoViewController.swift → ...Views/PageControlDemoViewController.swift b/...Views/PageControlDemoViewController.swift → ...Views/PageControlDemoViewController.swift
diff --git a/...s/SearchTextFieldDemoViewController.swift → ...s/SearchTextFieldDemoViewController.swift b/...s/SearchTextFieldDemoViewController.swift → ...s/SearchTextFieldDemoViewController.swift
diff --git a/...mple iOS/Views/TableViewCellsDemoVC.swift → ...mple iOS/Views/TableViewCellsDemoVC.swift b/...mple iOS/Views/TableViewCellsDemoVC.swift → ...mple iOS/Views/TableViewCellsDemoVC.swift
diff --git a/...ouTi Example iOS/Views/ViewsSection.swift → ChouTi Example iOS/Views/ViewsSection.swift b/...ouTi Example iOS/Views/ViewsSection.swift → ChouTi Example iOS/Views/ViewsSection.swift
diff --git a/...ouTi.xcworkspace/contents.xcworkspacedata → ChouTi.xcworkspace/contents.xcworkspacedata b/...ouTi.xcworkspace/contents.xcworkspacedata → ChouTi.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/ChouTi/.swiftformat b/ChouTi/.swiftformat
diff --git a/ChouTi/ChouTi.xcodeproj/project.pbxproj b/ChouTi/ChouTi.xcodeproj/project.pbxproj
diff --git a/ChouTi/ChouTi.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ChouTi/ChouTi.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ChouTi/ChouTi.xcodeproj/xcshareddata/IDETemplateMacros.plist b/ChouTi/ChouTi.xcodeproj/xcshareddata/IDETemplateMacros.plist
diff --git a/ChouTi/ChouTi.xcodeproj/xcshareddata/xcschemes/ChouTi Example iOS.xcscheme b/ChouTi/ChouTi.xcodeproj/xcshareddata/xcschemes/ChouTi Example iOS.xcscheme
diff --git a/ChouTi/ChouTi.xcodeproj/xcshareddata/xcschemes/ChouTi iOS.xcscheme b/ChouTi/ChouTi.xcodeproj/xcshareddata/xcschemes/ChouTi iOS.xcscheme
diff --git a/ChouTi/Gemfile → Gemfile b/ChouTi/Gemfile → Gemfile
diff --git a/ChouTi/Gemfile.lock → Gemfile.lock b/ChouTi/Gemfile.lock → Gemfile.lock
@@ -75,10 +75,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.6.0.beta.2)
+  cocoapods
   colorize
   rake
   xcpretty
 
 BUNDLED WITH
-   1.16.2
+   1.16.4