mirror of
https://github.com/beemdevelopment/Aegis.git
synced 2025-04-19 21:39:18 +00:00
Improve color contrast on hidden codes
This commit is contained in:
parent
9ab949a59e
commit
3d50ab1b65
3 changed files with 9 additions and 1 deletions
|
@ -369,9 +369,11 @@ public class EntryHolder extends RecyclerView.ViewHolder {
|
||||||
public void hideCode() {
|
public void hideCode() {
|
||||||
String code = getOtp();
|
String code = getOtp();
|
||||||
String hiddenText = code.replaceAll("\\S", Character.toString(HIDDEN_CHAR));
|
String hiddenText = code.replaceAll("\\S", Character.toString(HIDDEN_CHAR));
|
||||||
|
stopExpirationAnimation();
|
||||||
|
|
||||||
updateTextViewWithDots(_profileCode, hiddenText, code);
|
updateTextViewWithDots(_profileCode, hiddenText, code);
|
||||||
updateTextViewWithDots(_nextProfileCode, hiddenText, code);
|
updateTextViewWithDots(_nextProfileCode, hiddenText, code);
|
||||||
stopExpirationAnimation();
|
|
||||||
_hidden = true;
|
_hidden = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -384,6 +386,7 @@ public class EntryHolder extends RecyclerView.ViewHolder {
|
||||||
float dotsWidth = paint.measureText(hiddenCode);
|
float dotsWidth = paint.measureText(hiddenCode);
|
||||||
float scaleFactor = codeWidth / dotsWidth;
|
float scaleFactor = codeWidth / dotsWidth;
|
||||||
scaleFactor = (float)(Math.round(scaleFactor * 10.0) / 10.0);
|
scaleFactor = (float)(Math.round(scaleFactor * 10.0) / 10.0);
|
||||||
|
textView.setTextColor(MaterialColors.getColor(textView, R.attr.colorCodeHidden));
|
||||||
|
|
||||||
// If scale is higher or equal to 0.8, do nothing and proceed with the normal text rendering
|
// If scale is higher or equal to 0.8, do nothing and proceed with the normal text rendering
|
||||||
if (scaleFactor >= 0.8) {
|
if (scaleFactor >= 0.8) {
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
<attr name="colorSuccess" />
|
<attr name="colorSuccess" />
|
||||||
<attr name="colorOnSurfaceDim" />
|
<attr name="colorOnSurfaceDim" />
|
||||||
<attr name="colorCode" />
|
<attr name="colorCode" />
|
||||||
|
<attr name="colorCodeHidden" />
|
||||||
|
|
||||||
<declare-styleable name="SlideIndicator">
|
<declare-styleable name="SlideIndicator">
|
||||||
<attr name="dot_radius" format="dimension" />
|
<attr name="dot_radius" format="dimension" />
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
<item name="colorSuccess">@color/aegis_theme_light_success</item>
|
<item name="colorSuccess">@color/aegis_theme_light_success</item>
|
||||||
<item name="colorOnSurfaceDim">@color/aegis_theme_light_onSurfaceDim</item>
|
<item name="colorOnSurfaceDim">@color/aegis_theme_light_onSurfaceDim</item>
|
||||||
<item name="colorCode">?attr/colorPrimary</item>
|
<item name="colorCode">?attr/colorPrimary</item>
|
||||||
|
<item name="colorCodeHidden">?attr/colorOutlineVariant</item>
|
||||||
<!-- Intro colors -->
|
<!-- Intro colors -->
|
||||||
<item name="dot_color">?attr/colorSurfaceVariant</item>
|
<item name="dot_color">?attr/colorSurfaceVariant</item>
|
||||||
<item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
|
<item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
|
||||||
|
@ -132,6 +133,7 @@
|
||||||
<item name="colorSuccess">@color/aegis_theme_dark_success</item>
|
<item name="colorSuccess">@color/aegis_theme_dark_success</item>
|
||||||
<item name="colorOnSurfaceDim">@color/aegis_theme_dark_onSurfaceDim</item>
|
<item name="colorOnSurfaceDim">@color/aegis_theme_dark_onSurfaceDim</item>
|
||||||
<item name="colorCode">?attr/colorPrimary</item>
|
<item name="colorCode">?attr/colorPrimary</item>
|
||||||
|
<item name="colorCodeHidden">?attr/colorOutlineVariant</item>
|
||||||
<!-- Intro colors -->
|
<!-- Intro colors -->
|
||||||
<item name="dot_color">?attr/colorSurfaceVariant</item>
|
<item name="dot_color">?attr/colorSurfaceVariant</item>
|
||||||
<item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
|
<item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
|
||||||
|
@ -159,6 +161,7 @@
|
||||||
<item name="colorSurfaceDim">#000000</item>
|
<item name="colorSurfaceDim">#000000</item>
|
||||||
<item name="colorSurfaceBright">#000000</item>
|
<item name="colorSurfaceBright">#000000</item>
|
||||||
<item name="colorCode">@android:color/white</item>
|
<item name="colorCode">@android:color/white</item>
|
||||||
|
<item name="colorCodeHidden">#2F2F2F</item>
|
||||||
<item name="colorProgressbar">@android:color/white</item>
|
<item name="colorProgressbar">@android:color/white</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -179,6 +182,7 @@
|
||||||
<item name="colorSurfaceDim">#000000</item>
|
<item name="colorSurfaceDim">#000000</item>
|
||||||
<item name="colorSurfaceBright">#000000</item>
|
<item name="colorSurfaceBright">#000000</item>
|
||||||
<item name="colorCode">@android:color/white</item>
|
<item name="colorCode">@android:color/white</item>
|
||||||
|
<item name="colorCodeHidden">#2F2F2F</item>
|
||||||
<item name="colorProgressbar">@android:color/white</item>
|
<item name="colorProgressbar">@android:color/white</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue