Skip to content

Commit 03156e8

Browse files
alperozturk96tobiasKaminsky
authored andcommitted
Use M3 and background color for DeleteAlertDialogBuilder
Signed-off-by: alperozturk <[email protected]>
1 parent 58a0e29 commit 03156e8

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

app/src/main/java/it/niedermann/owncloud/notes/branding/DeleteAlertDialogBuilder.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
package it.niedermann.owncloud.notes.branding;
88

99
import android.content.Context;
10-
import android.content.DialogInterface;
1110

1211
import androidx.annotation.NonNull;
1312
import androidx.appcompat.app.AlertDialog;
14-
import androidx.core.content.ContextCompat;
1513

14+
import com.google.android.material.button.MaterialButton;
1615
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
1716

18-
import it.niedermann.owncloud.notes.R;
17+
import it.niedermann.owncloud.notes.NotesApplication;
1918

2019
public class DeleteAlertDialogBuilder extends MaterialAlertDialogBuilder {
2120

@@ -35,9 +34,12 @@ public AlertDialog create() {
3534
}
3635

3736
public void applyBrand() {
38-
final var positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
39-
if (positiveButton != null) {
40-
positiveButton.setTextColor(ContextCompat.getColor(getContext(), R.color.danger));
37+
if (dialog.getButton(AlertDialog.BUTTON_POSITIVE) instanceof MaterialButton positiveButton) {
38+
NotesApplication.brandingUtil().material.colorMaterialButtonPrimaryTonal(positiveButton);
39+
}
40+
41+
if (dialog.getButton(AlertDialog.BUTTON_NEGATIVE) instanceof MaterialButton negativeButton) {
42+
NotesApplication.brandingUtil().material.colorMaterialButtonPrimaryBorderless(negativeButton);
4143
}
4244
}
4345
}

app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,7 @@ public void onDelete(@NonNull Account accountToDelete) {
9595
public void onSuccess(Long unsynchronizedChangesCount) {
9696
runOnUiThread(() -> {
9797
if (unsynchronizedChangesCount > 0) {
98-
new DeleteAlertDialogBuilder(ManageAccountsActivity.this)
99-
.setTitle(getString(R.string.remove_account, accountToDelete.getUserName()))
100-
.setMessage(getResources().getQuantityString(R.plurals.remove_account_message, (int) unsynchronizedChangesCount.longValue(), accountToDelete.getAccountName(), unsynchronizedChangesCount))
101-
.setNeutralButton(android.R.string.cancel, null)
102-
.setPositiveButton(R.string.simple_remove, (d, l) -> viewModel.deleteAccount(accountToDelete, ManageAccountsActivity.this))
103-
.show();
98+
showDeleteAlertDialog(accountToDelete, unsynchronizedChangesCount);
10499
} else {
105100
viewModel.deleteAccount(accountToDelete, ManageAccountsActivity.this);
106101
}
@@ -114,6 +109,18 @@ public void onError(@NonNull Throwable t) {
114109
});
115110
}
116111

112+
private void showDeleteAlertDialog(@NonNull Account accountToDelete, Long unsynchronizedChangesCount) {
113+
final MaterialAlertDialogBuilder alertDialogBuilder = new DeleteAlertDialogBuilder(ManageAccountsActivity.this)
114+
.setTitle(getString(R.string.remove_account, accountToDelete.getUserName()))
115+
.setMessage(getResources().getQuantityString(R.plurals.remove_account_message, (int) unsynchronizedChangesCount.longValue(), accountToDelete.getAccountName(), unsynchronizedChangesCount))
116+
.setNegativeButton(android.R.string.cancel, null)
117+
.setPositiveButton(R.string.simple_remove, (d, l) -> viewModel.deleteAccount(accountToDelete, ManageAccountsActivity.this));
118+
119+
NotesApplication.brandingUtil().dialog.colorMaterialAlertDialogBackground(this, alertDialogBuilder);
120+
121+
alertDialogBuilder.show();
122+
}
123+
117124
public void onChangeNotesPath(@NonNull Account localAccount) {
118125
changeAccountSetting(localAccount,
119126
R.string.settings_notes_path,

0 commit comments

Comments
 (0)