Public iOSTheme submodule

gureum · Sep 4, 2018 · 95f489974212e4154b503b3be8c040406d82de81 · 95f4899
1 parent 317223a
commit 95f489974212e4154b503b3be8c040406d82de81
Unified Split

Showing with 5 additions and 8 deletions.

+3 −0 .gitmodules

+0 −6 iOS.xcodeproj/project.pbxproj

+1 −1 iOSApp/ThemeViewController.swift

+1 −1 iOSTheme
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "FoundationExtension"]
 	path = FoundationExtension
 	url = https://github.com/youknowone/FoundationExtension.git
+[submodule "iOSTheme"]
+	path = iOSTheme
+	url = https://github.com/gureum/ios-theme
diff --git a/iOS.xcodeproj/project.pbxproj b/iOS.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		380136AE199C67F200355D69 /* help in Resources */ = {isa = PBXBuildFile; fileRef = 380136AD199C67F200355D69 /* help */; };
 		380136B5199CAFC200355D69 /* shop.json in Resources */ = {isa = PBXBuildFile; fileRef = 380136B4199CAFC000355D69 /* shop.json */; };
 		38303657198D9FA000C1EE0C /* icon_512x512@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 38303656198D9FA000C1EE0C /* icon_512x512@2x.png */; };
-		38324EAE199F476B0031888D /* test in Resources */ = {isa = PBXBuildFile; fileRef = 38324EAD199F476B0031888D /* test */; };
 		3838F99219A47AD700DFBFC8 /* GRInputButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 3838F99119A47AD700DFBFC8 /* GRInputButton.m */; };
 		3838F99519A47C3A00DFBFC8 /* GRInputButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 3838F99119A47AD700DFBFC8 /* GRInputButton.m */; };
 		383B07EE19E70609004046F5 /* InputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38BB7013193FA11000605583 /* InputViewController.swift */; };
@@ -135,15 +134,13 @@
 		380136AD199C67F200355D69 /* help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = help; sourceTree = "<group>"; };
 		380136AF199C68BC00355D69 /* GlobalActivicyIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalActivicyIndicatorView.swift; sourceTree = "<group>"; };
 		380136B1199CAE1F00355D69 /* ThemeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeViewController.swift; sourceTree = "<group>"; };
-		380136B3199CAFC000355D69 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		380136B4199CAFC000355D69 /* shop.json */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = text.json; path = shop.json; sourceTree = "<group>"; tabWidth = 2; };
 		380136B6199CB4A700355D69 /* PreviewViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewViewController.swift; sourceTree = "<group>"; };
 		38303652198A15DB00C1EE0C /* LayoutEditorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LayoutEditorViewController.swift; sourceTree = "<group>"; };
 		38303654198A1F1E00C1EE0C /* Preferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
 		38303656198D9FA000C1EE0C /* icon_512x512@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon_512x512@2x.png"; path = "OSX/Icons/Gureum.iconset/icon_512x512@2x.png"; sourceTree = SOURCE_ROOT; };
 		38303668199059D500C1EE0C /* capi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = capi.cpp; path = ../hangeul/hangeul/capi.cpp; sourceTree = "<group>"; };
 		3830366B199059DE00C1EE0C /* capi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = capi.h; path = ../hangeul/hangeul/capi.h; sourceTree = "<group>"; };
-		38324EAD199F476B0031888D /* test */ = {isa = PBXFileReference; lastKnownFileType = folder; path = test; sourceTree = "<group>"; };
 		3838F99119A47AD700DFBFC8 /* GRInputButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRInputButton.m; sourceTree = "<group>"; };
 		3838F99419A47AEC00DFBFC8 /* GRInputButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GRInputButton.h; sourceTree = "<group>"; };
 		383B07F019E71482004046F5 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
@@ -354,10 +351,8 @@
 		38D9A398199B7F8E0087A965 /* iOSTheme */ = {
 			isa = PBXGroup;
 			children = (
-				380136B3199CAFC000355D69 /* README.md */,
 				380136B4199CAFC000355D69 /* shop.json */,
 				38D9A394199B7F8A0087A965 /* default */,
-				38324EAD199F476B0031888D /* test */,
 			);
 			path = iOSTheme;
 			sourceTree = "<group>";
@@ -536,7 +531,6 @@
 				380136AE199C67F200355D69 /* help in Resources */,
 				3882BA01193F9E6600076C26 /* Main.storyboard in Resources */,
 				3882BA03193F9E6600076C26 /* Images.xcassets in Resources */,
-				38324EAE199F476B0031888D /* test in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/iOSApp/ThemeViewController.swift b/iOSApp/ThemeViewController.swift
@@ -157,7 +157,7 @@ func collectResources(node: Any!) -> Dictionary<String, Bool> {
        return [:]
    }
    else {
-        assert(false)
+        // assert(false) -- TODO: 
        return [:]
    }
 }
diff --git a/iOSTheme b/iOSTheme