Skip to content

Commit

Permalink
Fixes background color on pre-ICS devices
Browse files Browse the repository at this point in the history
  • Loading branch information
soyangel committed Sep 12, 2014
1 parent 4d4ab9a commit 7ea81ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/uk/me/lewisdeane/ldialogs/BaseDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
public abstract class BaseDialog extends AlertDialog {

public static enum LightColours {
TITLE("#474747"), CONTENT("#999999"), ITEM("#999999"), BUTTON("#212121");
TITLE("#474747"), CONTENT("#999999"), ITEM("#999999"), BUTTON("#212121"), BACKGROUND("#FFFFFF");

public final String mColour;

Expand All @@ -20,7 +20,7 @@ private LightColours(String _colour) {
}

public static enum DarkColours {
TITLE("#CCCCCC"), CONTENT("#999999"), ITEM("#999999"), BUTTON("#CCCCCC");
TITLE("#CCCCCC"), CONTENT("#999999"), ITEM("#999999"), BUTTON("#CCCCCC"), BACKGROUND("#000000");

public final String mColour;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private void init() {
mTypeface = Typeface.createFromAsset(getContext().getResources().getAssets(), "Roboto-Medium.ttf");

// Set the view of our dialog with the one we've inflated.
super.setView(mRootView);
super.setView(mRootView, 0, 0, 0, 0);
}

private void setListeners() {
Expand Down Expand Up @@ -212,6 +212,7 @@ private void applyTheme() {
((TextView)mViews[1]).setTextColor(this.mContentColour != 0 ? mContentColour : (mTheme == Theme.LIGHT ? Color.parseColor(LightColours.CONTENT.mColour) : Color.parseColor(DarkColours.CONTENT.mColour)));
((Button)mViews[2]).setTextColor(this.mPositiveColour != 0 ? mPositiveColour : (mTheme == Theme.LIGHT ? Color.parseColor(LightColours.BUTTON.mColour) : Color.parseColor(DarkColours.BUTTON.mColour)));
((Button)mViews[3]).setTextColor(this.mNegativeColour != 0 ? mNegativeColour : (mTheme == Theme.LIGHT ? Color.parseColor(LightColours.BUTTON.mColour) : Color.parseColor(DarkColours.BUTTON.mColour)));
mRootView.setBackgroundColor((mTheme == Theme.LIGHT ? Color.parseColor(LightColours.BACKGROUND.mColour) : Color.parseColor(DarkColours.BACKGROUND.mColour)));
}

public CustomDialog setClickListener(ClickListener mCallbacks) {
Expand Down

0 comments on commit 7ea81ea

Please sign in to comment.