Skip to content

Commit 1e09842

Browse files
jawa-the-huttjawa-the-hutt
authored
Merge branch 'master' into dev
2 parents f463b71 + 5500c4e commit 1e09842

File tree

171 files changed

+3119
-1
lines changed

Some content is hidden

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

171 files changed

+3119
-1
lines changed

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App.android.vue

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<%_ if (!rootOptions.router) { _%>
2+
<%# This code is the same as having a router. #%>
3+
<%# Setting this space aside for future possible use in the template #%>
4+
<template>
5+
<Page>
6+
<ActionBar :title="navbarTitle"/>
7+
<GridLayout rows="auto, auto">
8+
<Button text="Home" @tap="goToHomePage" row="0"/>
9+
<Button text="About" @tap="goToAboutPage" row="1"/>
10+
</GridLayout>
11+
</Page>
12+
</template>
13+
<script>
14+
// ~ is an alias to /src
15+
import Home from '~/views/Home';
16+
import About from '~/views/About';
17+
18+
export default {
19+
20+
data() {
21+
return {
22+
navbarTitle: 'App.android.vue',
23+
}
24+
},
25+
methods: {
26+
goToHomePage() {
27+
this.$navigateTo(Home);
28+
},
29+
goToAboutPage() {
30+
this.$navigateTo(About);
31+
}
32+
}
33+
}
34+
35+
</script>
36+
<%_ } else { _%>
37+
<%# This code is the same as not having a router. #%>
38+
<%# See note above #%>
39+
<template>
40+
<Page>
41+
<ActionBar :title="navbarTitle"/>
42+
<GridLayout rows="auto, auto">
43+
<Button text="Home" @tap="goToHomePage" row="0"/>
44+
<Button text="About" @tap="goToAboutPage" row="1"/>
45+
</GridLayout>
46+
</Page>
47+
</template>
48+
<script>
49+
// ~ is an alias to /src
50+
import Home from '~/views/Home';
51+
import About from '~/views/About';
52+
53+
export default {
54+
55+
data() {
56+
return {
57+
navbarTitle: 'App.android.vue',
58+
}
59+
},
60+
methods: {
61+
goToHomePage() {
62+
this.$navigateTo(Home);
63+
},
64+
goToAboutPage() {
65+
this.$navigateTo(About);
66+
}
67+
}
68+
}
69+
70+
</script>
71+
<%_ } _%>
72+
73+
<%_ if (rootOptions.cssPreprocessor !== 'stylus') { _%>
74+
<style<%-
75+
rootOptions.cssPreprocessor
76+
? ` lang="${
77+
rootOptions.cssPreprocessor === 'sass'
78+
? 'scss'
79+
: rootOptions.cssPreprocessor
80+
}"`
81+
: ``
82+
%>>
83+
ActionBar {
84+
color: #42b983;
85+
}
86+
</style>
87+
<%_ } else { _%>
88+
<style lang="stylus">
89+
ActionBar
90+
color: #42b983
91+
</style>
92+
<%_ } _%>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App.ios.vue

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<%_ if (!rootOptions.router) { _%>
2+
<%# This code is the same as having a router. #%>
3+
<%# Setting this space aside for future possible use in the template #%>
4+
<template>
5+
<Page>
6+
<ActionBar :title="navbarTitle"/>
7+
<GridLayout rows="auto, auto">
8+
<Button text="Home" @tap="goToHomePage" row="0"/>
9+
<Button text="About" @tap="goToAboutPage" row="1"/>
10+
</GridLayout>
11+
</Page>
12+
</template>
13+
<script>
14+
// ~ is an alias to /src
15+
import Home from '~/views/Home';
16+
import About from '~/views/About';
17+
18+
export default {
19+
20+
data() {
21+
return {
22+
navbarTitle: 'App.ios.vue',
23+
}
24+
},
25+
methods: {
26+
goToHomePage() {
27+
this.$navigateTo(Home);
28+
},
29+
goToAboutPage() {
30+
this.$navigateTo(About);
31+
}
32+
}
33+
}
34+
35+
</script>
36+
<%_ } else { _%>
37+
<%# This code is the same as not having a router. #%>
38+
<%# See note above #%>
39+
<template>
40+
<Page>
41+
<ActionBar :title="navbarTitle"/>
42+
<GridLayout rows="auto, auto">
43+
<Button text="Home" @tap="goToHomePage" row="0"/>
44+
<Button text="About" @tap="goToAboutPage" row="1"/>
45+
</GridLayout>
46+
</Page>
47+
</template>
48+
<script>
49+
// ~ is an alias to /src
50+
import Home from '~/views/Home';
51+
import About from '~/views/About';
52+
53+
export default {
54+
55+
data() {
56+
return {
57+
navbarTitle: 'App.ios.vue',
58+
}
59+
},
60+
methods: {
61+
goToHomePage() {
62+
this.$navigateTo(Home);
63+
},
64+
goToAboutPage() {
65+
this.$navigateTo(About);
66+
}
67+
}
68+
}
69+
70+
</script>
71+
<%_ } _%>
72+
73+
<%_ if (rootOptions.cssPreprocessor !== 'stylus') { _%>
74+
<style<%-
75+
rootOptions.cssPreprocessor
76+
? ` lang="${
77+
rootOptions.cssPreprocessor === 'sass'
78+
? 'scss'
79+
: rootOptions.cssPreprocessor
80+
}"`
81+
: ``
82+
%>>
83+
ActionBar {
84+
color: #42b983;
85+
}
86+
</style>
87+
<%_ } else { _%>
88+
<style lang="stylus">
89+
ActionBar
90+
color: #42b983
91+
</style>
92+
<%_ } _%>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App.native.vue

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<%_ if (!rootOptions.router) { _%>
2+
<%# This code is the same as having a router. #%>
3+
<%# Setting this space aside for future possible use in the template #%>
4+
<template>
5+
<Page>
6+
<ActionBar :title="navbarTitle"/>
7+
<GridLayout rows="auto, auto">
8+
<Button text="Home" @tap="goToHomePage" row="0"/>
9+
<Button text="About" @tap="goToAboutPage" row="1"/>
10+
</GridLayout>
11+
</Page>
12+
</template>
13+
<script>
14+
// ~ is an alias to /src
15+
import Home from '~/views/Home';
16+
import About from '~/views/About';
17+
18+
export default {
19+
20+
data() {
21+
return {
22+
navbarTitle: 'App.native.vue',
23+
}
24+
},
25+
methods: {
26+
goToHomePage() {
27+
this.$navigateTo(Home);
28+
},
29+
goToAboutPage() {
30+
this.$navigateTo(About);
31+
}
32+
}
33+
}
34+
35+
</script>
36+
<%_ } else { _%>
37+
<%# This code is the same as not having a router. #%>
38+
<%# See note above #%>
39+
<template>
40+
<Page>
41+
<ActionBar :title="navbarTitle"/>
42+
<GridLayout rows="auto, auto">
43+
<Button text="Home" @tap="goToHomePage" row="0"/>
44+
<Button text="About" @tap="goToAboutPage" row="1"/>
45+
</GridLayout>
46+
</Page>
47+
</template>
48+
<script>
49+
// ~ is an alias to /src
50+
import Home from '~/views/Home';
51+
import About from '~/views/About';
52+
53+
export default {
54+
55+
data() {
56+
return {
57+
navbarTitle: 'App.native.vue',
58+
}
59+
},
60+
methods: {
61+
goToHomePage() {
62+
this.$navigateTo(Home);
63+
},
64+
goToAboutPage() {
65+
this.$navigateTo(About);
66+
}
67+
}
68+
}
69+
70+
</script>
71+
<%_ } _%>
72+
73+
<%_ if (rootOptions.cssPreprocessor !== 'stylus') { _%>
74+
<style<%-
75+
rootOptions.cssPreprocessor
76+
? ` lang="${
77+
rootOptions.cssPreprocessor === 'sass'
78+
? 'scss'
79+
: rootOptions.cssPreprocessor
80+
}"`
81+
: ``
82+
%>>
83+
ActionBar {
84+
color: #42b983;
85+
}
86+
</style>
87+
<%_ } else { _%>
88+
<style lang="stylus">
89+
ActionBar
90+
color: #42b983
91+
</style>
92+
<%_ } _%>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/AndroidManifest.xml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest
3+
xmlns:android="http://schemas.android.com/apk/res/android" package="__PACKAGE__" android:versionCode="<%- applicationAndroidVersionCode %>" android:versionName="<%- applicationVersion %>">
4+
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" />
5+
<uses-sdk android:minSdkVersion="17" android:targetSdkVersion="__APILEVEL__" />
6+
<uses-permission android:name="android.permission.INTERNET" />
7+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
8+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
9+
<application android:name="com.tns.NativeScriptApplication" android:allowBackup="true" android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@style/AppTheme">
10+
<activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/LaunchScreenTheme">
11+
<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
12+
<intent-filter>
13+
<action android:name="android.intent.action.MAIN" />
14+
<category android:name="android.intent.category.LAUNCHER" />
15+
</intent-filter>
16+
</activity>
17+
<activity android:name="com.tns.ErrorReportActivity" />
18+
</application>
19+
</manifest>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/app.gradle

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Add your native dependencies here:
2+
3+
android {
4+
defaultConfig {
5+
generatedDensities = []
6+
applicationId = "__PACKAGE__"
7+
}
8+
aaptOptions {
9+
additionalParameters "--no-version-vectors"
10+
}
11+
}

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-hdpi/background.png

5.34 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-hdpi/icon.png

6.79 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-hdpi/logo.png

8.74 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-ldpi/background.png

1.57 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-ldpi/icon.png

2.58 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-ldpi/logo.png

3.1 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-mdpi/background.png

2.17 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-mdpi/icon.png

3.35 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-mdpi/logo.png

3.58 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-nodpi/splash_screen.xml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="fill">
2+
<item>
3+
<bitmap android:gravity="fill" android:src="@drawable/background" />
4+
</item>
5+
<item>
6+
<bitmap android:gravity="center" android:src="@drawable/logo" />
7+
</item>
8+
</layer-list>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xhdpi/background.png

9.72 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xhdpi/icon.png

11.8 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xhdpi/logo.png

15 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xxhdpi/background.png

15.3 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xxhdpi/icon.png

14.3 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xxhdpi/logo.png

19.9 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xxxhdpi/background.png

21.9 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xxxhdpi/icon.png

19 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/drawable-xxxhdpi/logo.png

26.2 KB
Loading

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/values-v21/colors.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="ns_accent">#3d5afe</color>
4+
</resources>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/values-v21/strings.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name"><%- applicationName %></string>
4+
<string name="title_activity_kimera"><%- applicationName %></string>
5+
</resources>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/values-v21/styles.xml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<!-- Application theme -->
5+
<style name="AppTheme" parent="AppThemeBase">
6+
<item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
7+
<item name="android:timePickerStyle">@style/SpinnerTimePicker</item>
8+
</style>
9+
10+
<!-- Default style for DatePicker - in spinner mode -->
11+
<style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
12+
<item name="android:datePickerMode">spinner</item>
13+
</style>
14+
15+
<!-- Default style for TimePicker - in spinner mode -->
16+
<style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
17+
<item name="android:timePickerMode">spinner</item>
18+
</style>
19+
20+
<style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
21+
<item name="android:elevation">4dp</item>
22+
</style>
23+
</resources>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/values/colors.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="ns_primary">#F5F5F5</color>
4+
<color name="ns_primaryDark">#757575</color>
5+
<color name="ns_accent">#33B5E5</color>
6+
<color name="ns_blue">#272734</color>
7+
</resources>

Diff for: ‎generator/templates/simple/with-nvw/existing/example/app/App_Resources/Android/values/strings.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name"><%- applicationName %></string>
4+
<string name="title_activity_kimera"><%- applicationName %></string>
5+
</resources>

0 commit comments

Comments
 (0)