diff --git a/.editorconfig b/.editorconfig new file mode 100755 index 0000000..84ba4fa --- /dev/null +++ b/.editorconfig @@ -0,0 +1,19 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 + +[*.json] +indent_style = space +indent_size = 2 + +[*.js] +indent_style = space +indent_size = 2 + +[*.ts] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 2894e8f..1cb1231 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,28 @@ -npm-debug.log -.DS_Store - -*.js.map -vendor*.ts -src/**/*.js +# NativeScript hooks/ -lib/ node_modules/ platforms/ -tmp/ -typings/ -.vscode + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# General +.DS_Store +.AppleDouble +.LSOverride .idea .cloud -.project \ No newline at end of file +.project +tmp/ +typings/ + +# Visual Studio Code +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100755 index 0000000..2a163b8 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["nativescript.nativescript"] +} diff --git a/App_Resources/Android/app.gradle b/App_Resources/Android/app.gradle old mode 100644 new mode 100755 index d71702c..bb48421 --- a/App_Resources/Android/app.gradle +++ b/App_Resources/Android/app.gradle @@ -5,15 +5,16 @@ // implementation 'com.android.support:recyclerview-v7:+' //} -// If you want to add something to be applied before applying plugins' include.gradle files +// If you want to add something to be applied before applying plugins' include.gradle files // e.g. project.ext.googlePlayServicesVersion = "15.0.1" // create a file named before-plugins.gradle in the current directory and place it there - -android { - defaultConfig { + +android { + defaultConfig { + minSdkVersion 17 generatedDensities = [] - } - aaptOptions { - additionalParameters "--no-version-vectors" - } -} + } + aaptOptions { + additionalParameters "--no-version-vectors" + } +} diff --git a/App_Resources/Android/src/main/AndroidManifest.xml b/App_Resources/Android/src/main/AndroidManifest.xml old mode 100644 new mode 100755 index 9db8321..506c0b3 --- a/App_Resources/Android/src/main/AndroidManifest.xml +++ b/App_Resources/Android/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - - + + android:theme="@style/AppTheme" + android:hardwareAccelerated="true"> + android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode" + android:theme="@style/LaunchScreenTheme" + android:hardwareAccelerated="true" + android:launchMode="singleTask"> diff --git a/App_Resources/Android/src/main/res/drawable-hdpi/background.png b/App_Resources/Android/src/main/res/drawable-hdpi/background.png old mode 100644 new mode 100755 index eb381c2..bbefbf4 Binary files a/App_Resources/Android/src/main/res/drawable-hdpi/background.png and b/App_Resources/Android/src/main/res/drawable-hdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-hdpi/icon.png b/App_Resources/Android/src/main/res/drawable-hdpi/icon.png deleted file mode 100644 index 9cde84c..0000000 Binary files a/App_Resources/Android/src/main/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/App_Resources/Android/src/main/res/drawable-hdpi/logo.png b/App_Resources/Android/src/main/res/drawable-hdpi/logo.png old mode 100644 new mode 100755 index 5218f4c..e788deb Binary files a/App_Resources/Android/src/main/res/drawable-hdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-hdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-ldpi/background.png b/App_Resources/Android/src/main/res/drawable-ldpi/background.png old mode 100644 new mode 100755 index 748b2ad..f6a08ee Binary files a/App_Resources/Android/src/main/res/drawable-ldpi/background.png and b/App_Resources/Android/src/main/res/drawable-ldpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-ldpi/icon.png b/App_Resources/Android/src/main/res/drawable-ldpi/icon.png deleted file mode 100644 index 4d6a674..0000000 Binary files a/App_Resources/Android/src/main/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/App_Resources/Android/src/main/res/drawable-ldpi/logo.png b/App_Resources/Android/src/main/res/drawable-ldpi/logo.png old mode 100644 new mode 100755 index b9e102a..e4cac1a Binary files a/App_Resources/Android/src/main/res/drawable-ldpi/logo.png and b/App_Resources/Android/src/main/res/drawable-ldpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-mdpi/background.png b/App_Resources/Android/src/main/res/drawable-mdpi/background.png old mode 100644 new mode 100755 index efeaf29..0c90f0f Binary files a/App_Resources/Android/src/main/res/drawable-mdpi/background.png and b/App_Resources/Android/src/main/res/drawable-mdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-mdpi/icon.png b/App_Resources/Android/src/main/res/drawable-mdpi/icon.png deleted file mode 100644 index 92ccc85..0000000 Binary files a/App_Resources/Android/src/main/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/App_Resources/Android/src/main/res/drawable-mdpi/logo.png b/App_Resources/Android/src/main/res/drawable-mdpi/logo.png old mode 100644 new mode 100755 index 6263387..ce3c3a4 Binary files a/App_Resources/Android/src/main/res/drawable-mdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-mdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml b/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml old mode 100644 new mode 100755 diff --git a/App_Resources/Android/src/main/res/drawable-xhdpi/background.png b/App_Resources/Android/src/main/res/drawable-xhdpi/background.png old mode 100644 new mode 100755 index 612bbd0..3541570 Binary files a/App_Resources/Android/src/main/res/drawable-xhdpi/background.png and b/App_Resources/Android/src/main/res/drawable-xhdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png b/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png deleted file mode 100644 index 8bcde62..0000000 Binary files a/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png and /dev/null differ diff --git a/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png old mode 100644 new mode 100755 index ad8ee2f..88267df Binary files a/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png old mode 100644 new mode 100755 index 0fa88e2..abb0fc7 Binary files a/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png and b/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png deleted file mode 100644 index 9d81c85..0000000 Binary files a/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png and /dev/null differ diff --git a/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png old mode 100644 new mode 100755 index 6683278..55800c9 Binary files a/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png old mode 100644 new mode 100755 index c650f64..1089775 Binary files a/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png and b/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png differ diff --git a/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png deleted file mode 100644 index 9a34d0d..0000000 Binary files a/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png and /dev/null differ diff --git a/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png old mode 100644 new mode 100755 index fa6331c..0703f90 Binary files a/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png and b/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png differ diff --git a/App_Resources/Android/src/main/res/drawable/ic_launcher_foreground.xml b/App_Resources/Android/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100755 index 0000000..fd826a3 --- /dev/null +++ b/App_Resources/Android/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/App_Resources/Android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/App_Resources/Android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100755 index 0000000..7353dbd --- /dev/null +++ b/App_Resources/Android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/App_Resources/Android/src/main/res/mipmap-hdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100755 index 0000000..69948d2 Binary files /dev/null and b/App_Resources/Android/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/mipmap-mdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100755 index 0000000..90a58cd Binary files /dev/null and b/App_Resources/Android/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/mipmap-xhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100755 index 0000000..70a2a0d Binary files /dev/null and b/App_Resources/Android/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100755 index 0000000..1ee5a94 Binary files /dev/null and b/App_Resources/Android/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/App_Resources/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100755 index 0000000..66e9d4b Binary files /dev/null and b/App_Resources/Android/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/App_Resources/Android/src/main/res/values-v21/colors.xml b/App_Resources/Android/src/main/res/values-v21/colors.xml old mode 100644 new mode 100755 index a64641a..94c6ced --- a/App_Resources/Android/src/main/res/values-v21/colors.xml +++ b/App_Resources/Android/src/main/res/values-v21/colors.xml @@ -1,4 +1,4 @@ - #3d5afe + #65ADF1 \ No newline at end of file diff --git a/App_Resources/Android/src/main/res/values-v21/styles.xml b/App_Resources/Android/src/main/res/values-v21/styles.xml old mode 100644 new mode 100755 index dac8727..1917ea1 --- a/App_Resources/Android/src/main/res/values-v21/styles.xml +++ b/App_Resources/Android/src/main/res/values-v21/styles.xml @@ -1,12 +1,16 @@ - + - + + + 24dp + \ No newline at end of file diff --git a/App_Resources/Android/src/main/res/values-v29/styles.xml b/App_Resources/Android/src/main/res/values-v29/styles.xml new file mode 100755 index 0000000..3f7d355 --- /dev/null +++ b/App_Resources/Android/src/main/res/values-v29/styles.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/App_Resources/Android/src/main/res/values/colors.xml b/App_Resources/Android/src/main/res/values/colors.xml old mode 100644 new mode 100755 index 74ad882..a79050c --- a/App_Resources/Android/src/main/res/values/colors.xml +++ b/App_Resources/Android/src/main/res/values/colors.xml @@ -2,6 +2,6 @@ #F5F5F5 #757575 - #33B5E5 + #65ADF1 #272734 \ No newline at end of file diff --git a/App_Resources/Android/src/main/res/values/ic_launcher_background.xml b/App_Resources/Android/src/main/res/values/ic_launcher_background.xml new file mode 100755 index 0000000..c5d5899 --- /dev/null +++ b/App_Resources/Android/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/App_Resources/Android/src/main/res/values/styles.xml b/App_Resources/Android/src/main/res/values/styles.xml old mode 100644 new mode 100755 index c793e6d..4f91b61 --- a/App_Resources/Android/src/main/res/values/styles.xml +++ b/App_Resources/Android/src/main/res/values/styles.xml @@ -10,10 +10,9 @@ @color/ns_accent @drawable/splash_screen - - true - true + true + true - + diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 index 4034b76..1a8b0e6 --- a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,17 @@ { "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "icon-20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "icon-20@3x.png", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", @@ -42,6 +54,18 @@ "filename" : "icon-60@3x.png", "scale" : "3x" }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "icon-20.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "icon-20@2x.png", + "scale" : "2x" + }, { "size" : "29x29", "idiom" : "ipad", @@ -89,7 +113,7 @@ "idiom" : "ios-marketing", "filename" : "icon-1024.png", "scale" : "1x" - } + } ], "info" : { "version" : 1, diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png old mode 100644 new mode 100755 index a1d7eb4..b46c8bb Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png new file mode 100755 index 0000000..d73288a Binary files /dev/null and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png new file mode 100755 index 0000000..c8d24cd Binary files /dev/null and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png new file mode 100755 index 0000000..1b00c84 Binary files /dev/null and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png old mode 100644 new mode 100755 index bb9b9e8..72a1641 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png old mode 100644 new mode 100755 index ec609dc..05ab752 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png old mode 100644 new mode 100755 index a971808..ee72082 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png old mode 100644 new mode 100755 index 214800e..2859288 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png old mode 100644 new mode 100755 index 8554b88..88824fa Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png old mode 100644 new mode 100755 index a22626b..02a930c Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png old mode 100644 new mode 100755 index a22626b..d7b077f Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png old mode 100644 new mode 100755 index 492c9c8..2f872dd Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png old mode 100644 new mode 100755 index 9208113..7fb23a7 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png old mode 100644 new mode 100755 index 24415e5..cb04c36 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png old mode 100644 new mode 100755 index b3ef1bf..e882226 Binary files a/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and b/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/Contents.json b/App_Resources/iOS/Assets.xcassets/Contents.json old mode 100644 new mode 100755 diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index 11bfcf5..0000000 --- a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "images" : [ - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "2436h", - "filename" : "Default-1125h.png", - "minimum-system-version" : "11.0", - "orientation" : "portrait", - "scale" : "3x" - }, - { - "orientation" : "landscape", - "idiom" : "iphone", - "extent" : "full-screen", - "filename" : "Default-Landscape-X.png", - "minimum-system-version" : "11.0", - "subtype" : "2436h", - "scale" : "3x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "Default-736h@3x.png", - "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "3x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "Default-Landscape@3x.png", - "minimum-system-version" : "8.0", - "orientation" : "landscape", - "scale" : "3x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "667h", - "filename" : "Default-667h@2x.png", - "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "retina4", - "filename" : "Default-568h@2x.png", - "minimum-system-version" : "7.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default-Portrait.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default-Landscape.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default-Portrait@2x.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default-Landscape@2x.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x.png", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default-568h@2x.png", - "extent" : "full-screen", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default-Portrait.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default-Landscape.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default-Portrait@2x.png", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default-Landscape@2x.png", - "extent" : "full-screen", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-1125h.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-1125h.png deleted file mode 100644 index 2913f85..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-1125h.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png deleted file mode 100644 index d7f17fc..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png deleted file mode 100644 index b884154..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png deleted file mode 100644 index faab4b6..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-X.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-X.png deleted file mode 100644 index cd94a3a..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape-X.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png deleted file mode 100644 index 3365ba3..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png deleted file mode 100644 index a44945c..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png deleted file mode 100644 index e6dca62..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png deleted file mode 100644 index 1a50079..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png deleted file mode 100644 index 73d8b92..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png deleted file mode 100644 index 9f1f6ce..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png deleted file mode 100644 index 514fc5c..0000000 Binary files a/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png and /dev/null differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json old mode 100644 new mode 100755 index 4f4e9c5..ab5edd0 --- a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json +++ b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json @@ -12,6 +12,7 @@ }, { "idiom" : "universal", + "filename" : "LaunchScreen-AspectFill@3x.png", "scale" : "3x" } ], diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png old mode 100644 new mode 100755 index c293f9c..cb35cfa Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png old mode 100644 new mode 100755 index 233693a..6eefb9a Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png new file mode 100755 index 0000000..0ef5102 Binary files /dev/null and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@3x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json old mode 100644 new mode 100755 index 23c0ffd..444d715 --- a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json +++ b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json @@ -12,6 +12,7 @@ }, { "idiom" : "universal", + "filename" : "LaunchScreen-Center@3x.png", "scale" : "3x" } ], diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png old mode 100644 new mode 100755 index a5a775a..280c30e Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png old mode 100644 new mode 100755 index 154c193..f984b9e Binary files a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png differ diff --git a/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png new file mode 100755 index 0000000..95d86f3 Binary files /dev/null and b/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@3x.png differ diff --git a/App_Resources/iOS/Info.plist b/App_Resources/iOS/Info.plist old mode 100644 new mode 100755 diff --git a/App_Resources/iOS/LaunchScreen.storyboard b/App_Resources/iOS/LaunchScreen.storyboard old mode 100644 new mode 100755 diff --git a/App_Resources/iOS/build.xcconfig b/App_Resources/iOS/build.xcconfig old mode 100644 new mode 100755 index 4b01184..0d38fe0 --- a/App_Resources/iOS/build.xcconfig +++ b/App_Resources/iOS/build.xcconfig @@ -1,7 +1,6 @@ // You can add custom settings here // for example you can uncomment the following line to force distribution code signing // CODE_SIGN_IDENTITY = iPhone Distribution -// 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 +// To build for device with XCode you need to specify your development team. // DEVELOPMENT_TEAM = YOUR_TEAM_ID; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; -ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/angular.json b/angular.json deleted file mode 100644 index 1fbd446..0000000 --- a/angular.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "cli": { - "defaultCollection": "@nativescript/schematics" - }, - "projects": { - "hello-world": { - "root": "", - "sourceRoot": "src", - "projectType": "application", - "prefix": "ns" - } - }, - "defaultProject": "hello-world" -} diff --git a/nativescript.config.ts b/nativescript.config.ts new file mode 100755 index 0000000..ed1a2b8 --- /dev/null +++ b/nativescript.config.ts @@ -0,0 +1,11 @@ +import { NativeScriptConfig } from '@nativescript/core'; + +export default { + id: 'org.nativescript.nestedroutertabview', + appPath: 'src', + appResourcesPath: 'App_Resources', + android: { + v8Flags: '--expose_gc', + markingMode: 'none' + } +} as NativeScriptConfig; \ No newline at end of file diff --git a/nsconfig.json b/nsconfig.json deleted file mode 100644 index b38346b..0000000 --- a/nsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "appResourcesPath": "App_Resources", - "appPath": "src" -} \ No newline at end of file diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 1d726c7..825d036 --- a/package.json +++ b/package.json @@ -1,54 +1,30 @@ { - "description": "NativeScript Application", - "license": "SEE LICENSE IN ", - "readme": "NativeScript Application", - "repository": "", - "nativescript": { - "id": "org.nativescript.nestedroutertabview", - "tns-android": { - "version": "6.0.0" - }, - "tns-ios": { - "version": "6.0.1" - } - }, + "name": "org.nativescript.nestedroutertabview", + "main": "src/main.ts", + "version": "1.0.0", + "private": true, "dependencies": { - "@angular/animations": "8.0.0", - "@angular/common": "8.0.0", - "@angular/compiler": "8.0.0", - "@angular/core": "8.0.0", - "@angular/forms": "8.0.0", - "@angular/http": "8.0.0-beta.10", - "@angular/platform-browser": "8.0.0", - "@angular/platform-browser-dynamic": "8.0.0", - "@angular/router": "8.0.0", - "nativescript-angular": "8.0.2", - "nativescript-theme-core": "~1.0.4", - "reflect-metadata": "~0.1.8", - "rxjs": "^6.3.3", - "tns-core-modules": "6.0.1", - "zone.js": "0.9.1" + "@angular/animations": "^12.2.0", + "@angular/common": "^12.2.0", + "@angular/compiler": "^12.2.0", + "@angular/core": "^12.2.0", + "@angular/forms": "^12.2.0", + "@angular/platform-browser": "^12.2.0", + "@angular/platform-browser-dynamic": "^12.2.0", + "@angular/router": "^12.2.0", + "@nativescript-community/ui-material-bottom-navigation": "~6.1.0", + "@nativescript/angular": "^12.2.0", + "@nativescript/core": "~8.1.1", + "@nativescript/theme": "~3.0.1", + "rxjs": "~7.3.0", + "zone.js": "~0.11.4" }, "devDependencies": { - "@angular/compiler-cli": "8.0.0", - "@ngtools/webpack": "8.0.0", - "@types/chai": "^4.0.2", - "@types/mocha": "^2.2.41", - "@types/node": "^7.0.5", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "chai": "^4.2.0", - "lazy": "1.0.11", - "mocha": "^5.2.0", - "mocha-junit-reporter": "^1.18.0", - "mocha-multi": "^1.0.1", - "nativescript-dev-appium": "next", - "nativescript-dev-webpack": "1.0.1", - "typescript": "3.4.5" - }, - "scripts": { - "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json", - "compile-tests": "tsc -p e2e --watch" + "@angular/compiler-cli": "^12.2.0", + "@nativescript/ios": "8.1.0", + "@nativescript/types": "~8.1.1", + "@nativescript/webpack": "~5.0.0", + "@ngtools/webpack": "^12.2.0", + "typescript": "~4.3.5" } } diff --git a/references.d.ts b/references.d.ts new file mode 100755 index 0000000..d743326 --- /dev/null +++ b/references.d.ts @@ -0,0 +1 @@ +/// diff --git a/src/app.css b/src/app.css old mode 100644 new mode 100755 index d23504c..72ba8b8 --- a/src/app.css +++ b/src/app.css @@ -1,12 +1,22 @@ -/* -In NativeScript, the app.css file is where you place CSS rules that -you would like to apply to your entire application. Check out -http://docs.nativescript.org/ui/styling for a full list of the CSS -selectors and properties you can use to style UI components. +@import '@nativescript/theme/css/core.css'; +@import '@nativescript/theme/css/default.css'; -/* -In many cases you may want to use the NativeScript core theme instead -of writing your own CSS rules. For a full list of class names in the theme -refer to http://docs.nativescript.org/ui/theme. -*/ -@import '~nativescript-theme-core/css/core.light.css'; +.fab { + font-family: 'Font Awesome 5 Brands', 'fa-brands-400'; + font-weight: 400; +} +.fas { + font-family: 'Font Awesome 5 Free', 'fa-solid-900'; + font-weight: 900; +} +.far { + font-family: 'Font Awesome 5 Free', 'fa-regular-400'; + font-weight: 400; +} +MDTabStrip { + color: green; +} + +MDTabStripItem:highlighted { + color: red; +} \ No newline at end of file diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts old mode 100644 new mode 100755 index 23860fb..598ad1e --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,15 +1,13 @@ -import { NgModule } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; -import { Routes } from "@angular/router"; +import { NgModule } from '@angular/core' +import { Routes } from '@angular/router' +import { NativeScriptRouterModule } from '@nativescript/angular' import { LoginComponent } from "./login/login.component"; import { WelcomeComponent } from "./welcome/welcome.component"; - export const COMPONENTS = [LoginComponent, WelcomeComponent]; - const routes: Routes = [ { path: "", redirectTo: "/login", pathMatch: "full" }, - { + { path: "login", component: LoginComponent }, { @@ -17,12 +15,12 @@ const routes: Routes = [ }, { path: "tabs", - loadChildren: "~/app/tabs/tabs.module#TabsModule" - }, -]; + loadChildren: () => import("~/app/tabs/tabs.module").then(m => m.TabsModule), + }, +] @NgModule({ - imports: [NativeScriptRouterModule.forRoot(routes, { enableTracing: true })], - exports: [NativeScriptRouterModule], + imports: [NativeScriptRouterModule.forRoot(routes, { enableTracing: true })], + exports: [NativeScriptRouterModule], }) -export class AppRoutingModule { } +export class AppRoutingModule {} diff --git a/src/app/app.component.html b/src/app/app.component.html old mode 100644 new mode 100755 index c1a4876..72a07d6 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/src/app/app.component.ts b/src/app/app.component.ts old mode 100644 new mode 100755 index 5fbeb3c..87f06ae --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,8 +1,7 @@ -import { Component } from "@angular/core"; +import { Component } from '@angular/core' @Component({ - selector: "ns-app", - moduleId: module.id, - templateUrl: "./app.component.html", + selector: 'ns-app', + templateUrl: 'app.component.html', }) -export class AppComponent { } +export class AppComponent {} diff --git a/src/app/app.module.ts b/src/app/app.module.ts old mode 100644 new mode 100755 index 392f1a1..488ddf1 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,14 +1,10 @@ -import { NgModule, NO_ERRORS_SCHEMA, ErrorHandler, NgModuleFactoryLoader } from "@angular/core"; -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; -import { AppRoutingModule, COMPONENTS } from "./app-routing.module"; -import { AppComponent } from "./app.component"; +import { ErrorHandler, NgModule, NO_ERRORS_SCHEMA } from '@angular/core' +import { NativeScriptModule } from '@nativescript/angular' -import { DataService } from "./data.service"; -import { NSModuleFactoryLoader } from "nativescript-angular/router"; - -import { enable as traceEnable, addCategories } from "tns-core-modules/trace"; +import { AppRoutingModule, COMPONENTS } from './app-routing.module' +import { AppComponent } from './app.component' -traceEnable(); +import { DataService } from "./data.service"; export class MyErrorHandler implements ErrorHandler { handleError(error) { @@ -16,29 +12,15 @@ export class MyErrorHandler implements ErrorHandler { console.log("### ErrorHandler Stack: " + error.stack); } } - @NgModule({ - bootstrap: [ - AppComponent - ], - imports: [ - NativeScriptModule, - AppRoutingModule, - ], - declarations: [ - AppComponent, - ...COMPONENTS - ], + bootstrap: [AppComponent], + imports: [NativeScriptModule, AppRoutingModule], + declarations: [AppComponent, + ...COMPONENTS], providers: [ DataService, { provide: ErrorHandler, useClass: MyErrorHandler }, - { provide: NgModuleFactoryLoader, useClass: NSModuleFactoryLoader } ], - schemas: [ - NO_ERRORS_SCHEMA - ] + schemas: [NO_ERRORS_SCHEMA], }) -/* -Pass your application module to the bootstrapModule function located in main.ts to start your app -*/ -export class AppModule { } \ No newline at end of file +export class AppModule {} diff --git a/src/app/data.service.ts b/src/app/data.service.ts old mode 100644 new mode 100755 diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts new file mode 100755 index 0000000..128ef5b --- /dev/null +++ b/src/app/home/home-routing.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core' +import { Routes } from '@angular/router' +import { NativeScriptRouterModule } from '@nativescript/angular' + +import { HomeComponent } from './home.component' + +const routes: Routes = [{ path: '', component: HomeComponent }] + +@NgModule({ + imports: [NativeScriptRouterModule.forChild(routes)], + exports: [NativeScriptRouterModule], +}) +export class HomeRoutingModule {} diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html new file mode 100755 index 0000000..b4d208b --- /dev/null +++ b/src/app/home/home.component.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts new file mode 100755 index 0000000..177cba4 --- /dev/null +++ b/src/app/home/home.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core' + +@Component({ + selector: 'Home', + templateUrl: './home.component.html', +}) +export class HomeComponent implements OnInit { + constructor() { + // Use the component constructor to inject providers. + } + + ngOnInit(): void { + // Init your component properties here. + } +} diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts new file mode 100755 index 0000000..5cb1b6c --- /dev/null +++ b/src/app/home/home.module.ts @@ -0,0 +1,12 @@ +import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core' +import { NativeScriptCommonModule } from '@nativescript/angular' + +import { HomeRoutingModule } from './home-routing.module' +import { HomeComponent } from './home.component' + +@NgModule({ + imports: [NativeScriptCommonModule, HomeRoutingModule], + declarations: [HomeComponent], + schemas: [NO_ERRORS_SCHEMA], +}) +export class HomeModule {} diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html old mode 100644 new mode 100755 diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts old mode 100644 new mode 100755 index 4ffd196..0e704cb --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -1,7 +1,6 @@ import { Component } from "@angular/core"; -import { RouterExtensions } from "nativescript-angular/router"; +import { RouterExtensions } from "@nativescript/angular"; @Component({ - moduleId: module.id, selector: "login-page", templateUrl: "./login.component.html" }) diff --git a/src/app/player/player-detail.component.html b/src/app/player/player-detail.component.html old mode 100644 new mode 100755 diff --git a/src/app/player/player-detail.component.ts b/src/app/player/player-detail.component.ts old mode 100644 new mode 100755 index df36562..02bf602 --- a/src/app/player/player-detail.component.ts +++ b/src/app/player/player-detail.component.ts @@ -1,12 +1,11 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { RouterExtensions } from "nativescript-angular/router"; +import { RouterExtensions } from "@nativescript/angular"; import { DataService, DataItem } from "../data.service"; import { Subscription } from "rxjs"; @Component({ selector: "ns-player-details", - moduleId: module.id, templateUrl: "./player-detail.component.html", }) export class PlayerDetailComponent implements OnInit { diff --git a/src/app/player/players.component.html b/src/app/player/players.component.html old mode 100644 new mode 100755 diff --git a/src/app/player/players.component.ts b/src/app/player/players.component.ts old mode 100644 new mode 100755 index ad6f7ec..fcea38b --- a/src/app/player/players.component.ts +++ b/src/app/player/players.component.ts @@ -3,7 +3,6 @@ import { DataService, DataItem } from "../data.service"; @Component({ selector: "ns-players", - moduleId: module.id, templateUrl: "./players.component.html", }) export class PlayerComponent implements OnInit { diff --git a/src/app/player/players.module.ts b/src/app/player/players.module.ts old mode 100644 new mode 100755 index 4628b95..f7d8c54 --- a/src/app/player/players.module.ts +++ b/src/app/player/players.module.ts @@ -1,9 +1,8 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; import { PlayerComponent } from "./players.component"; import { PlayerDetailComponent } from "./player-detail.component"; -import { NativeScriptCommonModule } from "nativescript-angular/common"; +import { NativeScriptCommonModule, NativeScriptRouterModule } from "@nativescript/angular"; @NgModule({ imports: [ diff --git a/src/app/tabs/tabs.component.html b/src/app/tabs/tabs.component.html old mode 100644 new mode 100755 index 5cb9ae5..c862f82 --- a/src/app/tabs/tabs.component.html +++ b/src/app/tabs/tabs.component.html @@ -1,7 +1,27 @@ - - - + + - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/tabs/tabs.component.ts b/src/app/tabs/tabs.component.ts old mode 100644 new mode 100755 index 824e36d..18cfd6e --- a/src/app/tabs/tabs.component.ts +++ b/src/app/tabs/tabs.component.ts @@ -1,9 +1,10 @@ import { Component } from "@angular/core"; -import { RouterExtensions } from "nativescript-angular/router"; import { ActivatedRoute } from "@angular/router"; +import { RouterExtensions } from "@nativescript/angular"; + + @Component({ - moduleId: module.id, selector: "tabs-page", templateUrl: "./tabs.component.html" }) diff --git a/src/app/tabs/tabs.module.ts b/src/app/tabs/tabs.module.ts old mode 100644 new mode 100755 index 68c7cb3..b9545ec --- a/src/app/tabs/tabs.module.ts +++ b/src/app/tabs/tabs.module.ts @@ -1,6 +1,6 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule, NSEmptyOutletComponent } from "nativescript-angular/router"; -import { NativeScriptCommonModule } from "nativescript-angular/common"; +import { NativeScriptCommonModule, NativeScriptRouterModule, NSEmptyOutletComponent } from "@nativescript/angular"; +import { NativeScriptMaterialBottomNavigationModule } from '@nativescript-community/ui-material-bottom-navigation/angular'; import { TabsComponent } from "./tabs.component"; @@ -8,6 +8,7 @@ import { TabsComponent } from "./tabs.component"; imports: [ NativeScriptCommonModule, NativeScriptRouterModule, + NativeScriptMaterialBottomNavigationModule, NativeScriptRouterModule.forChild([ { path: "default", component: TabsComponent, children: [ @@ -15,13 +16,13 @@ import { TabsComponent } from "./tabs.component"; path: "players", outlet: "playerTab", component: NSEmptyOutletComponent, - loadChildren: "~/app/player/players.module#PlayersModule", + loadChildren: () => import("~/app/player/players.module").then(m => m.PlayersModule), }, { path: "teams", outlet: "teamTab", component: NSEmptyOutletComponent, - loadChildren: "~/app/team/teams.module#TeamsModule" + loadChildren: () => import("~/app/team/teams.module").then(m => m.TeamsModule), } ] } diff --git a/src/app/team/team-detail.component.html b/src/app/team/team-detail.component.html old mode 100644 new mode 100755 diff --git a/src/app/team/team-detail.component.ts b/src/app/team/team-detail.component.ts old mode 100644 new mode 100755 index e4d92b2..a5c4fee --- a/src/app/team/team-detail.component.ts +++ b/src/app/team/team-detail.component.ts @@ -1,12 +1,11 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { RouterExtensions } from "nativescript-angular/router"; +import { RouterExtensions } from "@nativescript/angular"; import { DataService, DataItem } from "../data.service"; import { Subscription } from "rxjs"; @Component({ selector: "ns-team-details", - moduleId: module.id, templateUrl: "./team-detail.component.html", }) export class TeamDetailComponent implements OnInit { diff --git a/src/app/team/teams.component.html b/src/app/team/teams.component.html old mode 100644 new mode 100755 diff --git a/src/app/team/teams.component.ts b/src/app/team/teams.component.ts old mode 100644 new mode 100755 index 119d1d2..66453b1 --- a/src/app/team/teams.component.ts +++ b/src/app/team/teams.component.ts @@ -3,7 +3,6 @@ import { DataService, DataItem } from "../data.service"; @Component({ selector: "ns-teams", - moduleId: module.id, templateUrl: "./teams.component.html", }) export class TeamsComponent implements OnInit { diff --git a/src/app/team/teams.module.ts b/src/app/team/teams.module.ts old mode 100644 new mode 100755 index a942d97..a263caf --- a/src/app/team/teams.module.ts +++ b/src/app/team/teams.module.ts @@ -1,9 +1,8 @@ import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; import { TeamsComponent } from "./teams.component"; import { TeamDetailComponent } from "./team-detail.component"; -import { NativeScriptCommonModule } from "nativescript-angular/common"; +import { NativeScriptCommonModule, NativeScriptRouterModule } from "@nativescript/angular"; @NgModule({ imports: [ diff --git a/src/app/welcome/welcome.component.html b/src/app/welcome/welcome.component.html old mode 100644 new mode 100755 diff --git a/src/app/welcome/welcome.component.ts b/src/app/welcome/welcome.component.ts old mode 100644 new mode 100755 index 41989bc..7bd551a --- a/src/app/welcome/welcome.component.ts +++ b/src/app/welcome/welcome.component.ts @@ -1,8 +1,7 @@ import { Component } from "@angular/core"; -import { RouterExtensions } from "nativescript-angular/router"; +import { RouterExtensions } from "@nativescript/angular"; @Component({ - moduleId: module.id, selector: "welcome-page", templateUrl: "./welcome.component.html" }) diff --git a/src/fonts/fa-brands-400.ttf b/src/fonts/fa-brands-400.ttf new file mode 100755 index 0000000..0a30775 Binary files /dev/null and b/src/fonts/fa-brands-400.ttf differ diff --git a/src/fonts/fa-regular-400.ttf b/src/fonts/fa-regular-400.ttf new file mode 100755 index 0000000..b5414de Binary files /dev/null and b/src/fonts/fa-regular-400.ttf differ diff --git a/src/fonts/fa-solid-900.ttf b/src/fonts/fa-solid-900.ttf new file mode 100755 index 0000000..53c8f36 Binary files /dev/null and b/src/fonts/fa-solid-900.ttf differ diff --git a/src/main.ts b/src/main.ts old mode 100644 new mode 100755 index 6f5d0e0..4883e8f --- a/src/main.ts +++ b/src/main.ts @@ -1,10 +1,8 @@ -// this import should be first in order to load some required settings (like globals and reflect-metadata) -import { platformNativeScriptDynamic } from "nativescript-angular/platform"; +import { platformNativeScript, runNativeScriptAngularApp } from '@nativescript/angular'; -import { AppModule } from "./app/app.module"; +import { AppModule } from './app/app.module'; + +runNativeScriptAngularApp({ + appModuleBootstrap: () => platformNativeScript().bootstrapModule(AppModule), +}); -// A traditional NativeScript application starts by initializing global objects, setting up global CSS rules, creating, and navigating to the main page. -// Angular applications need to take care of their own initialization: modules, components, directives, routes, DI providers. -// A NativeScript Angular app needs to make both paradigms work together, so we provide a wrapper platform object, platformNativeScriptDynamic, -// that sets up a NativeScript application and can bootstrap the Angular framework. -platformNativeScriptDynamic().bootstrapModule(AppModule); diff --git a/src/package.json b/src/package.json deleted file mode 100644 index f7cf8f3..0000000 --- a/src/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "main": "main.js", - "android": { - "v8Flags": "--expose_gc" - } -} \ No newline at end of file diff --git a/src/polyfills.ts b/src/polyfills.ts new file mode 100755 index 0000000..05df962 --- /dev/null +++ b/src/polyfills.ts @@ -0,0 +1,20 @@ +/** + * NativeScript Polyfills + */ + +// Install @nativescript/core polyfills (XHR, setTimeout, requestAnimationFrame) +import '@nativescript/core/globals'; +// Install @nativescript/angular specific polyfills +import '@nativescript/angular/polyfills'; + +/** + * Zone.js and patches + */ +// Add pre-zone.js patches needed for the NativeScript platform +import '@nativescript/zone-js/dist/pre-zone-polyfills'; + +// Zone JS is required by default for Angular itself +import 'zone.js'; + +// Add NativeScript specific Zone JS patches +import '@nativescript/zone-js'; diff --git a/tsconfig.json b/tsconfig.json old mode 100644 new mode 100755 index 3d5d8d3..34b81c6 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,29 +1,21 @@ { - "compilerOptions": { - "module": "commonjs", - "target": "es5", - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "noEmitHelpers": true, - "noEmitOnError": true, - "lib": [ - "es6", - "dom", - "es2015.iterable" - ], - "baseUrl": ".", - "paths": { - "~/*": [ - "src/*" - ], - "*": [ - "./node_modules/tns-core-modules/*", - "./node_modules/*" - ] - } - }, - "exclude": [ - "node_modules", - "platforms" - ] -} \ No newline at end of file + "compilerOptions": { + "module": "esnext", + "target": "es2017", + "moduleResolution": "node", + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "noEmitHelpers": true, + "noEmitOnError": true, + "skipLibCheck": true, + "lib": ["es2017", "dom"], + "baseUrl": ".", + "paths": { + "~/*": ["src/*"], + "@/*": ["src/*"] + } + }, + "include": ["src/tests/**/*.ts", "src/**/*.ios.ts", "src/**/*.android.ts"], + "files": ["./src/main.ts", "./references.d.ts", "./src/polyfills.ts"], + "exclude": ["node_modules", "platforms", "e2e"] +} diff --git a/tsconfig.tns.json b/tsconfig.tns.json deleted file mode 100644 index 95f2ece..0000000 --- a/tsconfig.tns.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig", - "compilerOptions": { - "module": "es2015", - "moduleResolution": "node" - } -} diff --git a/webpack.config.js b/webpack.config.js old mode 100644 new mode 100755 index d7cd1e7..a561e0e --- a/webpack.config.js +++ b/webpack.config.js @@ -1,320 +1,12 @@ -const { join, relative, resolve, sep, dirname } = require("path"); +const webpack = require("@nativescript/webpack"); -const webpack = require("webpack"); -const nsWebpack = require("nativescript-dev-webpack"); -const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target"); -const { nsReplaceBootstrap } = require("nativescript-dev-webpack/transformers/ns-replace-bootstrap"); -const { nsReplaceLazyLoader } = require("nativescript-dev-webpack/transformers/ns-replace-lazy-loader"); -const { nsSupportHmrNg } = require("nativescript-dev-webpack/transformers/ns-support-hmr-ng"); -const { getMainModulePath } = require("nativescript-dev-webpack/utils/ast-utils"); -const CleanWebpackPlugin = require("clean-webpack-plugin"); -const CopyWebpackPlugin = require("copy-webpack-plugin"); -const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer"); -const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin"); -const TerserPlugin = require("terser-webpack-plugin"); -const { getAngularCompilerPlugin } = require("nativescript-dev-webpack/plugins/NativeScriptAngularCompilerPlugin"); -const hashSalt = Date.now().toString(); +module.exports = (env) => { + webpack.init(env); -module.exports = env => { - // Add your custom Activities, Services and other Android app components here. - const appComponents = [ - "tns-core-modules/ui/frame", - "tns-core-modules/ui/frame/activity", - ]; + // Learn how to customize: + // https://docs.nativescript.org/webpack - const platform = env && (env.android && "android" || env.ios && "ios"); - if (!platform) { - throw new Error("You need to provide a target platform!"); - } - - const AngularCompilerPlugin = getAngularCompilerPlugin(platform); - const projectRoot = __dirname; - - // Default destination inside platforms//... - const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot)); - - const { - // The 'appPath' and 'appResourcesPath' values are fetched from - // the nsconfig.json configuration file - // when bundling with `tns run android|ios --bundle`. - appPath = "src", - appResourcesPath = "App_Resources", - - // You can provide the following flags when running 'tns run android|ios' - aot, // --env.aot - snapshot, // --env.snapshot, - production, // --env.production - uglify, // --env.uglify - report, // --env.report - sourceMap, // --env.sourceMap - hiddenSourceMap, // --env.hiddenSourceMap - hmr, // --env.hmr, - unitTesting, // --env.unitTesting - verbose, // --env.verbose - } = env; - - const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap; - const externals = nsWebpack.getConvertedExternals(env.externals); - const appFullPath = resolve(projectRoot, appPath); - const appResourcesFullPath = resolve(projectRoot, appResourcesPath); - const tsConfigName = "tsconfig.tns.json"; - const entryModule = `${nsWebpack.getEntryModule(appFullPath, platform)}.ts`; - const entryPath = `.${sep}${entryModule}`; - const entries = { bundle: entryPath }; - const areCoreModulesExternal = Array.isArray(env.externals) && env.externals.some(e => e.indexOf("tns-core-modules") > -1); - if (platform === "ios" && !areCoreModulesExternal) { - entries["tns_modules/tns-core-modules/inspector_modules"] = "inspector_modules"; - }; - - const ngCompilerTransformers = []; - const additionalLazyModuleResources = []; - if (aot) { - ngCompilerTransformers.push(nsReplaceBootstrap); - } - - if (hmr) { - ngCompilerTransformers.push(nsSupportHmrNg); - } - - // when "@angular/core" is external, it's not included in the bundles. In this way, it will be used - // directly from node_modules and the Angular modules loader won't be able to resolve the lazy routes - // fixes https://github.com/NativeScript/nativescript-cli/issues/4024 - if (env.externals && env.externals.indexOf("@angular/core") > -1) { - const appModuleRelativePath = getMainModulePath(resolve(appFullPath, entryModule), tsConfigName); - if (appModuleRelativePath) { - const appModuleFolderPath = dirname(resolve(appFullPath, appModuleRelativePath)); - // include the lazy loader inside app module - ngCompilerTransformers.push(nsReplaceLazyLoader); - // include the new lazy loader path in the allowed ones - additionalLazyModuleResources.push(appModuleFolderPath); - } - } - - const ngCompilerPlugin = new AngularCompilerPlugin({ - hostReplacementPaths: nsWebpack.getResolver([platform, "tns"]), - platformTransformers: ngCompilerTransformers.map(t => t(() => ngCompilerPlugin, resolve(appFullPath, entryModule), projectRoot)), - mainPath: join(appFullPath, entryModule), - tsConfigPath: join(__dirname, tsConfigName), - skipCodeGeneration: !aot, - sourceMap: !!isAnySourceMapEnabled, - additionalLazyModuleResources: additionalLazyModuleResources - }); - - let sourceMapFilename = nsWebpack.getSourceMapFilename(hiddenSourceMap, __dirname, dist); - - const itemsToClean = [`${dist}/**/*`]; - if (platform === "android") { - itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "src", "main", "assets", "snapshots")}`); - itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`); - } - - nsWebpack.processAppComponents(appComponents, platform); - const config = { - mode: production ? "production" : "development", - context: appFullPath, - externals, - watchOptions: { - ignored: [ - appResourcesFullPath, - // Don't watch hidden files - "**/.*", - ] - }, - target: nativescriptTarget, - entry: entries, - output: { - pathinfo: false, - path: dist, - sourceMapFilename, - libraryTarget: "commonjs2", - filename: "[name].js", - globalObject: "global", - hashSalt - }, - resolve: { - extensions: [".ts", ".js", ".scss", ".css"], - // Resolve {N} system modules from tns-core-modules - modules: [ - resolve(__dirname, "node_modules/tns-core-modules"), - resolve(__dirname, "node_modules"), - "node_modules/tns-core-modules", - "node_modules", - ], - alias: { - '~': appFullPath - }, - symlinks: true - }, - resolveLoader: { - symlinks: false - }, - node: { - // Disable node shims that conflict with NativeScript - "http": false, - "timers": false, - "setImmediate": false, - "fs": "empty", - "__dirname": false, - }, - devtool: hiddenSourceMap ? "hidden-source-map" : (sourceMap ? "inline-source-map" : "none"), - optimization: { - runtimeChunk: "single", - splitChunks: { - cacheGroups: { - vendor: { - name: "vendor", - chunks: "all", - test: (module, chunks) => { - const moduleName = module.nameForCondition ? module.nameForCondition() : ''; - return /[\\/]node_modules[\\/]/.test(moduleName) || - appComponents.some(comp => comp === moduleName); - }, - enforce: true, - }, - } - }, - minimize: !!uglify, - minimizer: [ - new TerserPlugin({ - parallel: true, - cache: true, - sourceMap: isAnySourceMapEnabled, - terserOptions: { - output: { - comments: false, - semicolons: !isAnySourceMapEnabled - }, - compress: { - // The Android SBG has problems parsing the output - // when these options are enabled - 'collapse_vars': platform !== "android", - sequences: platform !== "android", - } - } - }) - ], - }, - module: { - rules: [ - { - test: nsWebpack.getEntryPathRegExp(appFullPath, entryPath), - use: [ - // Require all Android app components - platform === "android" && { - loader: "nativescript-dev-webpack/android-app-components-loader", - options: { modules: appComponents } - }, - - { - loader: "nativescript-dev-webpack/bundle-config-loader", - options: { - angular: true, - loadCss: !snapshot, // load the application css if in debug mode - unitTesting, - appFullPath, - projectRoot, - ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform) - } - }, - ].filter(loader => !!loader) - }, - - { test: /\.html$|\.xml$/, use: "raw-loader" }, - - // tns-core-modules reads the app.css and its imports using css-loader - { - test: /[\/|\\]app\.css$/, - use: [ - "nativescript-dev-webpack/style-hot-loader", - { loader: "css-loader", options: { url: false } } - ] - }, - { - test: /[\/|\\]app\.scss$/, - use: [ - "nativescript-dev-webpack/style-hot-loader", - { loader: "css-loader", options: { url: false } }, - "sass-loader" - ] - }, - - // Angular components reference css files and their imports using raw-loader - { test: /\.css$/, exclude: /[\/|\\]app\.css$/, use: "raw-loader" }, - { test: /\.scss$/, exclude: /[\/|\\]app\.scss$/, use: ["raw-loader", "resolve-url-loader", "sass-loader"] }, - - { - test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/, - use: [ - "nativescript-dev-webpack/moduleid-compat-loader", - "nativescript-dev-webpack/lazy-ngmodule-hot-loader", - "@ngtools/webpack", - ] - }, - - // Mark files inside `@angular/core` as using SystemJS style dynamic imports. - // Removing this will cause deprecation warnings to appear. - { - test: /[\/\\]@angular[\/\\]core[\/\\].+\.js$/, - parser: { system: true }, - }, - ], - }, - plugins: [ - // Define useful constants like TNS_WEBPACK - new webpack.DefinePlugin({ - "global.TNS_WEBPACK": "true", - "process": "global.process", - }), - // Remove all files from the out dir. - new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }), - // Copy assets to out dir. Add your own globs as needed. - new CopyWebpackPlugin([ - { from: { glob: "fonts/**" } }, - { from: { glob: "**/*.jpg" } }, - { from: { glob: "**/*.png" } }, - ], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }), - new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"), - // For instructions on how to set up workers with webpack - // check out https://github.com/nativescript/worker-loader - new NativeScriptWorkerPlugin(), - ngCompilerPlugin, - // Does IPC communication with the {N} CLI to notify events when running in watch mode. - new nsWebpack.WatchStateLoggerPlugin(), - ], - }; - - if (report) { - // Generate report files for bundles content - config.plugins.push(new BundleAnalyzerPlugin({ - analyzerMode: "static", - openAnalyzer: false, - generateStatsFile: true, - reportFilename: resolve(projectRoot, "report", `report.html`), - statsFilename: resolve(projectRoot, "report", `stats.json`), - })); - } - - if (snapshot) { - config.plugins.push(new nsWebpack.NativeScriptSnapshotPlugin({ - chunk: "vendor", - angular: true, - requireModules: [ - "reflect-metadata", - "@angular/platform-browser", - "@angular/core", - "@angular/common", - "@angular/router", - "nativescript-angular/platform-static", - "nativescript-angular/router", - ], - projectRoot, - webpackConfig: config, - })); - } + return webpack.resolveConfig(); +}; - if (hmr) { - config.plugins.push(new webpack.HotModuleReplacementPlugin()); - } - return config; -};