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

[android] Extracted dialog util methods into DialogUtils class

Browse source
This commit is contained in:
Александр Зацепин 2018-04-09 16:04:08 +03:00 • committed by Arsentiy Milchakov
parent 8f94c517b1
commit 254a319a0a
8 changed files with 74 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -95,6 +95,7 @@ import com.mapswithme.maps.widget.placepage.PlacePageView.State;
import com.mapswithme.util.Animations;
import com.mapswithme.util.BottomSheetHelper;
import com.mapswithme.util.Counters;
import com.mapswithme.util.DialogUtils;
import com.mapswithme.util.InputUtils;
import com.mapswithme.util.PermissionsUtils;
import com.mapswithme.util.ThemeSwitcher;
@ -650,7 +651,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (Framework.nativeIsDownloadedMapAtScreenCenter())
startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
else
UiUtils.showAlertDialog(MwmActivity.this, R.string.message_invalid_feature_position);
DialogUtils.showAlertDialog(MwmActivity.this, R.string.message_invalid_feature_position);
});
UiUtils.hide(mPositionChooser);
}

4
android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java
View file

@ -13,7 +13,7 @@ import com.facebook.share.model.AppInviteContent;
import com.facebook.share.widget.AppInviteDialog;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.DialogUtils;
import com.mapswithme.util.statistics.Statistics;
public class FacebookInvitesDialogFragment extends BaseMwmDialogFragment
@ -78,7 +78,7 @@ public class FacebookInvitesDialogFragment extends BaseMwmDialogFragment
AppInviteDialog.show(this, content);
else
{
UiUtils.showAlertDialog(getActivity(), R.string.email_error_title);
DialogUtils.showAlertDialog(getActivity(), R.string.email_error_title);
dismiss();
}
}

9
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
View file

@ -23,6 +23,7 @@ import com.mapswithme.maps.widget.recycler.ItemDecoratorFactory;
import com.mapswithme.maps.widget.recycler.RecyclerClickListener;
import com.mapswithme.maps.widget.recycler.RecyclerLongClickListener;
import com.mapswithme.util.BottomSheetHelper;
import com.mapswithme.util.DialogUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.sharing.SharingHelper;
@ -159,15 +160,15 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
{
if (TextUtils.isEmpty(text))
{
UiUtils.showAlertDialog(getActivity(), R.string.bookmarks_error_title_empty_list_name,
R.string.bookmarks_error_message_empty_list_name);
DialogUtils.showAlertDialog(getActivity(), R.string.bookmarks_error_title_empty_list_name,
R.string.bookmarks_error_message_empty_list_name);
return;
}
if (BookmarkManager.INSTANCE.isUsedCategoryName(text))
{
UiUtils.showAlertDialog(getActivity(), R.string.bookmarks_error_title_list_name_already_taken,
R.string.bookmarks_error_message_list_name_already_taken);
DialogUtils.showAlertDialog(getActivity(), R.string.bookmarks_error_title_list_name_already_taken,
R.string.bookmarks_error_message_list_name_already_taken);
return;
}

3
android/src/com/mapswithme/maps/editor/EditorHostFragment.java
View file

@ -26,6 +26,7 @@ import com.mapswithme.maps.editor.data.LocalizedStreet;
import com.mapswithme.maps.widget.SearchToolbarController;
import com.mapswithme.maps.widget.ToolbarController;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.DialogUtils;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
@ -332,7 +333,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
else
{
Statistics.INSTANCE.trackEditorError(mIsNewObject);
UiUtils.showAlertDialog(getActivity(), R.string.downloader_no_space_title);
DialogUtils.showAlertDialog(getActivity(), R.string.downloader_no_space_title);
}
}

6
android/src/com/mapswithme/maps/settings/StoragePathManager.java
View file

@ -18,7 +18,7 @@ import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.downloader.MapManager;
import com.mapswithme.util.Config;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.DialogUtils;
import com.mapswithme.util.concurrency.ThreadPool;
import com.mapswithme.util.concurrency.UiThread;
import com.mapswithme.util.log.Logger;
@ -277,13 +277,13 @@ public class StoragePathManager
public void moveFilesFinished(String newPath)
{
Config.setKitKatMigrationComplete();
UiUtils.showAlertDialog(activity, R.string.kitkat_migrate_ok);
DialogUtils.showAlertDialog(activity, R.string.kitkat_migrate_ok);
}
@Override
public void moveFilesFailed(int errorCode)
{
UiUtils.showAlertDialog(activity, R.string.kitkat_migrate_failed);
DialogUtils.showAlertDialog(activity, R.string.kitkat_migrate_failed);
}
});
}

55
android/src/com/mapswithme/util/DialogUtils.java Normal file
View file

@ -0,0 +1,55 @@
package com.mapswithme.util;
import android.app.Activity;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.v7.app.AlertDialog;
import com.mapswithme.maps.R;
public class DialogUtils
{
private DialogUtils()
{
}
private static AlertDialog.Builder buildAlertDialog(@NonNull Activity activity, @StringRes int titleId)
{
return new AlertDialog.Builder(activity)
.setCancelable(false)
.setTitle(titleId)
.setPositiveButton(R.string.ok, (dlg, which) -> dlg.dismiss());
}
private static AlertDialog.Builder buildAlertDialog(@NonNull Activity activity, @StringRes int titleId,
@StringRes int msgId)
{
return buildAlertDialog(activity, titleId)
.setMessage(msgId);
}
private static AlertDialog.Builder buildAlertDialog(Activity activity, int titleId, @StringRes int msgId,
@StringRes int posBtn, @StringRes int negBtn)
{
return buildAlertDialog(activity, titleId, msgId)
.setPositiveButton(posBtn, (dlg, which) -> dlg.dismiss())
.setNegativeButton(negBtn, null);
}
public static void showAlertDialog(@NonNull Activity activity, @StringRes int titleId,
@StringRes int msgId)
{
buildAlertDialog(activity, titleId, msgId).show();
}
public static void showAlertDialog(@NonNull Activity activity, @StringRes int titleId)
{
buildAlertDialog(activity, titleId).show();
}
public static void showAlertDialog(@NonNull Activity activity, @StringRes int titleId,
@StringRes int msgId, @StringRes int posBtn, @StringRes int negBtn)
{
buildAlertDialog(activity, titleId, msgId, posBtn, negBtn).show();
}
}

39
android/src/com/mapswithme/util/UiUtils.java
View file

@ -4,7 +4,6 @@ import android.animation.Animator;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
@ -37,12 +36,10 @@ import android.view.animation.Animation;
import android.view.animation.Animation.AnimationListener;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.maps.taxi.TaxiManager;
public final class UiUtils
{
@ -251,42 +248,6 @@ public final class UiUtils
toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), R.attr.homeAsUpIndicator));
}
public static AlertDialog buildAlertDialog(Activity activity, int titleId)
{
return new AlertDialog.Builder(activity)
.setCancelable(false)
.setTitle(titleId)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dlg, int which) { dlg.dismiss(); }
})
.create();
}
public static AlertDialog buildAlertDialog(Activity activity, int titleId, @StringRes int msgId)
{
return new AlertDialog.Builder(activity)
.setCancelable(false)
.setTitle(titleId)
.setMessage(msgId)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dlg, int which) { dlg.dismiss(); }
})
.create();
}
public static void showAlertDialog(@NonNull Activity activity, @StringRes int titleId,
@StringRes int msgId)
{
buildAlertDialog(activity, titleId, msgId).show();
}
public static void showAlertDialog(@NonNull Activity activity, @StringRes int titleId)
{
buildAlertDialog(activity, titleId).show();
}
public static String deviceOrientationAsString(Activity activity)
{
String rotation = activity.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT ? "|" : "-";

10
android/src/com/mapswithme/util/sharing/SharingHelper.java
View file

@ -21,7 +21,7 @@ import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.BookmarkSharingResult;
import com.mapswithme.util.BottomSheetHelper;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.DialogUtils;
import com.mapswithme.util.concurrency.ThreadPool;
import com.mapswithme.util.concurrency.UiThread;
import com.mapswithme.util.log.Logger;
@ -224,13 +224,13 @@ public enum SharingHelper
.setSubject(R.string.share_bookmarks_email_subject));
break;
case BookmarkSharingResult.EMPTY_CATEGORY:
UiUtils.showAlertDialog(context, R.string.bookmarks_error_title_share_empty,
R.string.bookmarks_error_message_share_empty);
DialogUtils.showAlertDialog(context, R.string.bookmarks_error_title_share_empty,
R.string.bookmarks_error_message_share_empty);
break;
case BookmarkSharingResult.ARCHIVE_ERROR:
case BookmarkSharingResult.FILE_ERROR:
UiUtils.showAlertDialog(context, R.string.dialog_routing_system_error,
R.string.bookmarks_error_message_share_general);
DialogUtils.showAlertDialog(context, R.string.dialog_routing_system_error,
R.string.bookmarks_error_message_share_general);
String catName = BookmarkManager.INSTANCE.getCategoryName(result.getCategoryId());
LOGGER.e(TAG, "Failed to share bookmark category '" + catName + "', error code: "
+ result.getCode());