[android] Stylized all progress dialog

This commit is contained in:
Александр Зацепин 2018-04-09 18:55:49 +03:00 committed by Arsentiy Milchakov
parent 38e6374490
commit b08590cb6c
4 changed files with 12 additions and 13 deletions
android/src/com/mapswithme

View file

@ -51,7 +51,7 @@ public class KmlImportController implements BookmarkManager.KmlConversionListene
DialogInterface.OnClickListener clickListener = (dialog, which) -> {
BookmarkManager.INSTANCE.convertAllKmlFiles();
dialog.dismiss();
mProgressDialog = DialogUtils.showModalProgressDialog(mContext, R.string.converting);
mProgressDialog = DialogUtils.createModalProgressDialog(mContext, R.string.converting);
mProgressDialog.show();
};

View file

@ -10,6 +10,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.AlertDialog;
@ -265,7 +266,7 @@ public class StoragePathManager
* https://developer.android.com/guide/topics/providers/document-provider.html#client
* https://code.google.com/p/android/issues/detail?id=103249
*/
public void checkKitkatMigration(final Activity activity)
public void checkKitkatMigration(@NonNull final Activity activity)
{
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT ||
Config.isKitKatMigrationComplete())
@ -342,7 +343,7 @@ public class StoragePathManager
return settingsPath;
}
private void checkExternalStoragePathOnKitkat(Context context, MoveFilesListener listener)
private void checkExternalStoragePathOnKitkat(@NonNull Activity context, MoveFilesListener listener)
{
final String settingsDir = Framework.nativeGetSettingsDir();
final String writableDir = Framework.nativeGetWritableDir();
@ -365,14 +366,12 @@ public class StoragePathManager
listener.moveFilesFailed(UNKNOWN_KITKAT_ERROR);
}
private void setStoragePath(final Context context, final MoveFilesListener listener, final StorageItem newStorage,
final StorageItem oldStorage, final int messageId)
private void setStoragePath(@NonNull final Activity context,
@NonNull final MoveFilesListener listener,
@NonNull final StorageItem newStorage,
@Nullable final StorageItem oldStorage, final int messageId)
{
final ProgressDialog dialog = new ProgressDialog(context);
dialog.setMessage(context.getString(messageId));
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
dialog.setIndeterminate(true);
dialog.setCancelable(false);
final ProgressDialog dialog = DialogUtils.createModalProgressDialog(context, messageId);
dialog.show();
ThreadPool.getStorage().execute(new Runnable()

View file

@ -62,9 +62,9 @@ public class DialogUtils
}
@NonNull
public static ProgressDialog showModalProgressDialog(@NonNull Activity activity, @StringRes int msg)
public static ProgressDialog createModalProgressDialog(@NonNull Activity activity, @StringRes int msg)
{
ProgressDialog progress = new ProgressDialog(activity);
ProgressDialog progress = new ProgressDialog(activity, R.style.MwmTheme_AlertDialog);
progress.setMessage(activity.getString(msg));
progress.setProgressStyle(ProgressDialog.STYLE_SPINNER);
progress.setIndeterminate(true);

View file

@ -192,7 +192,7 @@ public enum SharingHelper
public void prepareBookmarkCategoryForSharing(@NonNull Activity context, long catId)
{
mProgressDialog = DialogUtils.showModalProgressDialog(context, R.string.please_wait);
mProgressDialog = DialogUtils.createModalProgressDialog(context, R.string.please_wait);
mProgressDialog.show();
BookmarkManager.INSTANCE.prepareCategoryForSharing(catId);
}