diff --git a/app/src/main/java/net/gsantner/markor/format/csv/CsvSyntaxHighlighter.java b/app/src/main/java/net/gsantner/markor/format/csv/CsvSyntaxHighlighter.java index 5abb88104..5cf628254 100644 --- a/app/src/main/java/net/gsantner/markor/format/csv/CsvSyntaxHighlighter.java +++ b/app/src/main/java/net/gsantner/markor/format/csv/CsvSyntaxHighlighter.java @@ -13,6 +13,7 @@ import net.gsantner.markor.format.markdown.MarkdownSyntaxHighlighter; import net.gsantner.markor.model.AppSettings; import net.gsantner.opoc.format.GsTextUtils; +import net.gsantner.opoc.util.GsContextUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -25,7 +26,7 @@ public class CsvSyntaxHighlighter extends MarkdownSyntaxHighlighter { // dkgray is not much different from black and not readable with black background // blue is difficuilt to read on black background private static final int[] COLUMN_COLORS = { - Color.RED, Color.rgb(150, 150, 255), Color.MAGENTA, + Color.RED, GsContextUtils.rgb(150, 150, 255), Color.MAGENTA, 0xff00b04c, // dark green, 0xffdaa500}; // brown private static final String TAG = CsvSyntaxHighlighter.class.getSimpleName(); diff --git a/app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java b/app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java index 0bf47e2e0..b344f429a 100644 --- a/app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java +++ b/app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java @@ -609,6 +609,17 @@ public boolean shouldColorOnTopBeLight(@ColorInt final int colorOnBottomInt) { + (0.114 * Color.blue(colorOnBottomInt))))); } + @ColorInt + public static int rgb(final int r, final int g, final int b) { + return argb(255, r, g, b); + } + + @ColorInt + public static int argb(final int a, final int r, final int g, final int b) { + return (Math.max(0, Math.min(255, a)) << 24) | (Math.max(0, Math.min(255, r)) << 16) | (Math.max(0, Math.min(255, g)) << 8) | Math.max(0, Math.min(255, b)); + } + + /** * Convert a html string to an android {@link Spanned} object */ @@ -853,7 +864,7 @@ public Bitmap drawTextOnDrawable(final Context context, @DrawableRes final int d bitmap = bitmap.copy(bitmap.getConfig(), true); Canvas canvas = new Canvas(bitmap); Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); - paint.setColor(Color.rgb(61, 61, 61)); + paint.setColor(GsContextUtils.rgb(61, 61, 61)); paint.setTextSize((int) (textSize * scale)); paint.setShadowLayer(1f, 0f, 1f, Color.WHITE);