Begin restructuring project

cenllv · Jan 14, 2022 · 9525740 · 9525740
1 parent 63c1586
commit 9525740
Show file tree

Hide file tree

Showing 81 changed files with 1,090 additions and 1,015 deletions.
diff --git a/docs/Supplementary Views.md → Documentation/Guides/Supplementary Views.md b/docs/Supplementary Views.md → Documentation/Guides/Supplementary Views.md
diff --git a/docs/images/ActiveLabelDefault.gif → Documentation/Images/ActiveLabelDefault.gif b/docs/images/ActiveLabelDefault.gif → Documentation/Images/ActiveLabelDefault.gif
diff --git a/docs/images/ActiveLabelEdited01.gif → Documentation/Images/ActiveLabelEdited01.gif b/docs/images/ActiveLabelEdited01.gif → Documentation/Images/ActiveLabelEdited01.gif
diff --git a/docs/images/ActiveLabelEdited02.gif → Documentation/Images/ActiveLabelEdited02.gif b/docs/images/ActiveLabelEdited02.gif → Documentation/Images/ActiveLabelEdited02.gif
diff --git a/docs/images/ActiveLabelEdited03.gif → Documentation/Images/ActiveLabelEdited03.gif b/docs/images/ActiveLabelEdited03.gif → Documentation/Images/ActiveLabelEdited03.gif
diff --git a/...rollingPageControl-ControlInteraction.gif → ...rollingPageControl-ControlInteraction.gif b/...rollingPageControl-ControlInteraction.gif → ...rollingPageControl-ControlInteraction.gif
diff --git a/...ScrollingPageControl-CustomizedLayout.png → ...ScrollingPageControl-CustomizedLayout.png b/...ScrollingPageControl-CustomizedLayout.png → ...ScrollingPageControl-CustomizedLayout.png
diff --git a/...crollingPageControl-CustomizedPageDot.png → ...crollingPageControl-CustomizedPageDot.png b/...crollingPageControl-CustomizedPageDot.png → ...crollingPageControl-CustomizedPageDot.png
diff --git a/...eControl/ScrollingPageControl-Default.png → ...eControl/ScrollingPageControl-Default.png b/...eControl/ScrollingPageControl-Default.png → ...eControl/ScrollingPageControl-Default.png
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
diff --git a/...ta/xcschemes/UtiliKit-iOSExample.xcscheme → ...shareddata/xcschemes/iOS Example.xcscheme b/...ta/xcschemes/UtiliKit-iOSExample.xcscheme → ...shareddata/xcschemes/iOS Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8698CFCF2061A19D0065AE20"
-               BuildableName = "UtiliKit-iOSExample.app"
-               BlueprintName = "UtiliKit-iOSExample"
-               ReferencedContainer = "container:UtiliKit.xcodeproj">
+               BlueprintIdentifier = "0EC7EF6727922FB700F712F3"
+               BuildableName = "iOS Example.app"
+               BlueprintName = "iOS Example"
+               ReferencedContainer = "container:Example.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -27,26 +27,7 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8698CFCF2061A19D0065AE20"
-            BuildableName = "UtiliKit-iOSExample.app"
-            BlueprintName = "UtiliKit-iOSExample"
-            ReferencedContainer = "container:UtiliKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8677314020601BB400C54343"
-               BuildableName = "UtiliKit-iOSTests.xctest"
-               BlueprintName = "UtiliKit-iOSTests"
-               ReferencedContainer = "container:UtiliKit.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -63,10 +44,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8698CFCF2061A19D0065AE20"
-            BuildableName = "UtiliKit-iOSExample.app"
-            BlueprintName = "UtiliKit-iOSExample"
-            ReferencedContainer = "container:UtiliKit.xcodeproj">
+            BlueprintIdentifier = "0EC7EF6727922FB700F712F3"
+            BuildableName = "iOS Example.app"
+            BlueprintName = "iOS Example"
+            ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
@@ -80,10 +61,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8698CFCF2061A19D0065AE20"
-            BuildableName = "UtiliKit-iOSExample.app"
-            BlueprintName = "UtiliKit-iOSExample"
-            ReferencedContainer = "container:UtiliKit.xcodeproj">
+            BlueprintIdentifier = "0EC7EF6727922FB700F712F3"
+            BuildableName = "iOS Example.app"
+            BlueprintName = "iOS Example"
+            ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

diff --git a/Examples/UtiliKit-iOSExample/Info.plist → Example/Info.plist b/Examples/UtiliKit-iOSExample/Info.plist → Example/Info.plist
diff --git a/...ive Label/ActiveLabelViewController.swift → ...ive Label/ActiveLabelViewController.swift b/...ive Label/ActiveLabelViewController.swift → ...ive Label/ActiveLabelViewController.swift
@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import UtiliKit
 
 class ActiveLabelViewController: UIViewController {
 

diff --git a/...les/UtiliKit-iOSExample/AppDelegate.swift → Example/Sources/AppDelegate.swift b/...les/UtiliKit-iOSExample/AppDelegate.swift → Example/Sources/AppDelegate.swift
diff --git a/...it-iOSExample/Base.lproj/LaunchScreen.xib → Example/Sources/Base.lproj/LaunchScreen.xib b/...it-iOSExample/Base.lproj/LaunchScreen.xib → Example/Sources/Base.lproj/LaunchScreen.xib
diff --git a/...Kit-iOSExample/Base.lproj/Main.storyboard → Example/Sources/Base.lproj/Main.storyboard b/...Kit-iOSExample/Base.lproj/Main.storyboard → Example/Sources/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="rdK-4z-16f">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="rdK-4z-16f">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -33,7 +33,7 @@
         <!--Views-->
         <scene sceneID="ssd-ip-ts2">
             <objects>
-                <viewController storyboardIdentifier="ViewController" id="Ywn-K3-9eh" customClass="ViewController" customModule="UtiliKit_iOSExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ViewController" id="Ywn-K3-9eh" customClass="ViewController" customModule="iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="E3F-O8-DaJ">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -49,7 +49,7 @@
         <!--Collection-->
         <scene sceneID="XPG-4M-Zsq">
             <objects>
-                <viewController storyboardIdentifier="CollectionViewController" id="NJX-AI-rJc" customClass="CollectionViewController" customModule="UtiliKit_iOSExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="CollectionViewController" id="NJX-AI-rJc" customClass="CollectionViewController" customModule="iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="T2G-3R-CLh">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -65,7 +65,7 @@
         <!--View Controllers-->
         <scene sceneID="QML-N3-sii">
             <objects>
-                <viewController storyboardIdentifier="VCViewController" id="GXF-61-Br5" customClass="VCViewController" customModule="UtiliKit_iOSExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="VCViewController" id="GXF-61-Br5" customClass="VCViewController" customModule="iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="4e9-uU-trR">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -106,7 +106,7 @@
         <!--Active Label-->
         <scene sceneID="BvX-ia-Zad">
             <objects>
-                <viewController id="ZgP-fe-jSw" customClass="ActiveLabelViewController" customModule="UtiliKit" sceneMemberID="viewController">
+                <viewController id="ZgP-fe-jSw" customClass="ActiveLabelViewController" customModule="iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ybc-Th-23T">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -302,7 +302,7 @@ loadingLineVerticalSpacing = 8</string>
         <!--Map-->
         <scene sceneID="h1W-dY-xUm">
             <objects>
-                <viewController storyboardIdentifier="MapViewController" id="SBK-FD-08V" customClass="MapViewController" customModule="UtiliKit_iOSExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="MapViewController" id="SBK-FD-08V" customClass="MapViewController" customModule="iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="39P-nR-h1C">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -332,7 +332,7 @@ loadingLineVerticalSpacing = 8</string>
         <!--Base Container View Controller-->
         <scene sceneID="Xjg-wM-sSs">
             <objects>
-                <viewController id="smy-zP-9K0" customClass="BaseContainerViewController" customModule="UtiliKit_iOSExample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="smy-zP-9K0" customClass="BaseContainerViewController" customModule="iOS_Example" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="gE4-id-R8o">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>

diff --git a/...and Decorations/Cells/NibDrivenCell.swift → ...and Decorations/Cells/NibDrivenCell.swift b/...and Decorations/Cells/NibDrivenCell.swift → ...and Decorations/Cells/NibDrivenCell.swift
diff --git a/...s and Decorations/Cells/NibDrivenCell.xib → ...s and Decorations/Cells/NibDrivenCell.xib b/...s and Decorations/Cells/NibDrivenCell.xib → ...s and Decorations/Cells/NibDrivenCell.xib
diff --git a/... Decorations/Cells/ProgrammaticCell.swift → ... Decorations/Cells/ProgrammaticCell.swift b/... Decorations/Cells/ProgrammaticCell.swift → ... Decorations/Cells/ProgrammaticCell.swift
diff --git a/...ions/Decorations/BlueDecorationView.swift → ...ions/Decorations/BlueDecorationView.swift b/...ions/Decorations/BlueDecorationView.swift → ...ions/Decorations/BlueDecorationView.swift
diff --git a/...ns/Decorations/YellowDecorationView.swift → ...ns/Decorations/YellowDecorationView.swift b/...ns/Decorations/YellowDecorationView.swift → ...ns/Decorations/YellowDecorationView.swift
diff --git a/...plementaries/BadgeSupplementaryView.swift → ...plementaries/BadgeSupplementaryView.swift b/...plementaries/BadgeSupplementaryView.swift → ...plementaries/BadgeSupplementaryView.swift
diff --git a/...mentaries/NibDrivenHeaderFooterView.swift → ...mentaries/NibDrivenHeaderFooterView.swift b/...mentaries/NibDrivenHeaderFooterView.swift → ...mentaries/NibDrivenHeaderFooterView.swift
diff --git a/...lementaries/NibDrivenHeaderFooterView.xib → ...lementaries/NibDrivenHeaderFooterView.xib b/...lementaries/NibDrivenHeaderFooterView.xib → ...lementaries/NibDrivenHeaderFooterView.xib
diff --git a/...taries/ProgrammaticHeaderFooterView.swift → ...taries/ProgrammaticHeaderFooterView.swift b/...taries/ProgrammaticHeaderFooterView.swift → ...taries/ProgrammaticHeaderFooterView.swift
diff --git a/...Collection/CollectionViewController.swift → ...Collection/CollectionViewController.swift b/...Collection/CollectionViewController.swift → ...Collection/CollectionViewController.swift
diff --git a/...iner/ContainerExampleViewController.swift → ...iner/ContainerExampleViewController.swift b/...iner/ContainerExampleViewController.swift → ...iner/ContainerExampleViewController.swift
diff --git a/...ple/Container/InteractiveTransition.swift → ...ces/Container/InteractiveTransition.swift b/...ple/Container/InteractiveTransition.swift → ...ces/Container/InteractiveTransition.swift
diff --git a/...OSExample/Container/ViewControllerA.swift → ...e/Sources/Container/ViewControllerA.swift b/...OSExample/Container/ViewControllerA.swift → ...e/Sources/Container/ViewControllerA.swift
diff --git a/...OSExample/Container/ViewControllerB.swift → ...e/Sources/Container/ViewControllerB.swift b/...OSExample/Container/ViewControllerB.swift → ...e/Sources/Container/ViewControllerB.swift
diff --git a/...le/Container/WipeTransitionAnimator.swift → ...es/Container/WipeTransitionAnimator.swift b/...le/Container/WipeTransitionAnimator.swift → ...es/Container/WipeTransitionAnimator.swift
diff --git a/Example/Sources/Images.xcassets/AccentColor.colorset/Contents.json b/Example/Sources/Images.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
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/Sources/Images.xcassets/Contents.json b/Example/Sources/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...Kit-iOSExample/Map/CustomAnnotation.swift → Example/Sources/Map/CustomAnnotation.swift b/...Kit-iOSExample/Map/CustomAnnotation.swift → Example/Sources/Map/CustomAnnotation.swift
diff --git a/...iliKit-iOSExample/Map/MapController.swift → Example/Sources/Map/MapController.swift b/...iliKit-iOSExample/Map/MapController.swift → Example/Sources/Map/MapController.swift
diff --git a/...it-iOSExample/Map/MapViewController.swift → Example/Sources/Map/MapViewController.swift b/...it-iOSExample/Map/MapViewController.swift → Example/Sources/Map/MapViewController.swift
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     //
     import UIKit
+    import UtiliKit
     class ActiveLabelViewController: UIViewController {
@@ Expand Down @@