Skip to content

Commit 05deb6d

Browse files
committed
Merge branch 'master' of github.com:nativescript-community/nativescript-collectionview
# Conflicts: # package.json
2 parents cadd1b8 + 4e7590e commit 05deb6d

File tree

290 files changed

+3037
-1807
lines changed

Some content is hidden

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

290 files changed

+3037
-1807
lines changed

README.md

Lines changed: 24 additions & 48 deletions

demo-ng/.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
insert_final_newline = true
6+
trim_trailing_whitespace = true
7+
charset = utf-8
8+
9+
[*.json]
10+
indent_style = space
11+
indent_size = 2
12+
13+
[*.ts]
14+
indent_style = space
15+
indent_size = 4

demo-ng/.gitignore

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# NativeScript
2+
hooks/
3+
node_modules/
4+
platforms/
5+
6+
# NativeScript Template
7+
*.js.map
8+
*.js
9+
!ngcc.config.js
10+
!webpack.config.js
11+
12+
# Logs
13+
logs
14+
*.log
15+
npm-debug.log*
16+
yarn-debug.log*
17+
yarn-error.log*
18+
19+
# General
20+
.DS_Store
21+
.AppleDouble
22+
.LSOverride
23+
.idea
24+
.cloud
25+
.project
26+
tmp/
27+
typings/
28+
29+
# Visual Studio Code
30+
.vscode/*
31+
!.vscode/settings.json
32+
!.vscode/tasks.json
33+
!.vscode/launch.json
34+
!.vscode/extensions.json

demo-ng/.vscode/settings.json

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Add your native dependencies here:
2+
3+
// Uncomment to add recyclerview-v7 dependency
4+
//dependencies {
5+
// implementation 'com.android.support:recyclerview-v7:+'
6+
//}
7+
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
11+
12+
android {
13+
defaultConfig {
14+
minSdkVersion 17
15+
generatedDensities = []
16+
}
17+
aaptOptions {
18+
additionalParameters "--no-version-vectors"
19+
}
20+
}

demo-ng/app/App_Resources/Android/AndroidManifest.xml renamed to demo-ng/App_Resources/Android/src/main/AndroidManifest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
android:largeScreens="true"
1111
android:xlargeScreens="true"/>
1212

13-
<uses-sdk
14-
android:minSdkVersion="17"
15-
android:targetSdkVersion="__APILEVEL__"/>
16-
1713
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
1814
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
1915
<uses-permission android:name="android.permission.INTERNET"/>
@@ -22,13 +18,13 @@
2218
android:name="com.tns.NativeScriptApplication"
2319
android:allowBackup="true"
2420
android:icon="@drawable/icon"
25-
android:label="CollectionView NG"
21+
android:label="@string/app_name"
2622
android:theme="@style/AppTheme">
2723

2824
<activity
2925
android:name="com.tns.NativeScriptActivity"
3026
android:label="@string/title_activity_kimera"
31-
android:configChanges="keyboardHidden|orientation|screenSize"
27+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
3228
android:theme="@style/LaunchScreenTheme">
3329

3430
<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />

demo-ng/app/App_Resources/Android/drawable-hdpi/background.png renamed to demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/background.png

File renamed without changes.
6.8 KB

demo-ng/app/App_Resources/Android/drawable-hdpi/logo.png renamed to demo-ng/App_Resources/Android/src/main/res/drawable-hdpi/logo.png

File renamed without changes.

demo-ng/app/App_Resources/Android/drawable-ldpi/background.png renamed to demo-ng/App_Resources/Android/src/main/res/drawable-ldpi/background.png

File renamed without changes.

0 commit comments

Comments
 (0)