From b06ad8ed9706a9abc98dc0751cbdb1050b6d62d2 Mon Sep 17 00:00:00 2001 From: Landsbankinn Date: Tue, 13 Mar 2018 11:48:15 +0000 Subject: [PATCH] CB-13696 fixing for PR --- .gitignore | 9 ++++++++- README.md | 3 ++- src/android/InAppBrowser.java | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 95d76e1..4474e73 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,11 @@ Thumbs.db *.user node_modules -.idea + + + + + + + + diff --git a/README.md b/README.md index 61a23b0..6c3777a 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ instance, or the system browser. All platforms support: - __location__: Set to `yes` or `no` to turn the `InAppBrowser`'s location bar on or off. + - __lefttoright__: Set to `yes` to swap position of the navigation buttons and the close button. Android supports these additional options: @@ -115,7 +116,7 @@ instance, or the system browser. - __closebuttoncaption__: set to a string to use as the close button's caption instead of a X. Note that you need to localize this value yourself. - __closebuttoncolor__: set to a valid hex color string, for example: `#00ff00`, and it will change the close button color from default, regardless of being a text or default X. Only has effect if user has location set to `yes`. - - __footer__: set to `yes` to show a close button in the footer similar to the iOS __Done__ button. + - __footer__: set to `yes` to show a close button in the footer similar to the iOS __Done__ button. The close button will appear the same as for the header hence use __closebuttoncaption__ and __closebuttoncolor__ to set its properties. - __footercolor__: set to a valid hex color string, for example `#00ff00` or `#CC00ff00` (`#aarrggbb`) , and it will change the footer color from default. Only has effect if user has __footer__ set to `yes`. diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java index 69119cc..a73f766 100644 --- a/src/android/InAppBrowser.java +++ b/src/android/InAppBrowser.java @@ -6,7 +6,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY