Merge pull request #175 from m1ga/master

feat(android): update library
tidev · Mar 27, 2022 · 4d9ec93 · 4d9ec93
2 parents 8a1cc9d + 09885eb
commit 4d9ec93
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,4 +1,4 @@
 
 dependencies {
-	implementation 'androidx.browser:browser:1.2.0'
+	implementation 'androidx.browser:browser:1.4.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.0.0
+version: 2.1.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-web-dialog

diff --git a/android/src/ti/webdialog/TitaniumWebDialogModule.java b/android/src/ti/webdialog/TitaniumWebDialogModule.java
@@ -17,6 +17,7 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.util.DisplayMetrics;
+import androidx.browser.customtabs.CustomTabColorSchemeParams;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.browser.customtabs.CustomTabsService;
 import java.util.ArrayList;
@@ -65,7 +66,9 @@ private void openCustomTab(Context context, List<String> customTabBrowsers, Krol
 
 		int barColor = Utils.getColor(options, Params.BAR_COLOR);
 		if (barColor != -1) {
-			builder.setToolbarColor(barColor);
+			CustomTabColorSchemeParams params =
+				new CustomTabColorSchemeParams.Builder().setToolbarColor(barColor).build();
+			builder.setDefaultColorSchemeParams(params);
 		}
 
 		// set start and exit animations
@@ -76,12 +79,12 @@ private void openCustomTab(Context context, List<String> customTabBrowsers, Krol
 
 		// hide navigation bar on scroll
 		if (Utils.getBool(options, Params.BAR_COLLAPSING_ENABLED)) {
-			builder.enableUrlBarHiding();
+			builder.setUrlBarHidingEnabled(true);
 		}
 
 		//enable Share link option
 		if (Utils.getBool(options, Params.ENABLE_SHARING)) {
-			builder.addDefaultShareMenuItem();
+			builder.setShareState(CustomTabsIntent.SHARE_STATE_ON);
 		}
 
 		String closeIcon = Utils.getString(options, Params.CLOSE_ICON);

diff --git a/android/src/ti/webdialog/Utils.java b/android/src/ti/webdialog/Utils.java
@@ -47,7 +47,7 @@ public static int[] getStyleableIntArray(String packageName, String name)
 	// return the list of all available & enabled browsers in device
 	public static List<ResolveInfo> allBrowsers(Context context)
 	{
-		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.testingurl.com"));
+		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://localhost"));
 		return context.getPackageManager().queryIntentActivities(intent, 0);
 	}
 

diff --git a/android/timodule.xml b/android/timodule.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:module xmlns:ti="http://ti.appcelerator.org" xmlns:android="http://schemas.android.com/apk/res/android">
-	<!--
-		Similar to tiapp.xml, but contains module/platform specific
-		configuration in <iphone>, <android>, and <mobileweb> sections
-	-->
-	<iphone>
-	</iphone>
+	<!-- Similar to tiapp.xml, but contains module/platform specific configuration in <iphone>, <android>, and <mobileweb> sections -->
+	<iphone></iphone>
 	<android xmlns:android="http://schemas.android.com/apk/res/android">
+		<manifest>
+			<queries>
+				<intent>
+					<action android:name="android.intent.action.VIEW"/>
+					<data android:scheme="http"/>
+				</intent>
+			</queries>
+		</manifest>
 	</android>
 </ti:module>