Skip to content

Commit

Permalink
Captcha in dark view
Browse files Browse the repository at this point in the history
In dark theme captcha is showing in white background with some white
 space, resolved by using css filters

close: #7981

Co-authored-by: paw <paw-hub@users.noreply.github.com>
  • Loading branch information
BijinDev and paw-hub committed Nov 21, 2024
1 parent b82e3c2 commit a34a548
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
14 changes: 11 additions & 3 deletions src/common/gui/base/Color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,20 @@ export function isValidColorCode(colorCode: string): boolean {
return VALID_HEX_CODE_FORMAT.test(colorCode)
}

export function isColorLight(c: string): boolean {
export function getColorLuminance(c: string): number {
const { r, g, b } = hexToRgb(c)
// Counting the perceptive luminance
// human eye favors green color...
const a = 1 - (0.299 * r + 0.587 * g + 0.114 * b) / 255
return a < 0.5
return (0.299 * r + 0.587 * g + 0.114 * b) / 255
}

export function isMonochrome(c: string): boolean {
const { r, g, b } = hexToRgb(c)
return r == g && g == b
}

export function isColorLight(c: string): boolean {
return getColorLuminance(c) > 0.5
}

export function hexToRgb(colorCode: string): {
Expand Down
13 changes: 12 additions & 1 deletion src/common/subscription/Captcha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { lang } from "../misc/LanguageViewModel.js"
import m, { Children } from "mithril"
import { TextField } from "../gui/base/TextField.js"
import { uint8ArrayToBase64 } from "@tutao/tutanota-utils"
import { theme } from "../gui/theme"
import { getColorLuminance, isMonochrome } from "../gui/base/Color"

/**
* Accepts multiple formats for a time of day and always returns 12h-format with leading zeros.
Expand Down Expand Up @@ -142,12 +144,21 @@ function showCaptchaDialog(challenge: Uint8Array, token: string): Promise<string

dialog = new Dialog(DialogType.EditSmall, {
view: (): Children => {
// The captcha is black-on-white, which will not look correct on anything where the background is not
// white. We can use CSS filters to fix this.
let captchaFilter = {}
if (theme.elevated_bg != null && isMonochrome(theme.elevated_bg)) {
captchaFilter = {
filter: `invert(${1.0 - getColorLuminance(theme.elevated_bg)}`,
}
}
return [
m(DialogHeaderBar, actionBarAttrs),
m(".plr-l.pb", [
m("img.mt-l", {
m("img.pt-ml.center-h.block", {
src: imageData,
alt: lang.get("captchaDisplay_label"),
style: captchaFilter,
}),
m(TextField, {
label: () => lang.get("captchaInput_label") + " (hh:mm)",
Expand Down

0 comments on commit a34a548

Please sign in to comment.