Skip to content

Commit

Permalink
Merge pull request #78 from proyecto26/develop
Browse files Browse the repository at this point in the history
Release 3.1.1
  • Loading branch information
jdnichollsc authored Jun 28, 2021
2 parents 349f610 + e70e9f4 commit 1ef45c6
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 12 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ in case of vulnerabilities.

## [Unreleased]

## [3.1.1] - 2021-06-28

### Fixed
- Fix issues with `navigationBarColor` and `navigationBarDividerColor` Android options.

## [3.1.0] - 2021-06-27

### Added
Expand Down Expand Up @@ -97,7 +102,8 @@ 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/v3.1.0...HEAD
[Unreleased]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v3.1.1...HEAD
[3.1.1]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v3.1.0...v3.1.1
[3.1.0]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v3.0.2...v3.1.0
[3.0.2]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v3.0.1...v3.0.2
[3.0.1]: https://github.com/proyecto26/nativescript-inappbrowser/compare/v3.0.0...v3.0.1
Expand Down
4 changes: 2 additions & 2 deletions src/InAppBrowser.android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ function setup() {
if (colorString) {
const color = tryParseColor(colorString, 'Invalid navigation bar color');
if (color) {
builder.setSecondaryToolbarColor(color.android);
builder.setNavigationBarColor(color.android);
}
}
colorString = inAppBrowserOptions[InAppBrowserModule.KEY_NAVIGATION_BAR_DIVIDER_COLOR];
if (colorString) {
const color = tryParseColor(colorString, 'Invalid navigation bar divider color');
if (color) {
builder.setSecondaryToolbarColor(color.android);
builder.setNavigationBarDividerColor(color.android);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nativescript-inappbrowser",
"version": "3.1.0",
"version": "3.1.1",
"description": "InAppBrowser for NativeScript",
"main": "InAppBrowser",
"typings": "index.d.ts",
Expand All @@ -15,6 +15,7 @@
"url": "https://github.com/proyecto26/nativescript-inappbrowser.git"
},
"scripts": {
"setup": "npm i && ts-patch install",
"tsc": "npm i && ts-patch install && tsc",
"build": "npm run tsc && npm run build.native",
"build.native": "node scripts/build-native.js",
Expand Down
12 changes: 6 additions & 6 deletions src/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"noImplicitUseStrict": false,
"noFallthroughCasesInSwitch": true,
"baseUrl": ".",
"plugins": [
{
"transform": "@nativescript/webpack/transformers/ns-transform-native-classes",
"type": "raw"
}
]
"plugins": [
{
"transform": "@nativescript/webpack/transformers/ns-transform-native-classes",
"type": "raw"
}
]
},
"exclude": [
"node_modules"
Expand Down
4 changes: 4 additions & 0 deletions src/types/android.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ declare namespace android {
setShowTitle(showTitle: boolean): this;
setToolbarColor(color: number): this;
setSecondaryToolbarColor(color: number): this;
setNavigationBarColor(color: number): this;
setNavigationBarDividerColor(color: number): this;
addDefaultShareMenuItem(): this;
enableUrlBarHiding(): this;
setStartAnimations(context: android.content.Context, enterResId: number, exitResId: number): this;
Expand Down Expand Up @@ -51,6 +53,8 @@ declare namespace androidx {
setShowTitle(showTitle: boolean): this;
setToolbarColor(color: number): this;
setSecondaryToolbarColor(color: number): this;
setNavigationBarColor(color: number): this;
setNavigationBarDividerColor(color: number): this;
addDefaultShareMenuItem(): this;
enableUrlBarHiding(): this;
setStartAnimations(context: android.content.Context, enterResId: number, exitResId: number): this;
Expand Down

0 comments on commit 1ef45c6

Please sign in to comment.