pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added potential dialogs

Browse source
This commit is contained in:
Dmitry Donskoy 2019-01-24 15:26:39 +03:00 • committed by Aleksandr Zatsepin
parent e202ced4e9
commit 98bb16639e
2 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/src/com/mapswithme/maps/dialog/AlertDialog.java
View file

@ -179,7 +179,7 @@ public class AlertDialog extends BaseMwmDialogFragment
@StringRes
private int mNegativeBtn = INVALID_ID;
@DrawableRes
private int mImageResId;
private int mImageResId = INVALID_ID;
@NonNull
private FragManagerStrategyType mFragManagerStrategyType = FragManagerStrategyType.DEFAULT;
@NonNull
@ -380,9 +380,11 @@ public class AlertDialog extends BaseMwmDialogFragment
titleView.setText(args.getInt(ARG_TITLE_ID));
ImageView imageView = root.findViewById(R.id.image);
boolean hasImage = args.containsKey(ARG_IMAGE_RES_ID);
imageView.setImageResource(hasImage ? args.getInt(ARG_IMAGE_RES_ID)
: R.drawable.ic_error_36px);
int imageResId = args.getInt(ARG_IMAGE_RES_ID);
boolean hasImage = imageResId != INVALID_ID;
imageView.setImageDrawable(hasImage ? fragment.getResources().getDrawable(imageResId)
: null);
UiUtils.showIf(hasImage, imageView);
appCompatDialog.setContentView(root);
return appCompatDialog;

50
android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java
View file

@ -53,6 +53,8 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
private static final int REQ_CODE_ERROR_COMMON = 106;
private static final int REQ_CODE_ERROR_NOT_ENOUGH_BOOKMARKS = 107;
private static final int REQ_CODE_UPLOAD_CONFIRMATION_DIALOG = 108;
private static final int REQ_CODE_ERROR_HTML_FORMATTING_DIALOG = 109;
private static final String BUNDLE_CURRENT_MODE = "current_mode";
private static final String UPLOADING_PROGRESS_DIALOG_TAG = "uploading_progress_dialog";
private static final String NO_NETWORK_CONNECTION_DIALOG_TAG = "no_network_connection_dialog";
@ -61,6 +63,8 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
private static final String ERROR_EDITED_ON_WEB_DIALOG_REQ_TAG = "error_edited_on_web_dialog";
private static final String ERROR_COMMON_DIALOG_TAG = "error_common_dialog";
private static final String UPLOAD_CONFIRMATION_DIALOG_TAG = "upload_confirmation_dialog";
private static final String ERROR_HTML_FORMATTING_DIALOG_TAG = "error_html_formatting_dialog";
@SuppressWarnings("NullableProblems")
@NonNull
@ -546,21 +550,47 @@ public class UgcSharingOptionsFragment extends BaseMwmAuthorizationFragment impl
}
private void showUploadCatalogConfirmationDialog()
private void showConfirmationDialog(int reqCode, String tag, @StringRes int acceptBtn,
@StringRes int declineBtn, @StringRes int title,
@StringRes int description)
{
/*FIXME text later*/
AlertDialog dialog = new AlertDialog.Builder()
.setTitleId(R.string.common_check_internet_connection_dialog_title)
.setMessageId(R.string.common_check_internet_connection_dialog)
.setPositiveBtnId(R.string.try_again)
.setNegativeBtnId(R.string.cancel)
.setReqCode(REQ_CODE_UPLOAD_CONFIRMATION_DIALOG)
.setImageResId(R.drawable.ic_error_36px)
.setTitleId(title)
.setMessageId(description)
.setPositiveBtnId(acceptBtn)
.setNegativeBtnId(declineBtn)
.setReqCode(reqCode)
.setFragManagerStrategyType(AlertDialog.FragManagerStrategyType.ACTIVITY_FRAGMENT_MANAGER)
.setDialogViewStrategyType(AlertDialog.DialogViewStrategyType.CONFIRMATION_DIALOG)
.setDialogFactory(new ConfirmationDialogFactory())
.build();
dialog.setTargetFragment(this, REQ_CODE_UPLOAD_CONFIRMATION_DIALOG);
dialog.show(this, UPLOAD_CONFIRMATION_DIALOG_TAG);
dialog.setTargetFragment(this, reqCode);
dialog.show(this, tag);
}
private void showHtmlFormattingError()
{
showConfirmationDialog(REQ_CODE_ERROR_HTML_FORMATTING_DIALOG,
ERROR_HTML_FORMATTING_DIALOG_TAG, R.string.common_check_internet_connection_dialog_title,
R.string.common_check_internet_connection_dialog_title,
R.string.try_again, R.string.cancel);
}
private void showUploadCatalogConfirmationDialog()
{
/*FIXME text later*/
showConfirmationDialog(REQ_CODE_UPLOAD_CONFIRMATION_DIALOG,
UPLOAD_CONFIRMATION_DIALOG_TAG, R.string.common_check_internet_connection_dialog_title,
R.string.common_check_internet_connection_dialog_title,
R.string.try_again, R.string.cancel);
}
private void showUnresolvedConflictsErrorDialog()
{
/*FIXME text later*/
showConfirmationDialog(REQ_CODE_UPLOAD_CONFIRMATION_DIALOG,
UPLOAD_CONFIRMATION_DIALOG_TAG, R.string.common_check_internet_connection_dialog_title,
R.string.common_check_internet_connection_dialog_title,
R.string.try_again, R.string.cancel);
}
}