Skip to content

Commit 4f602ae

Browse files
committed
Fix unit tests - Color.rgb is Android only API and not available in junit -> own method
1 parent 7345b99 commit 4f602ae

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

Diff for: app/src/main/java/net/gsantner/markor/format/csv/CsvSyntaxHighlighter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.gsantner.markor.format.markdown.MarkdownSyntaxHighlighter;
1414
import net.gsantner.markor.model.AppSettings;
1515
import net.gsantner.opoc.format.GsTextUtils;
16+
import net.gsantner.opoc.util.GsContextUtils;
1617

1718
import org.apache.commons.lang3.ArrayUtils;
1819
import org.apache.commons.lang3.StringUtils;
@@ -25,7 +26,7 @@ public class CsvSyntaxHighlighter extends MarkdownSyntaxHighlighter {
2526
// dkgray is not much different from black and not readable with black background
2627
// blue is difficuilt to read on black background
2728
private static final int[] COLUMN_COLORS = {
28-
Color.RED, Color.rgb(150, 150, 255), Color.MAGENTA,
29+
Color.RED, GsContextUtils.rgb(150, 150, 255), Color.MAGENTA,
2930
0xff00b04c, // dark green,
3031
0xffdaa500}; // brown
3132
private static final String TAG = CsvSyntaxHighlighter.class.getSimpleName();

Diff for: app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,17 @@ public boolean shouldColorOnTopBeLight(@ColorInt final int colorOnBottomInt) {
609609
+ (0.114 * Color.blue(colorOnBottomInt)))));
610610
}
611611

612+
@ColorInt
613+
public static int rgb(final int r, final int g, final int b) {
614+
return argb(255, r, g, b);
615+
}
616+
617+
@ColorInt
618+
public static int argb(final int a, final int r, final int g, final int b) {
619+
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));
620+
}
621+
622+
612623
/**
613624
* Convert a html string to an android {@link Spanned} object
614625
*/
@@ -853,7 +864,7 @@ public Bitmap drawTextOnDrawable(final Context context, @DrawableRes final int d
853864
bitmap = bitmap.copy(bitmap.getConfig(), true);
854865
Canvas canvas = new Canvas(bitmap);
855866
Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
856-
paint.setColor(Color.rgb(61, 61, 61));
867+
paint.setColor(GsContextUtils.rgb(61, 61, 61));
857868
paint.setTextSize((int) (textSize * scale));
858869
paint.setShadowLayer(1f, 0f, 1f, Color.WHITE);
859870

0 commit comments

Comments
 (0)