Skip to content

Commit d314237

Browse files
htinlinnhtinlinn
authored
Merge pull request #16 from prolificinteractive/chore/dynamic_framework
[Chore] Dynamic Framework
2 parents 8f0977f + e2bf800 commit d314237

File tree

68 files changed

+3224
-828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+3224
-828
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
3.1

‎.travis.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode8.3
33
podfile: Example/Podfile
44

55
before_install:
66
- gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
77

88
script:
9-
- set -o pipefail && xcodebuild test -workspace Example/Marker.xcworkspace -scheme Marker-Example -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty
10-
- pod lib lint
9+
- set -o pipefail && xcodebuild test -project Marker/Marker.xcodeproj -scheme Marker-iOS -destination 'name=iPhone 7,OS=10.3.1' | xcpretty
10+
- set -o pipefail && xcodebuild test -project Marker/Marker.xcodeproj -scheme Marker-macOS -destination 'arch=x86_64' | xcpretty
11+
- set -o pipefail && xcodebuild test -project Marker/Marker.xcodeproj -scheme Marker-tvOS -destination 'name=Apple TV 1080p,OS=10.2' | xcpretty
12+
- pod lib lint

Example/Marker/AppDelegate.swift renamed to Example/Marker-Example-iOS/AppDelegate.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// AppDelegate.swift
3-
// Marker
3+
// Marker-Example-iOS
44
//
55
// Created by Htin Linn on 05/04/2016.
66
// Copyright © 2016 Prolific Interactive. All rights reserved.
@@ -12,23 +12,23 @@ import UIKit
1212
class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
// MARK: - Properties
15-
15+
1616
var window: UIWindow?
17-
17+
1818
// MARK: - Private properties
19-
19+
2020
private let theme = AppTheme()
2121

2222
// MARK: - Instance functions
23-
23+
2424
func application(_ application: UIApplication,
2525
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
2626
if let viewController = window?.rootViewController as? ViewController {
2727
viewController.theme = theme
2828
}
29-
29+
3030
return true
3131
}
32-
32+
3333
}
3434

Example/Marker/Images.xcassets/AppIcon.appiconset/Contents.json renamed to Example/Marker-Example-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,51 @@
3939
"idiom" : "iphone",
4040
"size" : "60x60",
4141
"scale" : "3x"
42+
},
43+
{
44+
"idiom" : "ipad",
45+
"size" : "20x20",
46+
"scale" : "1x"
47+
},
48+
{
49+
"idiom" : "ipad",
50+
"size" : "20x20",
51+
"scale" : "2x"
52+
},
53+
{
54+
"idiom" : "ipad",
55+
"size" : "29x29",
56+
"scale" : "1x"
57+
},
58+
{
59+
"idiom" : "ipad",
60+
"size" : "29x29",
61+
"scale" : "2x"
62+
},
63+
{
64+
"idiom" : "ipad",
65+
"size" : "40x40",
66+
"scale" : "1x"
67+
},
68+
{
69+
"idiom" : "ipad",
70+
"size" : "40x40",
71+
"scale" : "2x"
72+
},
73+
{
74+
"idiom" : "ipad",
75+
"size" : "76x76",
76+
"scale" : "1x"
77+
},
78+
{
79+
"idiom" : "ipad",
80+
"size" : "76x76",
81+
"scale" : "2x"
82+
},
83+
{
84+
"idiom" : "ipad",
85+
"size" : "83.5x83.5",
86+
"scale" : "2x"
4287
}
4388
],
4489
"info" : {

Example/Marker/Images.xcassets/Contents.json renamed to Example/Marker-Example-iOS/Assets.xcassets/Contents.json

File renamed without changes.

Example/Marker/Images.xcassets/Theme.imageset/Contents.json renamed to Example/Marker-Example-iOS/Assets.xcassets/Theme.imageset/Contents.json

File renamed without changes.

Example/Marker/Images.xcassets/Theme.imageset/Theme.pdf renamed to Example/Marker-Example-iOS/Assets.xcassets/Theme.imageset/Theme.pdf

File renamed without changes.

Example/Marker/Base.lproj/LaunchScreen.xib renamed to Example/Marker-Example-iOS/Base.lproj/LaunchScreen.xib

File renamed without changes.

Example/Marker/Base.lproj/Main.storyboard renamed to Example/Marker-Example-iOS/Base.lproj/Main.storyboard

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
47
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
69
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
10+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
711
</dependencies>
812
<scenes>
913
<!--View Controller-->
1014
<scene sceneID="ufC-wZ-h7g">
1115
<objects>
12-
<viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="Marker_Example" customModuleProvider="target" sceneMemberID="viewController">
16+
<viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="Marker_Example_iOS" customModuleProvider="target" sceneMemberID="viewController">
1317
<layoutGuides>
1418
<viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
1519
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
@@ -27,11 +31,11 @@
2731
<constraint firstAttribute="width" secondItem="b8K-tv-wUh" secondAttribute="height" multiplier="1:1" id="t1T-o2-flr"/>
2832
</constraints>
2933
<fontDescription key="fontDescription" type="system" pointSize="17"/>
30-
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
34+
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
3135
<nil key="highlightedColor"/>
3236
</label>
3337
</subviews>
34-
<color key="backgroundColor" red="1" green="0.42250892709999999" blue="0.20927410739999999" alpha="1" colorSpace="calibratedRGB"/>
38+
<color key="backgroundColor" red="1" green="0.42352941176470588" blue="0.20784313725490194" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
3539
<constraints>
3640
<constraint firstItem="b8K-tv-wUh" firstAttribute="centerX" secondItem="qVE-bI-SP6" secondAttribute="centerX" id="H9J-Yg-OL7"/>
3741
<constraint firstItem="b8K-tv-wUh" firstAttribute="width" relation="lessThanOrEqual" secondItem="qVE-bI-SP6" secondAttribute="width" constant="-60" id="PVr-MG-yQd"/>
@@ -64,7 +68,7 @@
6468
</connections>
6569
</button>
6670
</subviews>
67-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
71+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
6872
<constraints>
6973
<constraint firstAttribute="trailing" secondItem="L8h-84-gv0" secondAttribute="trailing" constant="10" id="01C-nB-5DH"/>
7074
<constraint firstItem="qVE-bI-SP6" firstAttribute="width" secondItem="kh9-bI-dsS" secondAttribute="width" id="3FS-Ey-5uw"/>
@@ -113,7 +117,7 @@
113117
<!--Theme-->
114118
<scene sceneID="ens-aL-JFQ">
115119
<objects>
116-
<viewController storyboardIdentifier="ThemeSettingsViewController" id="BNd-kj-0HA" customClass="ThemeSettingsViewController" customModule="Marker_Example" customModuleProvider="target" sceneMemberID="viewController">
120+
<viewController storyboardIdentifier="ThemeSettingsViewController" id="BNd-kj-0HA" customClass="ThemeSettingsViewController" customModule="Marker_Example_iOS" customModuleProvider="target" sceneMemberID="viewController">
117121
<layoutGuides>
118122
<viewControllerLayoutGuide type="top" id="gw3-pE-4jb"/>
119123
<viewControllerLayoutGuide type="bottom" id="vEc-hC-5Wq"/>
@@ -124,13 +128,13 @@
124128
<subviews>
125129
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="EPN-ha-LIw">
126130
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
127-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
131+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
128132
<prototypes>
129133
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ThemeSettingsTableViewCell" id="ABU-EW-6ca">
130-
<rect key="frame" x="0.0" y="92" width="375" height="44"/>
134+
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
131135
<autoresizingMask key="autoresizingMask"/>
132136
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ABU-EW-6ca" id="Qqd-af-Iq4">
133-
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
137+
<rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
134138
<autoresizingMask key="autoresizingMask"/>
135139
</tableViewCellContentView>
136140
</tableViewCell>
@@ -141,7 +145,7 @@
141145
</connections>
142146
</tableView>
143147
</subviews>
144-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
148+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
145149
<constraints>
146150
<constraint firstAttribute="trailing" secondItem="EPN-ha-LIw" secondAttribute="trailing" id="X4J-03-pBV"/>
147151
<constraint firstItem="vEc-hC-5Wq" firstAttribute="top" secondItem="EPN-ha-LIw" secondAttribute="bottom" id="Y9q-KP-OYU"/>

Example/Marker/Info.plist renamed to Example/Marker-Example-iOS/Info.plist

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
1818
<string>1.0</string>
19-
<key>CFBundleSignature</key>
20-
<string>????</string>
2119
<key>CFBundleVersion</key>
2220
<string>1</string>
2321
<key>LSRequiresIPhoneOS</key>
@@ -36,5 +34,12 @@
3634
<array>
3735
<string>UIInterfaceOrientationPortrait</string>
3836
</array>
37+
<key>UISupportedInterfaceOrientations~ipad</key>
38+
<array>
39+
<string>UIInterfaceOrientationPortrait</string>
40+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
41+
<string>UIInterfaceOrientationLandscapeLeft</string>
42+
<string>UIInterfaceOrientationLandscapeRight</string>
43+
</array>
3944
</dict>
4045
</plist>

0 commit comments

Comments
 (0)