From fc96e7919a958f3d4f91e381f00828d8c73377cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Thu, 26 Dec 2019 23:25:05 +0100
Subject: [PATCH] Replace changelog css colors

---
 app/src/main/assets/changelog.html            | 169 +++++++++---------
 .../aegis/ui/ChangelogDialog.java             |   8 +-
 2 files changed, 91 insertions(+), 86 deletions(-)
diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 5743bb78..a22bbb1a 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -1,85 +1,86 @@
 <html>
-<head>
-    <style type="text/css">
-        * {
-        word-wrap: break-word;
-        }
-        body {
-            background-color: #%1$s;
-            color: #%2$s;
-        }
-        ul {
-            list-style-position: inside;
-            padding: 0;
-            padding-left: 5px;
-            margin-bottom: 5px;
-        }
-        li {
-            padding-bottom: 8px;
-            list-style-position: outside;
-            margin-left: 1em;
-        }
-        h4 {
-            margin-top: 0px;
-            margin-bottom: 0px;
-        }
-        h3 {
-            margin-bottom: 7px;
-            padding-top: 7px;
-        }
-    </style>
-</head>
-<body>
-<div></div>
-<h3>Version 1.1</h3>
-<h4>New</h4>
-<ul>
-    <li>Support for other types of biometric authentication (i.e. Pixel 4 face unlock)</li>
-    <li>Support for importing from WinAuth</li>
-    <li>Support for Chromebooks</li>
-    <li>Option to highlight entries when tapped</li>
-    <li>Filter for ungrouped tokens</li>
-    <li>Ability to search for token account names</li>
-    <li>Simplified Chinese translation (thanks RunningMelos!)</li>
-</ul>
-<h4>Fixes</h4>
-<ul>
-    <li>The behavior of highlighting and revealing entries was inconsistent</li>
-</ul>
-<h3>Version 1.0.3</h3>
-<h4>New</h4>
-<ul>
-    <li>Support for andOTP's new backup file format</li>
-</ul>
-<h3>Version 1.0.2</h3>
-<h4>Fixes</h4>
-<ul>
-    <li>Search feature on Huawei devices</li>
-</ul>
-<h4>Notes</h4>
-<ul>
-    <li>Disabled automatic backups through the Google Play Store</li>
-</ul>
-<h3>Version 1.0.1</h3>
-<h4>Notes</h4>
-<ul>
-    <li>Temporarily disabled search feature on Huawei devices</li>
-</ul>
-<h3>Version 1.0</h3>
-<h4>New</h4>
-<ul>
-    <li>New icon</li>
-    <li>Overhaul of interaction with the entry list</li>
-    <li>Persistent notification while the vault is unlocked</li>
-    <li>Language override option</li>
-    <li>Support for importing from FreeOTP+</li>
-    <li>Ability to toggle password visibility during unlock</li>
-    <li>Support for deeplinking otpauth URIs</li>
-</ul>
-<h4>Fixes</h4>
-<ul>
-    <li>Bad overall performance and high battery usage</li>
-    <li>Codes with an uneven number of digits are displayed incorrectly</li>
-    <li>Crash when entering a large value for OTP period</li>
-</ul>
-</body>
\ No newline at end of file
+    <head>
+        <style type="text/css">
+            * {
+            word-wrap: break-word;
+            }
+            body {
+                background-color: %1$s;
+                color: %2$s;
+            }
+            ul {
+                list-style-position: inside;
+                padding: 0;
+                padding-left: 5px;
+                margin-bottom: 5px;
+            }
+            li {
+                padding-bottom: 8px;
+                list-style-position: outside;
+                margin-left: 1em;
+            }
+            h4 {
+                margin-top: 0px;
+                margin-bottom: 0px;
+            }
+            h3 {
+                margin-bottom: 7px;
+                padding-top: 7px;
+            }
+        </style>
+    </head>
+    <body>
+        <div></div>
+        <h3>Version 1.1</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Support for other types of biometric authentication (i.e. Pixel 4 face unlock)</li>
+            <li>Support for importing from WinAuth</li>
+            <li>Support for Chromebooks</li>
+            <li>Option to highlight entries when tapped</li>
+            <li>Filter for ungrouped tokens</li>
+            <li>Ability to search for token account names</li>
+            <li>Simplified Chinese translation (thanks RunningMelos!)</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>The behavior of highlighting and revealing entries was inconsistent</li>
+        </ul>
+        <h3>Version 1.0.3</h3>
+        <h4>New</h4>
+        <ul>
+            <li>Support for andOTP's new backup file format</li>
+        </ul>
+        <h3>Version 1.0.2</h3>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Search feature on Huawei devices</li>
+        </ul>
+        <h4>Notes</h4>
+        <ul>
+            <li>Disabled automatic backups through the Google Play Store</li>
+        </ul>
+        <h3>Version 1.0.1</h3>
+        <h4>Notes</h4>
+        <ul>
+            <li>Temporarily disabled search feature on Huawei devices</li>
+        </ul>
+        <h3>Version 1.0</h3>
+        <h4>New</h4>
+        <ul>
+            <li>New icon</li>
+            <li>Overhaul of interaction with the entry list</li>
+            <li>Persistent notification while the vault is unlocked</li>
+            <li>Language override option</li>
+            <li>Support for importing from FreeOTP+</li>
+            <li>Ability to toggle password visibility during unlock</li>
+            <li>Support for deeplinking otpauth URIs</li>
+        </ul>
+        <h4>Fixes</h4>
+        <ul>
+            <li>Bad overall performance and high battery usage</li>
+            <li>Codes with an uneven number of digits are displayed incorrectly</li>
+            <li>Crash when entering a large value for OTP period</li>
+        </ul>
+    </body>
+</html>
\ No newline at end of file
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ChangelogDialog.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ChangelogDialog.java
index 51aa7c0b..b9a1338f 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/ChangelogDialog.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ChangelogDialog.java
@@ -75,12 +75,16 @@ public class ChangelogDialog extends DialogFragment {
 
     private String replaceStylesheet(String changelog) {
         int backgroundColorResource = _themeStyle == Theme.AMOLED ? R.attr.cardBackgroundFocused : R.attr.cardBackground;
-        String backgroundColor = String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(backgroundColorResource, getContext().getTheme())));
-        String textColor = String.format("%06X", (0xFFFFFF & ThemeHelper.getThemeColor(R.attr.primaryText, getContext().getTheme())));
+        String backgroundColor = colorToCSS(ThemeHelper.getThemeColor(backgroundColorResource, getContext().getTheme()));
+        String textColor = colorToCSS(0xFFFFFF & ThemeHelper.getThemeColor(R.attr.primaryText, getContext().getTheme()));
 
         return String.format(changelog, backgroundColor, textColor);
     }
 
+    private static String colorToCSS(int color) {
+        return String.format("rgb(%d, %d, %d)", Color.red(color), Color.green(color), Color.blue(color));
+    }
+
     public ChangelogDialog setTheme(Theme theme) {
         _themeStyle = theme;
 
