tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed changelog dialog wrong bg color.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-02-03 21:02:44 +01:00
commit 76fb6b9347
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -115,7 +115,7 @@ dependencies {
transitive = true
}
compile('com.github.kabouzeid:app-theme-helper:0.7.13kmod@aar') {
compile('com.github.kabouzeid:app-theme-helper:0.7.15kmod@aar') {
transitive = true
}

8
app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java
View file

@ -5,6 +5,7 @@ import android.app.Dialog;
import android.content.DialogInterface;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
@ -15,6 +16,7 @@ import android.webkit.WebView;
import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.internal.ThemeSingleton;
import com.kabouzeid.appthemehelper.util.ATHUtil;
import com.kabouzeid.appthemehelper.util.ColorUtil;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.util.PreferenceUtil;
@ -77,11 +79,11 @@ public class ChangelogDialog extends DialogFragment {
in.close();
// Inject color values for WebView body background and links
final String backgroundColor = ThemeSingleton.get().darkTheme ? "424242" : "ffffff";
final String contentColor = ThemeSingleton.get().darkTheme ? "ffffff" : "000000";
final String backgroundColor = colorToHex(ATHUtil.resolveColor(getActivity(), R.attr.md_background_color, Color.parseColor(ThemeSingleton.get().darkTheme ? "#424242" : "#ffffff")));
final String contentColor = ThemeSingleton.get().darkTheme ? "#ffffff" : "#000000";
webView.loadData(buf.toString()
.replace("{style-placeholder}",
String.format("body { background-color: #%s; color: #%s; }", backgroundColor, contentColor))
String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
.replace("{link-color}", colorToHex(ThemeSingleton.get().positiveColor.getDefaultColor()))
.replace("{link-color-active}", colorToHex(ColorUtil.lightenColor(ThemeSingleton.get().positiveColor.getDefaultColor())))
, "text/html", "UTF-8");