Fix Android Activity issue closing the browser and restoring the state, fixed issue with the auth redirection

Author: jdnichollsc

.gitignore

@@ -10,7 +10,7 @@ src/*.d.ts
 !src/references.d.ts
 !src/scripts/*.js
 !seed-tests/*.js
-seed-tests/seed-copy/**/*.*
+seed-tests/seed-copy
 seed-tests/seed-copy-new-git-repo/**/*.*
 !demo/karma.conf.js
 !demo/app/tests/*.js

.travis.yml

@@ -9,7 +9,7 @@ matrix:
       os: osx
       env:
         - WebPack="iOS"
-      osx_image: xcode10.0
+      osx_image: xcode10.2
       language: node_js 
       node_js: "10"
       jdk: oraclejdk8
@@ -33,57 +33,45 @@ matrix:
       env: 
         - BuildiOS="12"
         - Xcode="10.0"
-      osx_image: xcode10.0
+      osx_image: xcode10.2
       language: node_js 
       node_js: "10"
       jdk: oraclejdk8
       script: 
         - cd src && npm i && npm run tsc && cd ../demo && tns build ios
-    # - os: linux
-    #   language: android
-    #   dist: precise
-    #   sudo: required
-    #   jdk: oraclejdk8
-    #   before_script:
-    #     - android list targets
-    #     - echo no | android create avd --force -n test -t android-19 -b armeabi-v7a
-    #     - emulator -avd test -no-skin -no-audio -no-window &
-    #     - android-wait-for-emulator
-    #   before_install:
-    #     - nvm install 8
-    #   script: cd src && npm run test.android
-    # - os: osx
-    #   language: node_js
-    #   node_js: "10"
-    #   jdk: oraclejdk8
-    #   osx_image: xcode10.0
-    #   script: cd src && npm run test.ios
+    - os: linux
+      language: android
+      dist: precise
+      sudo: required
+      jdk: oraclejdk8
+      before_script:
+        - echo no | android create avd --force -n test -t android-21 -b armeabi-v7a
+        - emulator -avd test -no-audio -no-window &
+        - android-wait-for-emulator
+      before_install:
+        - nvm install 10
+      script: cd src && npm run test.android
+    - os: osx
+      language: node_js
+      node_js: "10"
+      jdk: oraclejdk8
+      osx_image: xcode10.2
+      script: cd src && npm run test.ios
 
 android:
   components:
-    # Uncomment the lines below if you want to
-    # use the latest revision of Android SDK Tools
     - tools
     - platform-tools
-    # The BuildTools version used by your project
     - build-tools-28.0.3
-    # The SDK version used to compile your project
     - android-28
-    # Additional components
     - extra-android-m2repository
-    # Specify at least one system image,
-    # if you need to run emulator(s) during your tests
-    # - sys-img-x86-android-28
-    - sys-img-armeabi-v7a-android-28
-
-    - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
+    - sys-img-armeabi-v7a-android-21
 
 before_install:
     - sudo pip install --upgrade pip
     - sudo pip install six
 
 install:
-    - echo no | npm install -g typescript
     - echo no | npm install -g nativescript
     - tns usage-reporting disable
     - tns error-reporting disable

CHANGELOG.md

@@ -22,9 +22,15 @@ in case of vulnerabilities.
 
 ## [Unreleased]
 
-## [2.0.1] - 2019-10-15
+## [2.1.0] - 2019-11-13
+### Added
+- Added support for `automatic` modal presentation style from **iOS**.
+- Added `enableBarCollapsing` option to determines whether the browser's tool bars will collapse or not from **iOS**.
+
 ### Fixed
-- **iOS:** Conform to the new iOS 13 API for ASWebAuthenticationSession. ASWebAuthenticationSession now requires a delegate that provides a display context for the authentication session. [#14](https://github.com/proyecto26/nativescript-inappbrowser/issues/14) 
+- Fixed issue with `ASWebAuthenticationSession` to support **iOS 13** by [@cgoboncan-ebsi](https://github.com/cgoboncan-ebsi) [#14](https://github.com/proyecto26/nativescript-inappbrowser/issues/14).
+- Fixed **Android** Activity issue closing the browser and restoring the state by using `onSaveInstanceState`
+- Fixed Android auth redirection by using `AndroidApplication.activityResumedEvent`.
 
 ## [2.0.0] - 2019-07-27
 ### Added
@@ -46,6 +52,7 @@ in case of vulnerabilities.
 - Methods to open and close external urls to authenticate the user **(openAuth, closeAuth)** using deep linking.
 - `isAvailable` method to detect if the device supports the plugin.
 
-[Unreleased]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v2.0.0...HEAD
+[Unreleased]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v2.1.0...HEAD
+[2.1.0]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v1.0.0...v2.0.0
 [1.0.0]: https://github.com/proyecto26/nativescript-inappbrowser/releases/tag/v1.0.0

README.md

@@ -41,6 +41,8 @@
 tns plugin add nativescript-inappbrowser
 ```
 
+
+
 ## Usage
 
 Methods       | Action
@@ -60,9 +62,10 @@ Property       | Description
 `preferredControlTintColor` (String) | The color to tint the control buttons on the navigation bar and the toolbar. [`gray`/`#808080`]
 `readerMode` (Boolean)               | A value that specifies whether Safari should enter Reader mode, if it is available. [`true`/`false`]
 `animated` (Boolean)                 | Animate the presentation. [`true`/`false`]
-`modalPresentationStyle` (String)    | The presentation style for modally presented view controllers. [`none`/`fullScreen`/`pageSheet`/`formSheet`/`currentContext`/`custom`/`overFullScreen`/`overCurrentContext`/`popover`]
+`modalPresentationStyle` (String)    | The presentation style for modally presented view controllers. [`automatic`/`none`/`fullScreen`/`pageSheet`/`formSheet`/`currentContext`/`custom`/`overFullScreen`/`overCurrentContext`/`popover`]
 `modalTransitionStyle` (String)      | The transition style to use when presenting the view controller. [`coverVertical`/`flipHorizontal`/`crossDissolve`/`partialCurl`]
 `modalEnabled` (Boolean)             | Present the **SafariViewController** modally or as push instead. [`true`/`false`]
+`enableBarCollapsing` (Boolean)      | Determines whether the browser's tool bars will collapse or not. [`true`/`false`]
 
 ### Android Options
 Property       | Description
@@ -95,9 +98,10 @@ import InAppBrowser from 'nativescript-inappbrowser'
           preferredControlTintColor: 'white',
           readerMode: false,
           animated: true,
-          modalPresentationStyle: 'overFullScreen',
+          modalPresentationStyle: 'fullScreen',
           modalTransitionStyle: 'partialCurl',
           modalEnabled: true,
+          enableBarCollapsing: false,
           // Android Properties
           showTitle: true,
           toolbarColor: '#6200EE',

demo/.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.ts]
+indent_style = space
+indent_size = 4

demo/.gitignore

@@ -0,0 +1,33 @@
+# NativeScript
+hooks/
+node_modules/
+platforms/
+
+# NativeScript Template
+*.js.map
+*.js
+!webpack.config.js
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+.idea
+.cloud
+.project
+tmp/
+typings/
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json

demo/app/App_Resources/Android/app.gradle

@@ -1,10 +1,20 @@
 // Add your native dependencies here:
 
-android {  
-  defaultConfig {  
+// Uncomment to add recyclerview-v7 dependency
+//dependencies {
+//	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 17
     generatedDensities = []
-  }  
-  aaptOptions {  
-    additionalParameters "--no-version-vectors"  
-  }  
-} 
+  }
+  aaptOptions {
+    additionalParameters "--no-version-vectors"
+  }
+}

demo/app/App_Resources/Android/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
 		android:xlargeScreens="true"/>
 
 	<uses-sdk
-		android:minSdkVersion="17"
+		android:minSdkVersion="19"
 		android:targetSdkVersion="__APILEVEL__"/>
 
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -23,12 +23,13 @@
 		android:allowBackup="true"
 		android:icon="@drawable/icon"
 		android:label="@string/app_name"
-		android:theme="@style/AppTheme">
+		android:theme="@style/AppTheme"
+		android:launchMode="singleTask">
 
 		<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" />