Skip to content

Commit 4eb0a6b

Browse files
authored
Merge pull request #607 from matthewcmckenna/matthewcmckenna/white-ok-cancel
Add ability to set ok and cancel button colors to pure white
2 parents 857e734 + ccc61ce commit 4eb0a6b

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

library/src/main/java/com/wdullaer/materialdatetimepicker/date/DatePickerDialog.java

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,30 @@
1818

1919
import android.animation.ObjectAnimator;
2020
import android.app.Activity;
21-
import android.app.Dialog;
2221
import android.content.DialogInterface;
2322
import android.content.res.Configuration;
2423
import android.content.res.Resources;
2524
import android.graphics.Color;
2625
import android.os.Build;
2726
import android.os.Bundle;
28-
import androidx.annotation.ColorInt;
29-
import androidx.annotation.NonNull;
30-
import androidx.annotation.StringRes;
31-
import androidx.appcompat.app.AppCompatDialogFragment;
32-
import androidx.core.content.ContextCompat;
33-
import androidx.core.content.res.ResourcesCompat;
3427
import android.text.format.DateFormat;
3528
import android.text.format.DateUtils;
3629
import android.view.LayoutInflater;
3730
import android.view.View;
3831
import android.view.View.OnClickListener;
3932
import android.view.ViewGroup;
40-
import android.view.Window;
4133
import android.view.WindowManager;
4234
import android.view.animation.AlphaAnimation;
4335
import android.view.animation.Animation;
4436
import android.widget.Button;
4537
import android.widget.LinearLayout;
4638
import android.widget.TextView;
47-
39+
import androidx.annotation.ColorInt;
40+
import androidx.annotation.NonNull;
41+
import androidx.annotation.StringRes;
42+
import androidx.appcompat.app.AppCompatDialogFragment;
43+
import androidx.core.content.ContextCompat;
44+
import androidx.core.content.res.ResourcesCompat;
4845
import com.wdullaer.materialdatetimepicker.HapticFeedbackController;
4946
import com.wdullaer.materialdatetimepicker.R;
5047
import com.wdullaer.materialdatetimepicker.Utils;
@@ -142,10 +139,10 @@ public enum ScrollOrientation {
142139
private int mDefaultView = MONTH_AND_DAY_VIEW;
143140
private int mOkResid = R.string.mdtp_ok;
144141
private String mOkString;
145-
private int mOkColor = -1;
142+
private Integer mOkColor = null;
146143
private int mCancelResid = R.string.mdtp_cancel;
147144
private String mCancelString;
148-
private int mCancelColor = -1;
145+
private Integer mCancelColor = null;
149146
private Version mVersion;
150147
private ScrollOrientation mScrollOrientation;
151148
private TimeZone mTimezone;
@@ -442,10 +439,17 @@ affect the behaviour of the picker (in the unlikely event the user reconfigures
442439
view.findViewById(R.id.mdtp_day_picker_selected_date_layout).setBackgroundColor(mAccentColor);
443440

444441
// Buttons can have a different color
445-
if (mOkColor != -1) okButton.setTextColor(mOkColor);
446-
else okButton.setTextColor(mAccentColor);
447-
if (mCancelColor != -1) cancelButton.setTextColor(mCancelColor);
448-
else cancelButton.setTextColor(mAccentColor);
442+
if (mOkColor != null) {
443+
okButton.setTextColor(mOkColor);
444+
} else {
445+
okButton.setTextColor(mAccentColor);
446+
}
447+
448+
if (mCancelColor != null) {
449+
cancelButton.setTextColor(mCancelColor);
450+
} else {
451+
cancelButton.setTextColor(mAccentColor);
452+
}
449453

450454
if (getDialog() == null) {
451455
view.findViewById(R.id.mdtp_done_background).setVisibility(View.GONE);

0 commit comments

Comments
 (0)