Merge pull request #4036 from ByteHamster/colors

Make colors more consistent

1 files changed, 13 insertions, 7 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
index b59a95cd9..40849a262 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
@@ -53,12 +53,8 @@ public class Timeline {
         this.shownotesProvider = shownotesProvider;
 
         noShownotesLabel = context.getString(R.string.no_shownotes_label);
-
-        TypedArray res = context.getTheme().obtainStyledAttributes(new int[]{android.R.attr.textColorPrimary});
-        @ColorInt int col = res.getColor(0, 0);
-        final String colorPrimary = "rgba(" + Color.red(col) + "," + Color.green(col) + ","
-                + Color.blue(col) + "," + (Color.alpha(col) / 255.0) + ")";
-        res.recycle();
+        final String colorPrimary = colorToHtml(context, android.R.attr.textColorPrimary);
+        final String colorAccent = colorToHtml(context, R.attr.colorAccent);
         final int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8,
                 context.getResources().getDisplayMetrics());
         String styleString = "";
@@ -68,7 +64,17 @@ public class Timeline {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        webviewStyle = String.format(Locale.getDefault(), styleString, colorPrimary, margin, margin, margin, margin);
+        webviewStyle = String.format(Locale.US, styleString, colorPrimary, colorAccent,
+                margin, margin, margin, margin);
+    }
+
+    private String colorToHtml(Context context, int colorAttr) {
+        TypedArray res = context.getTheme().obtainStyledAttributes(new int[]{colorAttr});
+        @ColorInt int col = res.getColor(0, 0);
+        final String color = "rgba(" + Color.red(col) + "," + Color.green(col) + ","
+                + Color.blue(col) + "," + (Color.alpha(col) / 255.0) + ")";
+        res.recycle();
+        return color;
     }
 
     /**