From 079ca56c7b86dcc5517d35369df62f535d03e817 Mon Sep 17 00:00:00 2001 From: Anthony Sainez Date: Fri, 29 Mar 2019 11:07:13 -0700 Subject: [PATCH] minimized --- Strokes.xcodeproj/project.pbxproj | 12 +- Strokes/Base.lproj/LaunchScreen.storyboard | 16 +-- Strokes/Base.lproj/Main.storyboard | 38 +++--- Strokes/Info.plist | 16 +-- Strokes/web/demo.js | 43 ------ Strokes/web/index.html | 27 +--- Strokes/web/style.css | 149 --------------------- 7 files changed, 33 insertions(+), 268 deletions(-) delete mode 100644 Strokes/web/style.css diff --git a/Strokes.xcodeproj/project.pbxproj b/Strokes.xcodeproj/project.pbxproj index d413d80..70932d7 100644 --- a/Strokes.xcodeproj/project.pbxproj +++ b/Strokes.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - CB40DF6D22285F2C0030F776 /* style.css in Resources */ = {isa = PBXBuildFile; fileRef = CB40DF6C22285F2C0030F776 /* style.css */; }; CB50566D2214DDAF00EC4EF0 /* CanvasController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB50566C2214DDAF00EC4EF0 /* CanvasController.swift */; }; CB811D422242C2C6001F270B /* demo.js in Resources */ = {isa = PBXBuildFile; fileRef = CB811D412242C2C6001F270B /* demo.js */; }; CB9B22182125EC8C00BB61FF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB9B22172125EC8C00BB61FF /* AppDelegate.swift */; }; @@ -21,7 +20,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - CB40DF6C22285F2C0030F776 /* style.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = style.css; sourceTree = ""; }; CB50566C2214DDAF00EC4EF0 /* CanvasController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CanvasController.swift; sourceTree = ""; }; CB811D412242C2C6001F270B /* demo.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = demo.js; sourceTree = ""; }; CB9B22142125EC8C00BB61FF /* Strokes.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Strokes.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -56,7 +54,6 @@ CBE2FA3F22209DE200C7E9C9 /* jquery.min.js */, CB811D412242C2C6001F270B /* demo.js */, CBBF2A05221C81F5008B6216 /* index.html */, - CB40DF6C22285F2C0030F776 /* style.css */, ); path = web; sourceTree = ""; @@ -161,7 +158,6 @@ buildActionMask = 2147483647; files = ( CBBF2A06221C81F5008B6216 /* index.html in Resources */, - CB40DF6D22285F2C0030F776 /* style.css in Resources */, CB9B22222125EC8D00BB61FF /* LaunchScreen.storyboard in Resources */, CB811D422242C2C6001F270B /* demo.js in Resources */, CBE2FA4022209DE200C7E9C9 /* jquery.min.js in Resources */, @@ -256,7 +252,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.4; + IPHONEOS_DEPLOYMENT_TARGET = 12.2; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -310,7 +306,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.4; + IPHONEOS_DEPLOYMENT_TARGET = 12.2; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -327,7 +323,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = U3HDXSVPJM; INFOPLIST_FILE = Strokes/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.2; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -348,7 +344,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = U3HDXSVPJM; INFOPLIST_FILE = Strokes/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 12.2; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Strokes/Base.lproj/LaunchScreen.storyboard b/Strokes/Base.lproj/LaunchScreen.storyboard index 425bcf0..170d501 100644 --- a/Strokes/Base.lproj/LaunchScreen.storyboard +++ b/Strokes/Base.lproj/LaunchScreen.storyboard @@ -1,11 +1,11 @@ - + - + @@ -18,7 +18,7 @@ - + @@ -32,25 +32,15 @@ - - - - - - - - - - diff --git a/Strokes/Base.lproj/Main.storyboard b/Strokes/Base.lproj/Main.storyboard index d3d7b4e..1bd0921 100644 --- a/Strokes/Base.lproj/Main.storyboard +++ b/Strokes/Base.lproj/Main.storyboard @@ -1,16 +1,16 @@ - + - + - + @@ -18,14 +18,6 @@ - - - - - - - - @@ -55,25 +47,32 @@ + + + + + + + + + + + + + - - - - + - - - @@ -84,7 +83,4 @@ - - - diff --git a/Strokes/Info.plist b/Strokes/Info.plist index 5bed729..8bb29cf 100644 --- a/Strokes/Info.plist +++ b/Strokes/Info.plist @@ -2,13 +2,6 @@ - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - LSApplicationCategoryType - CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -27,8 +20,15 @@ 1.0 CFBundleVersion 1 + LSApplicationCategoryType + LSRequiresIPhoneOS + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -42,8 +42,6 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad diff --git a/Strokes/web/demo.js b/Strokes/web/demo.js index 3ff99b2..22ff9ea 100644 --- a/Strokes/web/demo.js +++ b/Strokes/web/demo.js @@ -1,43 +1,17 @@ -//var animationWriter; var quizWriter; var character = '水'; -var isCharVisible; -var isOutlineVisible; function changeCharacter(newCharacter) { - /* - quizWriter = HanziWriter.create('quiz-target', newCharacter, { - width: 300, - height: 300, - showOutline: true, - showCharacter: false, - showHintAfterMisses: 1 - }); - */ - quizWriter.setCharacter(newCharacter); quizWriter.quiz(); window.quizWriter = quizWriter; } function updateCharacter() { - //$('#animation-target').html(''); - //$('#quiz-target').html(''); - - /* - animationWriter = HanziWriter.create('animation-target', character, { - width: 300, - height: 300, - showOutline: shouldShowOutline('animation'), - showCharacter: false - }); - */ - quizWriter = HanziWriter.create('quiz-target', character, { width: 300, height: 300, showOutline: true, - //showOutline: shouldShowOutline('quiz'), showCharacter: true, showHintAfterMisses: 1 }); @@ -47,23 +21,6 @@ function updateCharacter() { window.quizWriter = quizWriter; } -function shouldShowOutline(demoType) { - return $('#' + demoType + '-show-outline').prop('checked'); -} - $(function() { updateCharacter(); - - $('.js-char-form').on('submit', function(evt) { - evt.preventDefault(); - updateCharacter(); - }); - - - /* - $('#quiz-show-outline').on('click', function() { - var method = shouldShowOutline('quiz') ? 'showOutline' : 'hideOutline'; - quizWriter[method](); - }); - */ }); diff --git a/Strokes/web/index.html b/Strokes/web/index.html index eeb5e56..c90b434 100644 --- a/Strokes/web/index.html +++ b/Strokes/web/index.html @@ -6,34 +6,11 @@ Strokes - - - + +
-
- -
diff --git a/Strokes/web/style.css b/Strokes/web/style.css deleted file mode 100644 index 04e568b..0000000 --- a/Strokes/web/style.css +++ /dev/null @@ -1,149 +0,0 @@ -/* TODO: Shrink this. */ -.demo-target { - background: white; - clear: both; - width: 300px; - height: 300px; - margin: 0 auto -} - -.demo { - text-align: center -} - -.demo-divider { - margin: 40px 0 -} - -.demo-docs-link { - display: inline-block; - margin-top: 20px -} - -.char-select-form { - margin-bottom: 20px -} - -.demo-controls { - border: 1px solid #AAA; - margin: 10px auto; - padding: 10px; - width: 300px -} - -.demo-controls .btn { - margin-left: 20px -} - -.character-select { - width: auto !important; - display: inline-block !important -} - -.docs h1 { - margin-top: 0; - padding-top: 50px -} - -.docs h1:first-child { - padding-top: 0 -} - -.docs h4, -.docs h3, -.docs h2 { - margin-top: 0; - padding-top: 30px -} - -.docs p { - margin-top: 10px -} - -.docs .affix { - position: fixed !important -} - -.docs .toc { - width: 263px; - top: 5px -} - -@media (max-width: 1200px) { - .docs .toc { - width: 200px - } -} - -@media (max-width: 992px) { - .docs .toc { - width: 165px - } -} - -@media (max-width: 768px) { - .docs .toc { - display: none - } -} - -.docs .toc .nav a { - padding: 3px 10px; - font-weight: bold -} - -.docs .toc .nav li.active>a { - border-left: 2px solid #337ab7; - padding-left: 8px; - font-weight: bold -} - -.docs .toc .nav .nav a { - font-size: 12px; - font-weight: normal; - padding-left: 20px -} - -.docs .toc .nav .nav li.active>a { - padding-left: 18px -} - -.docs .content { - border-left: 1px solid #eee -} - -.inline-demo { - border: 1px solid #CCC; - width: 102px; - height: 102px; - margin-right: 5px; - flex-shrink: 0 -} - -.medium-demo { - width: 150px; - height: 150px -} - -.inline-demo-console { - font-family: monospace; - font-size: 10px; - border: 1px solid #CCC; - width: 400px; - height: 150px; - padding-left: 5px; - overflow-y: scroll -} - -.inline-demo-btn { - width: 100px; - margin-top: 3px -} - -.inline-demo-flex { - display: flex -} - -.license-block { - margin: 50px 0 -}