Merge pull request #286 from tidev/230504_update

feat(android): library update, toColor fix
tidev · May 13, 2023 · beb16cc · beb16cc
2 parents d21841f + e44978e
commit beb16cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,4 +1,4 @@
 
 dependencies {
-	implementation 'androidx.browser:browser:1.4.0'
+	implementation 'androidx.browser:browser:1.5.0'
 }
diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.2.0
+version: 2.3.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-web-dialog

diff --git a/android/src/ti/webdialog/Utils.java b/android/src/ti/webdialog/Utils.java
@@ -65,7 +65,7 @@ public static boolean getBool(KrollDict options, String key)
 	public static int getColor(KrollDict options, String key)
 	{
 		if (options.containsKeyAndNotNull(key)) {
-			return TiConvert.toColor((String) options.get(key));
+			return TiConvert.toColor((String) options.get(key), TiApplication.getAppCurrentActivity());
 
 		} else {
 			return getR("color.colorPrimary");