From 39c2f31a22d92babe75ec74319d387363248b6ff Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Wed, 25 May 2016 22:59:32 +0200 Subject: [PATCH] changed color of download blocks --- .../shandian/giga/get/DownloadRunnable.java | 1 - .../java/us/shandian/giga/util/Utility.java | 30 ++++--------------- app/src/main/res/values/colors.xml | 19 +++++------- 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java index 48990bde6..1db03c4be 100644 --- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java +++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java @@ -1,6 +1,5 @@ package us.shandian.giga.get; -import android.os.Handler; import android.util.Log; import java.io.BufferedInputStream; diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java index 774edd0bc..25412660c 100644 --- a/app/src/main/java/us/shandian/giga/util/Utility.java +++ b/app/src/main/java/us/shandian/giga/util/Utility.java @@ -176,41 +176,23 @@ public class Utility public static int getBackgroundForFileType(FileType type) { switch (type) { - case APP: - return R.color.orange; case MUSIC: - return R.color.cyan; - case ARCHIVE: - return R.color.blue; + return R.color.audio_left_to_load_color; case VIDEO: - return R.color.green; - case WORD: - case EXCEL: - case POWERPOINT: - return R.color.brown; - case UNKNOWN: + return R.color.video_left_to_load_color; default: - return R.color.bluegray; + return R.color.gray; } } public static int getForegroundForFileType(FileType type) { switch (type) { - case APP: - return R.color.orange_dark; case MUSIC: - return R.color.cyan_dark; - case ARCHIVE: - return R.color.blue_dark; + return R.color.audio_already_load_color; case VIDEO: - return R.color.green_dark; - case WORD: - case EXCEL: - case POWERPOINT: - return R.color.brown_dark; - case UNKNOWN: + return R.color.video_already_load_color; default: - return R.color.bluegray_dark; + return R.color.gray; } } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9cc8ba2a1..269034168 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -18,19 +18,14 @@ #66000000 #323232 - - #2979FF - #1565C0 + #607D8B - #546E7A - #00BCD4 - #00ACC1 - #FF9800 - #EF6C00 - #4CAF50 - #388E3C - #795548 - #5D4037 + + + #555555 + #000000 + #CD5656 + #BC211D #FFFFFF