|
30 | 30 | import android.text.format.DateUtils; |
31 | 31 | import android.widget.DatePicker; |
32 | 32 |
|
| 33 | +import com.google.android.material.button.MaterialButton; |
33 | 34 | import com.nextcloud.client.di.Injectable; |
34 | 35 | import com.owncloud.android.R; |
35 | 36 | import com.owncloud.android.utils.theme.ViewThemeUtils; |
@@ -81,12 +82,24 @@ public void setOnExpiryDateListener(OnExpiryDateListener onExpiryDateListener) { |
81 | 82 | public void onStart() { |
82 | 83 | super.onStart(); |
83 | 84 | final Dialog currentDialog = getDialog(); |
| 85 | + |
84 | 86 | if (currentDialog != null) { |
85 | 87 | final DatePickerDialog dialog = (DatePickerDialog) currentDialog; |
86 | 88 |
|
87 | | - viewThemeUtils.platform.colorTextButtons(dialog.getButton(DatePickerDialog.BUTTON_NEUTRAL), |
88 | | - dialog.getButton(DatePickerDialog.BUTTON_NEGATIVE), |
89 | | - dialog.getButton(DatePickerDialog.BUTTON_POSITIVE)); |
| 89 | + MaterialButton positiveButton = (MaterialButton) dialog.getButton(DatePickerDialog.BUTTON_POSITIVE); |
| 90 | + if (positiveButton != null) { |
| 91 | + viewThemeUtils.material.colorMaterialButtonPrimaryTonal(positiveButton); |
| 92 | + } |
| 93 | + |
| 94 | + MaterialButton negativeButton = (MaterialButton) dialog.getButton(DatePickerDialog.BUTTON_NEGATIVE); |
| 95 | + if (negativeButton != null) { |
| 96 | + viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(negativeButton); |
| 97 | + } |
| 98 | + |
| 99 | + MaterialButton neutralButton = (MaterialButton) dialog.getButton(DatePickerDialog.BUTTON_NEUTRAL); |
| 100 | + if (neutralButton != null) { |
| 101 | + viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(neutralButton); |
| 102 | + } |
90 | 103 | } |
91 | 104 | } |
92 | 105 |
|
@@ -118,7 +131,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { |
118 | 131 | //show unset button only when date is already selected |
119 | 132 | if (chosenDateInMillis > 0) { |
120 | 133 | dialog.setButton( |
121 | | - Dialog.BUTTON_NEUTRAL, |
| 134 | + Dialog.BUTTON_NEGATIVE, |
122 | 135 | getText(R.string.share_via_link_unset_password), |
123 | 136 | (dialog1, which) -> { |
124 | 137 | if (onExpiryDateListener != null) { |
|
0 commit comments