From 19aa4c26ecbb49c2917562446aebf65f342cae67 Mon Sep 17 00:00:00 2001 From: Thomas Vidas Date: Mon, 14 Dec 2020 15:34:44 -0500 Subject: [PATCH 1/2] Change all Color.parseColor() to WebColor.parseColor() --- .../com/capacitorjs/plugins/actionsheet/ActionSheet.java | 7 +++---- .../com/capacitorjs/plugins/browser/BrowserPlugin.java | 4 ++-- .../com/capacitorjs/plugins/statusbar/StatusBarPlugin.java | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java b/action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java index 89c6d38dc..b876bfb5a 100644 --- a/action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java +++ b/action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java @@ -3,14 +3,13 @@ import android.annotation.SuppressLint; import android.app.Dialog; import android.content.DialogInterface; -import android.graphics.Color; import android.view.View; -import android.view.Window; import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.coordinatorlayout.widget.CoordinatorLayout; import com.getcapacitor.Logger; +import com.getcapacitor.util.WebColor; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; @@ -88,7 +87,7 @@ public void setupDialog(Dialog dialog, int style) { layout.setOrientation(LinearLayout.VERTICAL); layout.setPadding(layoutPaddingPx16, layoutPaddingPx16, layoutPaddingPx16, layoutPaddingPx16); TextView ttv = new TextView(getContext()); - ttv.setTextColor(Color.parseColor("#757575")); + ttv.setTextColor(WebColor.parseColor("#757575")); ttv.setPadding(layoutPaddingPx8, layoutPaddingPx8, layoutPaddingPx8, layoutPaddingPx8); ttv.setText(title); layout.addView(ttv); @@ -97,7 +96,7 @@ public void setupDialog(Dialog dialog, int style) { final int optionIndex = i; TextView tv = new TextView(getContext()); - tv.setTextColor(Color.parseColor("#000000")); + tv.setTextColor(WebColor.parseColor("#000000")); tv.setPadding(layoutPaddingPx12, layoutPaddingPx12, layoutPaddingPx12, layoutPaddingPx12); tv.setText(options[i].getTitle()); tv.setOnClickListener( diff --git a/browser/android/src/main/java/com/capacitorjs/plugins/browser/BrowserPlugin.java b/browser/android/src/main/java/com/capacitorjs/plugins/browser/BrowserPlugin.java index 122aca185..9cdf4fc37 100644 --- a/browser/android/src/main/java/com/capacitorjs/plugins/browser/BrowserPlugin.java +++ b/browser/android/src/main/java/com/capacitorjs/plugins/browser/BrowserPlugin.java @@ -1,12 +1,12 @@ package com.capacitorjs.plugins.browser; -import android.graphics.Color; import android.net.Uri; import com.getcapacitor.Logger; import com.getcapacitor.Plugin; import com.getcapacitor.PluginCall; import com.getcapacitor.PluginMethod; import com.getcapacitor.annotation.CapacitorPlugin; +import com.getcapacitor.util.WebColor; @CapacitorPlugin(name = "Browser") public class BrowserPlugin extends Plugin { @@ -42,7 +42,7 @@ public void open(PluginCall call) { String colorString = call.getString("toolbarColor"); Integer toolbarColor = null; if (colorString != null) try { - toolbarColor = Color.parseColor(colorString); + toolbarColor = WebColor.parseColor(colorString); } catch (IllegalArgumentException ex) { Logger.error(getLogTag(), "Invalid color provided for toolbarColor. Using default", null); } diff --git a/status-bar/android/src/main/java/com/capacitorjs/plugins/statusbar/StatusBarPlugin.java b/status-bar/android/src/main/java/com/capacitorjs/plugins/statusbar/StatusBarPlugin.java index 1fc1d37ce..becddb039 100644 --- a/status-bar/android/src/main/java/com/capacitorjs/plugins/statusbar/StatusBarPlugin.java +++ b/status-bar/android/src/main/java/com/capacitorjs/plugins/statusbar/StatusBarPlugin.java @@ -1,11 +1,11 @@ package com.capacitorjs.plugins.statusbar; -import android.graphics.Color; import com.getcapacitor.JSObject; import com.getcapacitor.Plugin; import com.getcapacitor.PluginCall; import com.getcapacitor.PluginMethod; import com.getcapacitor.annotation.CapacitorPlugin; +import com.getcapacitor.util.WebColor; @CapacitorPlugin(name = "StatusBar") public class StatusBarPlugin extends Plugin { @@ -46,7 +46,7 @@ public void setBackgroundColor(final PluginCall call) { .executeOnMainThread( () -> { try { - final int parsedColor = Color.parseColor(color.toUpperCase()); + final int parsedColor = WebColor.parseColor(color.toUpperCase()); implementation.setBackgroundColor(parsedColor); call.resolve(); } catch (IllegalArgumentException ex) { From 82820ebf6fcdfa3db9f69f1550f2f3bb7bd51481 Mon Sep 17 00:00:00 2001 From: Thomas Vidas Date: Thu, 17 Dec 2020 00:23:02 -0500 Subject: [PATCH 2/2] Use normal Color.parse for non-web colors --- .../com/capacitorjs/plugins/actionsheet/ActionSheet.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java b/action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java index b876bfb5a..2690ea396 100644 --- a/action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java +++ b/action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java @@ -3,13 +3,13 @@ import android.annotation.SuppressLint; import android.app.Dialog; import android.content.DialogInterface; +import android.graphics.Color; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.coordinatorlayout.widget.CoordinatorLayout; import com.getcapacitor.Logger; -import com.getcapacitor.util.WebColor; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; @@ -87,7 +87,7 @@ public void setupDialog(Dialog dialog, int style) { layout.setOrientation(LinearLayout.VERTICAL); layout.setPadding(layoutPaddingPx16, layoutPaddingPx16, layoutPaddingPx16, layoutPaddingPx16); TextView ttv = new TextView(getContext()); - ttv.setTextColor(WebColor.parseColor("#757575")); + ttv.setTextColor(Color.parseColor("#757575")); ttv.setPadding(layoutPaddingPx8, layoutPaddingPx8, layoutPaddingPx8, layoutPaddingPx8); ttv.setText(title); layout.addView(ttv); @@ -96,7 +96,7 @@ public void setupDialog(Dialog dialog, int style) { final int optionIndex = i; TextView tv = new TextView(getContext()); - tv.setTextColor(WebColor.parseColor("#000000")); + tv.setTextColor(Color.parseColor("#000000")); tv.setPadding(layoutPaddingPx12, layoutPaddingPx12, layoutPaddingPx12, layoutPaddingPx12); tv.setText(options[i].getTitle()); tv.setOnClickListener(