Merge pull request #87 from Sweetsound/2ch-emoji-captcha-force-white-bg

Fix 2ch emoji_captcha for dark theme

Author: TrixiEther

extensions/dvach/src/com/mishiranu/dashchan/chan/dvach/DvachEmojiCaptchaProvider.java

@@ -101,6 +101,8 @@ private ChanPerformer.ReadCaptchaResult solveEmojiCaptchaLoop(
                 int maxSize = Math.max(origKeyIcon.getHeight(), origKeyIcon.getWidth());
                 Bitmap keyBitmap = Bitmap.createBitmap(maxSize, maxSize, Bitmap.Config.ARGB_8888);
                 Canvas keyCanvas = new Canvas(keyBitmap);
+                // set key background to white so the black icon would not overlap with dark theme
+                keyCanvas.drawARGB(255, 255, 255, 255);
                 int x = Math.max((origKeyIcon.getHeight() - origKeyIcon.getWidth()) / 2, 0);
                 int y = Math.max((origKeyIcon.getWidth() - origKeyIcon.getHeight()) / 2, 0);
                 keyCanvas.drawBitmap(origKeyIcon, x, y, null);
@@ -227,6 +229,12 @@ private Bitmap createTaskWithSelectedBitmap(Bitmap captchaImage, SelectedEmojis
         comboBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         Canvas comboImage = new Canvas(comboBitmap);
 
+        // Ensure that captcha has white background, so we will have black
+        // selected icons on white canvas, despite of app theme
+        if (!selected.bitmaps.isEmpty()) {
+            comboImage.drawARGB(255, 255, 255, 255);
+        }
+
         for (int i = 0; i < selected.bitmaps.size(); i++) {
             comboImage.drawBitmap(selected.bitmaps.get(i),
                     i * SelectedEmojis.SIZE_WITH_PADDING, 0f, null);