ソースを参照

Change order or buttons according to M3

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 年間 前
コミット
3fc0a1bf86

+ 17 - 5
app/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java

@@ -157,21 +157,33 @@ public class ConfirmationDialogFragment extends DialogFragment implements Inject
             });
         }
 
-        if (neutralButtonTextId != -1) {
-            builder.setNeutralButton(neutralButtonTextId, (dialog, whichButton) -> {
+        if (negativeButtonTextId != -1 && neutralButtonTextId == -1) {
+            builder.setNegativeButton(negativeButtonTextId, (dialog, which) -> {
                 if (mListener != null) {
-                    mListener.onNeutral(getTag());
+                    mListener.onCancel(getTag());
                 }
                 dialog.dismiss();
             });
-        }
-        if (negativeButtonTextId != -1) {
+        } else if (neutralButtonTextId != -1 && negativeButtonTextId == -1) {
+            builder.setNegativeButton(neutralButtonTextId, (dialog, which) -> {
+                if (mListener != null) {
+                    mListener.onCancel(getTag());
+                }
+                dialog.dismiss();
+            });
+        } else {
             builder.setNegativeButton(negativeButtonTextId, (dialog, which) -> {
                 if (mListener != null) {
                     mListener.onCancel(getTag());
                 }
                 dialog.dismiss();
             });
+            builder.setNeutralButton(neutralButtonTextId, (dialog, whichButton) -> {
+                if (mListener != null) {
+                    mListener.onNeutral(getTag());
+                }
+                dialog.dismiss();
+            });
         }
 
         viewThemeUtils.dialog.colorMaterialAlertDialogBackground(activity, builder);