Merge branch 'master' into feat/is-enabled-prop

Author: m-abs

demo/app/App_Resources/Android-Pre-v4/AndroidManifest.xml

@@ -2,12 +2,16 @@
 
 // Uncomment to add recyclerview-v7 dependency
 //dependencies {
-//	compile 'com.android.support:recyclerview-v7:+'
+//	implementation 'com.android.support:recyclerview-v7:+'
 //}
 
+// 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 {
-    minSdkVersion 19
+    minSdkVersion 17
     generatedDensities = []
   }
   aaptOptions {

demo/app/App_Resources/Android-Pre-v4/app.gradle

@@ -10,10 +10,6 @@
 		android:largeScreens="true"
 		android:xlargeScreens="true"/>
 
-	<uses-sdk
-		android:minSdkVersion="19"
-		android:targetSdkVersion="__APILEVEL__"/>
-
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
@@ -29,7 +25,7 @@
 		<activity
 			android:name="com.tns.NativeScriptActivity"
 			android:label="@string/title_activity_kimera"
-			android:configChanges="keyboardHidden|orientation|screenSize"
+			android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
 			android:theme="@style/LaunchScreenTheme">
 
 			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />

demo/app/App_Resources/Android-Pre-v4/drawable-hdpi/background.png

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Application theme -->
-    <style name="AppTheme" parent="AppThemeBase">
+    <style name="AppThemeBase21" parent="AppThemeBase">
+        <item name="android:windowTranslucentStatus">true</item>
         <item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
         <item name="android:timePickerStyle">@style/SpinnerTimePicker</item>
     </style>
 
+    <style name="AppTheme" parent="AppThemeBase21">
+    </style>
+
     <!-- Default style for DatePicker - in spinner mode -->
     <style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
         <item name="android:datePickerMode">spinner</item>
@@ -19,5 +23,6 @@
 
     <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
         <item name="android:elevation">4dp</item>
-    </style>    
+        <item name="android:paddingTop">24dp</item>
+    </style>
 </resources>

demo/app/App_Resources/Android-Pre-v4/drawable-hdpi/icon.png

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Application theme -->
+    <style name="AppThemeBase29" parent="AppThemeBase21">
+        <item name="android:forceDarkAllowed">true</item>
+    </style>
+
+    <style name="AppTheme" parent="AppThemeBase29">
+    </style>
+
+</resources>

demo/app/App_Resources/Android-Pre-v4/drawable-hdpi/logo.png

@@ -10,8 +10,8 @@
         <item name="colorAccent">@color/ns_accent</item>
 
         <item name="android:windowBackground">@drawable/splash_screen</item>
-        
-        <item name="android:windowActionBarOverlay">true</item>  
+
+        <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowTranslucentStatus">true</item>
 
     </style>
@@ -32,7 +32,7 @@
     <style name="AppTheme" parent="AppThemeBase">
     </style>
 
-    <!-- theme for actioon-bar -->
+    <!-- theme for action-bar -->
     <style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
         <item name="android:background">@color/ns_primary</item>
         <item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
@@ -42,4 +42,4 @@
 
     <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
     </style>
-</resources> 
+</resources>

demo/app/App_Resources/Android-Pre-v4/drawable-ldpi/background.png

@@ -1,5 +1,17 @@
 {
   "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -30,18 +42,6 @@
       "filename" : "[email protected]",
       "scale" : "3x"
     },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "icon-57.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
     {
       "size" : "60x60",
       "idiom" : "iphone",
@@ -55,51 +55,39 @@
       "scale" : "3x"
     },
     {
-      "size" : "29x29",
+      "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "icon-29.png",
+      "filename" : "icon-20.png",
       "scale" : "1x"
     },
     {
-      "size" : "29x29",
+      "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "icon-29@2x.png",
+      "filename" : "icon-20@2x.png",
       "scale" : "2x"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-40.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "50x50",
+      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon-50.png",
+      "filename" : "icon-29.png",
       "scale" : "1x"
     },
     {
-      "size" : "50x50",
+      "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon-50@2x.png",
+      "filename" : "icon-29@2x.png",
       "scale" : "2x"
     },
     {
-      "size" : "72x72",
+      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "icon-72.png",
+      "filename" : "icon-40.png",
       "scale" : "1x"
     },
     {
-      "size" : "72x72",
+      "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "icon-72@2x.png",
+      "filename" : "icon-40@2x.png",
       "scale" : "2x"
     },
     {
@@ -119,6 +107,12 @@
       "idiom" : "ipad",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "icon-1024.png",
+      "scale" : "1x"
     }
   ],
   "info" : {