Skip to content

Commit

Permalink
Merge branch 'release/1.1.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dlackty committed Jul 4, 2020
2 parents 2d46b84 + e183207 commit 1e78947
Show file tree
Hide file tree
Showing 14 changed files with 571 additions and 23 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Develop Branch

## v1.1.1

* Update pods [#18](https://github.com/polydice/iCook-tvOS/pull/18)
* Update fastlane and gems [#19](https://github.com/polydice/iCook-tvOS/pull/19)

Expand Down
34 changes: 34 additions & 0 deletions Demo-Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>FacebookAutoInitEnabled</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>DemoLaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>
</dict>
</plist>
338 changes: 331 additions & 7 deletions iCookTV.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

78 changes: 78 additions & 0 deletions iCookTV.xcodeproj/xcshareddata/xcschemes/iCookTV Demo.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1140"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E327714624759E15002F06FE"
BuildableName = "iCookTV.app"
BlueprintName = "iCookTV Demo"
ReferencedContainer = "container:iCookTV.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E327714624759E15002F06FE"
BuildableName = "iCookTV.app"
BlueprintName = "iCookTV Demo"
ReferencedContainer = "container:iCookTV.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E327714624759E15002F06FE"
BuildableName = "iCookTV.app"
BlueprintName = "iCookTV Demo"
ReferencedContainer = "container:iCookTV.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
8 changes: 8 additions & 0 deletions iCookTV/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return true
}

func applicationWillResignActive(_ application: UIApplication) {
#if DEMO
// Do not store any histroy for demo version
HistoryManager.deleteCache()
exit(1)
#endif
}

// MARK: - Private Methods

private func endBackgroundTask(inApplication application: UIApplication) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "LaunchScreen3_Demo.png",
"idiom" : "tv",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions iCookTV/Assets.xcassets/LaunchScreenImage.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"images" : [
{
"idiom" : "tv",
"filename" : "LaunchScreen3.png",
"idiom" : "tv",
"scale" : "1x"
},
{
"idiom" : "tv",
"filename" : "[email protected]",
"idiom" : "tv",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true
}
}
}
10 changes: 9 additions & 1 deletion iCookTV/Controllers/LaunchViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ class LaunchViewController: UIViewController, DataFetching {

private lazy var launchImageView: UIImageView = {
let _imageView = UIImageView()
_imageView.image = UIImage(named: "launchImage")
#if DEMO
_imageView.image = UIImage(named: "DemoLaunchScreenImage")
#else
_imageView.image = UIImage(named: "LaunchScreenImage")
#endif
_imageView.contentMode = .scaleAspectFill
return _imageView
}()
Expand Down Expand Up @@ -122,6 +126,10 @@ class LaunchViewController: UIViewController, DataFetching {
self.view.layoutIfNeeded()
}
}, completion: { _ in
#if DEMO
Thread.sleep(forTimeInterval: 2)
#endif

self.semaphore.signal()
self.isAnimating = false
})
Expand Down
39 changes: 39 additions & 0 deletions iCookTV/DemoLaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="16096" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="appleTV" appearance="light"/>
<dependencies>
<deployment identifier="tvOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="T11-7k-ZFK">
<objects>
<viewController id="o2Z-tj-q4Z" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="aj8-JA-vsi"/>
<viewControllerLayoutGuide type="bottom" id="IPC-ga-M4b"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="yQo-ID-dHF">
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="DemoLaunchScreenImage" translatesAutoresizingMaskIntoConstraints="NO" id="QBq-Zf-f0I">
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="JGf-KR-8p8"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="BQA-et-EWL" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-24" y="-13"/>
</scene>
</scenes>
<resources>
<image name="DemoLaunchScreenImage" width="1920" height="1080"/>
</resources>
</document>
20 changes: 10 additions & 10 deletions iCookTV/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="15505" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="0Cr-NF-veV">
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="16096" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="appleTV" appearance="light"/>
<dependencies>
<deployment identifier="tvOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="j9w-Ee-9dV">
<scene sceneID="T11-7k-ZFK">
<objects>
<viewController id="0Cr-NF-veV" sceneMemberID="viewController">
<viewController id="o2Z-tj-q4Z" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="VDO-rO-hJG"/>
<viewControllerLayoutGuide type="bottom" id="0wA-Ra-198"/>
<viewControllerLayoutGuide type="top" id="aj8-JA-vsi"/>
<viewControllerLayoutGuide type="bottom" id="IPC-ga-M4b"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="JXV-3K-VtU">
<view key="view" contentMode="scaleToFill" id="yQo-ID-dHF">
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LaunchScreenImage" translatesAutoresizingMaskIntoConstraints="NO" id="eLN-qh-Mx8">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LaunchScreenImage" translatesAutoresizingMaskIntoConstraints="NO" id="QBq-Zf-f0I">
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="tbx-tj-Gsg"/>
<viewLayoutGuide key="safeArea" id="JGf-KR-8p8"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="rCi-BC-dVM" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="BQA-et-EWL" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-24" y="-13"/>
</scene>
Expand Down
3 changes: 3 additions & 0 deletions iCookTV/zh-Hans.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/* Localized versions of Info.plist keys */

"CFBundleDisplayName" = "爱料理";
31 changes: 31 additions & 0 deletions iCookTV/zh-Hans.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
Localizable.strings
iCookTV

Created by Ben on 09/04/2016.
Copyright © 2016 Polydice, Inc. All rights reserved.
*/

"icook-tv" = "爱料理 TV";

"history" = "浏览纪录";

"home" = "首页";

"retry" = "再试一次";

"ok" = "OK";

"launch-screen-upper-tagline" = "爱料理食谱社群";

"launch-screen-lower-tagline" = "icook.tw";

"no-history-found" = "先看些视频吧!";

"no-video-found" = "目前没有视频";

"error-title" = "发生错误\n";

"video-error" = "视频目前无法播放,请稍候再试";

"contact-info" = "如果问题持续发生,请来信 [email protected] 告诉我们,谢谢";

0 comments on commit 1e78947

Please sign in to comment.