Skip to content

Commit 154796b

Browse files
Merge pull request nextcloud#12045 from nextcloud/feature/use-m3-ExpirationDatePickerDialogFragment
Use Material Design 3 For Expiration Date Picker Dialog
2 parents 553ab10 + a608568 commit 154796b

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

app/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import android.text.format.DateUtils;
3131
import android.widget.DatePicker;
3232

33+
import com.google.android.material.button.MaterialButton;
3334
import com.nextcloud.client.di.Injectable;
3435
import com.owncloud.android.R;
3536
import com.owncloud.android.utils.theme.ViewThemeUtils;
@@ -81,12 +82,24 @@ public void setOnExpiryDateListener(OnExpiryDateListener onExpiryDateListener) {
8182
public void onStart() {
8283
super.onStart();
8384
final Dialog currentDialog = getDialog();
85+
8486
if (currentDialog != null) {
8587
final DatePickerDialog dialog = (DatePickerDialog) currentDialog;
8688

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+
}
90103
}
91104
}
92105

@@ -118,7 +131,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
118131
//show unset button only when date is already selected
119132
if (chosenDateInMillis > 0) {
120133
dialog.setButton(
121-
Dialog.BUTTON_NEUTRAL,
134+
Dialog.BUTTON_NEGATIVE,
122135
getText(R.string.share_via_link_unset_password),
123136
(dialog1, which) -> {
124137
if (onExpiryDateListener != null) {

0 commit comments

Comments
 (0)