Skip to content

Commit 31209a8

Browse files
committed
clean up demo with new app_resources
1 parent 2cb3100 commit 31209a8

Some content is hidden

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

62 files changed

+70
-94
lines changed

demo/app/App_Resources/Android/app.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,12 @@
22

33
// Uncomment to add recyclerview-v7 dependency
44
//dependencies {
5-
// compile 'com.android.support:recyclerview-v7:+'
5+
// implementation 'com.android.support:recyclerview-v7:+'
66
//}
77

88
android {
99
defaultConfig {
1010
generatedDensities = []
11-
applicationId = "org.nativescript.demo"
12-
13-
//override supported platforms
14-
// ndk {
15-
// abiFilters.clear()
16-
// abiFilters "armeabi-v7a"
17-
// }
18-
1911
}
2012
aaptOptions {
2113
additionalParameters "--no-version-vectors"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

demo/app/App_Resources/Android/drawable/checkbox_grey.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

demo/app/App_Resources/Android/values/styles.xml renamed to demo/app/App_Resources/Android/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<style name="AppTheme" parent="AppThemeBase">
3333
</style>
3434

35-
<!-- theme for actioon-bar -->
35+
<!-- theme for action-bar -->
3636
<style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
3737
<item name="android:background">@color/ns_primary</item>
3838
<item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>

demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,6 @@
3030
"filename" : "[email protected]",
3131
"scale" : "3x"
3232
},
33-
{
34-
"size" : "57x57",
35-
"idiom" : "iphone",
36-
"filename" : "icon-57.png",
37-
"scale" : "1x"
38-
},
39-
{
40-
"size" : "57x57",
41-
"idiom" : "iphone",
42-
"filename" : "[email protected]",
43-
"scale" : "2x"
44-
},
4533
{
4634
"size" : "60x60",
4735
"idiom" : "iphone",
@@ -78,30 +66,6 @@
7866
"filename" : "[email protected]",
7967
"scale" : "2x"
8068
},
81-
{
82-
"size" : "50x50",
83-
"idiom" : "ipad",
84-
"filename" : "icon-50.png",
85-
"scale" : "1x"
86-
},
87-
{
88-
"size" : "50x50",
89-
"idiom" : "ipad",
90-
"filename" : "[email protected]",
91-
"scale" : "2x"
92-
},
93-
{
94-
"size" : "72x72",
95-
"idiom" : "ipad",
96-
"filename" : "icon-72.png",
97-
"scale" : "1x"
98-
},
99-
{
100-
"size" : "72x72",
101-
"idiom" : "ipad",
102-
"filename" : "[email protected]",
103-
"scale" : "2x"
104-
},
10569
{
10670
"size" : "76x76",
10771
"idiom" : "ipad",
@@ -119,7 +83,13 @@
11983
"idiom" : "ipad",
12084
"filename" : "[email protected]",
12185
"scale" : "2x"
122-
}
86+
},
87+
{
88+
"size" : "1024x1024",
89+
"idiom" : "ios-marketing",
90+
"filename" : "icon-1024.png",
91+
"scale" : "1x"
92+
}
12393
],
12494
"info" : {
12595
"version" : 1,
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
{
22
"images" : [
3+
{
4+
"extent" : "full-screen",
5+
"idiom" : "iphone",
6+
"subtype" : "2436h",
7+
"filename" : "Default-1125h.png",
8+
"minimum-system-version" : "11.0",
9+
"orientation" : "portrait",
10+
"scale" : "3x"
11+
},
12+
{
13+
"orientation" : "landscape",
14+
"idiom" : "iphone",
15+
"extent" : "full-screen",
16+
"filename" : "Default-Landscape-X.png",
17+
"minimum-system-version" : "11.0",
18+
"subtype" : "2436h",
19+
"scale" : "3x"
20+
},
321
{
422
"extent" : "full-screen",
523
"idiom" : "iphone",
Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina5_9" 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="13772"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
610
</dependencies>
711
<scenes>
812
<!--View Controller-->
@@ -14,36 +18,36 @@
1418
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
1519
</layoutGuides>
1620
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
17-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
21+
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
1822
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1923
<subviews>
2024
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreen.AspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="wtH-rr-YfP">
21-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
25+
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
2226
</imageView>
2327
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreen.Center" translatesAutoresizingMaskIntoConstraints="NO" id="s1z-aa-wYv">
24-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
28+
<rect key="frame" x="0.0" y="150" width="375" height="512"/>
2529
</imageView>
2630
</subviews>
27-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
31+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2832
<constraints>
29-
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="wtH-rr-YfP" secondAttribute="bottom" id="5FO-pR-qKb"/>
33+
<constraint firstAttribute="trailing" secondItem="s1z-aa-wYv" secondAttribute="trailing" id="4Rf-kf-vql"/>
34+
<constraint firstAttribute="bottom" secondItem="wtH-rr-YfP" secondAttribute="bottom" id="5CS-At-4ka"/>
3035
<constraint firstItem="wtH-rr-YfP" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="Awn-b8-xf1"/>
31-
<constraint firstItem="s1z-aa-wYv" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="CiP-yX-1sg"/>
36+
<constraint firstItem="s1z-aa-wYv" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="BpJ-vb-eKA"/>
37+
<constraint firstItem="s1z-aa-wYv" firstAttribute="trailing" secondItem="wtH-rr-YfP" secondAttribute="trailing" id="QIM-7J-OZz"/>
3238
<constraint firstAttribute="trailing" secondItem="wtH-rr-YfP" secondAttribute="trailing" id="RXg-rW-UK8"/>
33-
<constraint firstItem="s1z-aa-wYv" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="agC-wa-3bd"/>
39+
<constraint firstItem="s1z-aa-wYv" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="Rcp-LG-48z"/>
3440
<constraint firstItem="wtH-rr-YfP" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="cch-8E-tYu"/>
35-
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="s1z-aa-wYv" secondAttribute="bottom" id="fNc-Ro-KaG"/>
36-
<constraint firstAttribute="trailing" secondItem="s1z-aa-wYv" secondAttribute="trailing" id="qoI-OC-Zk7"/>
3741
</constraints>
3842
</view>
3943
</viewController>
4044
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
4145
</objects>
42-
<point key="canvasLocation" x="510" y="238"/>
46+
<point key="canvasLocation" x="509.60000000000002" y="237.93103448275863"/>
4347
</scene>
4448
</scenes>
4549
<resources>
4650
<image name="LaunchScreen.AspectFill" width="768" height="1024"/>
47-
<image name="LaunchScreen.Center" width="40" height="40"/>
51+
<image name="LaunchScreen.Center" width="384" height="512"/>
4852
</resources>
4953
</document>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// You can add custom settings here
22
// for example you can uncomment the following line to force distribution code signing
33
// CODE_SIGN_IDENTITY = iPhone Distribution
4-
// To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
4+
// To build for device with XCode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
55
// DEVELOPMENT_TEAM = YOUR_TEAM_ID;
66
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
77
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;

demo/package.json

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
{
2-
"nativescript": {
3-
"id": "org.nativescript.demo",
4-
"tns-android": {
5-
"version": "3.0.1"
6-
},
7-
"tns-ios": {
8-
"version": "3.0.1"
9-
}
10-
},
11-
"dependencies": {
12-
"nativescript-checkbox": "file:..",
13-
"tns-core-modules": "^3.0.0"
14-
},
15-
"devDependencies": {
16-
"babel-traverse": "6.24.1",
17-
"babel-types": "6.24.1",
18-
"babylon": "6.17.2",
19-
"filewalker": "0.1.3",
20-
"lazy": "1.0.11",
21-
"nativescript-dev-typescript": "^0.4.5",
22-
"typescript": "^2.2.0",
23-
"tns-platform-declarations": "^3.0.0"
24-
}
25-
}
2+
"nativescript": {
3+
"id": "org.nativescript.demo",
4+
"tns-android": {
5+
"version": "5.0.0"
6+
}
7+
},
8+
"dependencies": {
9+
"nativescript-checkbox": "file:../src",
10+
"tns-core-modules": "^5.0.2"
11+
},
12+
"devDependencies": {
13+
"babel-traverse": "6.24.1",
14+
"babel-types": "6.24.1",
15+
"babylon": "6.17.2",
16+
"filewalker": "0.1.3",
17+
"lazy": "1.0.11",
18+
"nativescript-dev-typescript": "^0.7.4",
19+
"typescript": "^2.8.2",
20+
"tns-platform-declarations": "^5.0.2"
21+
}
22+
}

demo/tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"*": [
2020
"./node_modules/tns-core-modules/*",
2121
"./node_modules/*"
22+
],
23+
"~/*": [
24+
"app/*"
2225
]
2326
}
2427
},

0 commit comments

Comments
 (0)