Skip to content

Commit 0ed6fc0

Browse files
committed
test: demo app fix
1 parent 4335aa4 commit 0ed6fc0

Some content is hidden

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

75 files changed

+180
-385
lines changed

Diff for: demo_vue/app/App_Resources/Android/app.gradle

100644100755
+16-32
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,20 @@
1-
project.ext.supportVersion = '28.0.0'
2-
project.ext.buildToolsVersion = '28.0.3'
3-
project.ext.compileSdk = 28
4-
project.ext.targetSdk = 28
1+
// Add your native dependencies here:
52

6-
android {
7-
compileSdkVersion 28
8-
project.ext {
9-
supportVersion = '28.0.0'
10-
}
11-
defaultConfig {
12-
ndk {
13-
abiFilters.clear()
14-
}
15-
targetSdkVersion = 28
16-
applicationId = "com.akylas.nativescript.cartodemo"
17-
}
18-
aaptOptions {
19-
additionalParameters "--no-version-vectors"
20-
}
21-
}
22-
23-
def settingsGradlePath
3+
// Uncomment to add recyclerview-v7 dependency
4+
//dependencies {
5+
// implementation 'com.android.support:recyclerview-v7:+'
6+
//}
247

25-
if(project.hasProperty("appResourcesPath")){
26-
settingsGradlePath = "$project.appResourcesPath/Android/settings.gradle";
27-
} else {
28-
settingsGradlePath = "$rootDir/../../app/App_Resources/Android/settings.gradle";
29-
}
30-
31-
def settingsGradleFile = new File(settingsGradlePath);
8+
// If you want to add something to be applied before applying plugins' include.gradle files
9+
// e.g. project.ext.googlePlayServicesVersion = "15.0.1"
10+
// create a file named before-plugins.gradle in the current directory and place it there
3211

33-
if(settingsGradleFile.exists())
34-
{
35-
apply from: settingsGradleFile;
12+
android {
13+
defaultConfig {
14+
minSdkVersion 17
15+
generatedDensities = []
16+
}
17+
aaptOptions {
18+
additionalParameters "--no-version-vectors"
19+
}
3620
}

Diff for: demo_vue/app/App_Resources/Android/settings.gradle

-51
This file was deleted.

Diff for: demo_vue/app/App_Resources/Android/settings.json

-1
This file was deleted.

Diff for: demo_vue/app/App_Resources/Android/src/main/AndroidManifest.xml

100644100755
+38-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,39 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
xmlns:android="http://schemas.android.com/apk/res/android" package="__PACKAGE__" android:versionCode="10000" android:versionName="1.0.0">
4-
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" />
5-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="__APILEVEL__" />
6-
<uses-feature
7-
android:glEsVersion="0x00020000"
8-
android:required="true"/>
9-
<uses-permission android:name="android.permission.INTERNET" />
10-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
11-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
12-
<application android:name="com.tns.NativeScriptApplication" android:allowBackup="true" android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@style/AppTheme" android:networkSecurityConfig="@xml/network_security_config" android:hardwareAccelerated="true">
13-
<activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/LaunchScreenTheme" android:screenOrientation="sensor">
14-
<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
15-
<intent-filter>
16-
<action android:name="android.intent.action.MAIN" />
17-
<category android:name="android.intent.category.LAUNCHER" />
18-
</intent-filter>
19-
</activity>
20-
<activity android:name="com.tns.ErrorReportActivity" />
21-
</application>
22-
</manifest>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="__PACKAGE__"
4+
android:versionCode="10000"
5+
android:versionName="1.0">
6+
7+
<supports-screens
8+
android:smallScreens="true"
9+
android:normalScreens="true"
10+
android:largeScreens="true"
11+
android:xlargeScreens="true"/>
12+
13+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
14+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
15+
<uses-permission android:name="android.permission.INTERNET"/>
16+
17+
<application
18+
android:name="com.tns.NativeScriptApplication"
19+
android:allowBackup="true"
20+
android:icon="@drawable/icon"
21+
android:label="@string/app_name"
22+
android:theme="@style/AppTheme">
23+
24+
<activity
25+
android:name="com.tns.NativeScriptActivity"
26+
android:label="@string/title_activity_kimera"
27+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
28+
android:theme="@style/LaunchScreenTheme">
29+
30+
<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
31+
32+
<intent-filter>
33+
<action android:name="android.intent.action.MAIN" />
34+
<category android:name="android.intent.category.LAUNCHER" />
35+
</intent-filter>
36+
</activity>
37+
<activity android:name="com.tns.ErrorReportActivity"/>
38+
</application>
39+
</manifest>

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/values-v21/colors.xml

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

Diff for: demo_vue/app/App_Resources/Android/src/main/res/values-v21/strings.xml

-5
This file was deleted.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/values-v21/styles.xml

100644100755
+7-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
2+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
33

44
<!-- Application theme -->
5-
<style name="AppTheme" parent="AppThemeBase">
5+
<style name="AppThemeBase21" parent="AppThemeBase">
6+
<item name="android:windowTranslucentStatus">true</item>
67
<item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
78
<item name="android:timePickerStyle">@style/SpinnerTimePicker</item>
89
</style>
910

11+
<style name="AppTheme" parent="AppThemeBase21">
12+
</style>
13+
1014
<!-- Default style for DatePicker - in spinner mode -->
1115
<style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
1216
<item name="android:datePickerMode">spinner</item>
@@ -19,5 +23,6 @@
1923

2024
<style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
2125
<item name="android:elevation">4dp</item>
26+
<item name="android:paddingTop">24dp</item>
2227
</style>
2328
</resources>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<!-- Application theme -->
5+
<style name="AppThemeBase29" parent="AppThemeBase21">
6+
<item name="android:forceDarkAllowed">true</item>
7+
</style>
8+
9+
<style name="AppTheme" parent="AppThemeBase29">
10+
</style>
11+
12+
</resources>

Diff for: demo_vue/app/App_Resources/Android/src/main/res/values/colors.xml

100644100755
+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="ns_primary">#3F51B5</color>
4-
<color name="ns_primaryDark">#303F9F</color>
5-
<color name="ns_accent">#FF4081</color>
6-
</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: demo_vue/app/App_Resources/Android/src/main/res/values/strings.xml

-5
This file was deleted.

Diff for: demo_vue/app/App_Resources/Android/src/main/res/values/styles.xml

100644100755
+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<item name="colorAccent">@color/ns_accent</item>
1111

1212
<item name="android:windowBackground">@drawable/splash_screen</item>
13-
14-
<item name="android:windowActionBarOverlay">true</item>
13+
14+
<item name="android:windowActionBarOverlay">true</item>
1515
<item name="android:windowTranslucentStatus">true</item>
1616
</style>
1717

@@ -30,7 +30,7 @@
3030
<style name="AppTheme" parent="AppThemeBase">
3131
</style>
3232

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

Diff for: demo_vue/app/App_Resources/Android/src/main/res/xml/network_security_config.xml

-8
This file was deleted.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

100644100755
+25-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
{
22
"images" : [
3+
{
4+
"size" : "20x20",
5+
"idiom" : "iphone",
6+
"filename" : "[email protected]",
7+
"scale" : "2x"
8+
},
9+
{
10+
"size" : "20x20",
11+
"idiom" : "iphone",
12+
"filename" : "[email protected]",
13+
"scale" : "3x"
14+
},
315
{
416
"size" : "29x29",
517
"idiom" : "iphone",
@@ -42,6 +54,18 @@
4254
"filename" : "[email protected]",
4355
"scale" : "3x"
4456
},
57+
{
58+
"size" : "20x20",
59+
"idiom" : "ipad",
60+
"filename" : "icon-20.png",
61+
"scale" : "1x"
62+
},
63+
{
64+
"size" : "20x20",
65+
"idiom" : "ipad",
66+
"filename" : "[email protected]",
67+
"scale" : "2x"
68+
},
4569
{
4670
"size" : "29x29",
4771
"idiom" : "ipad",
@@ -89,7 +113,7 @@
89113
"idiom" : "ios-marketing",
90114
"filename" : "icon-1024.png",
91115
"scale" : "1x"
92-
}
116+
}
93117
],
94118
"info" : {
95119
"version" : 1,

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Diff for: demo_vue/app/App_Resources/iOS/Assets.xcassets/Contents.json

100644100755
File mode changed.

0 commit comments

Comments
 (0)