Skip to content

Commit 9a876fa

Browse files
parneet-gurayaparneet-guraya
authored
make dialog modal (commons-app#6015)
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
1 parent c175a4e commit 9a876fa

27 files changed

+53
-62
lines changed

‎app/src/main/java/fr/free/nrw/commons/AboutActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ public void launchTranslate(View view) {
180180
getString(R.string.about_translate_cancel),
181181
positiveButtonRunnable,
182182
() -> {},
183-
spinner,
184-
true);
183+
spinner
184+
);
185185
}
186186

187187
}

‎app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public void onCreate(final Bundle savedInstanceState) {
5050
copyrightBinding = PopupForCopyrightBinding.inflate(getLayoutInflater());
5151
final View contactPopupView = copyrightBinding.getRoot();
5252
dialogBuilder.setView(contactPopupView);
53+
dialogBuilder.setCancelable(false);
5354
dialog = dialogBuilder.create();
5455
dialog.show();
5556

‎app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class LoginActivity : AccountAuthenticatorActivity() {
319319
isIndeterminate = true
320320
setTitle(getString(R.string.logging_in_title))
321321
setMessage(getString(R.string.logging_in_message))
322-
setCanceledOnTouchOutside(false)
322+
setCancelable(false)
323323
}
324324
progressDialog!!.show()
325325
}

‎app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ public void handleShowRationaleFlowCameraLocation(Activity activity,
170170
},
171171
() -> locationPermissionCallback.onLocationPermissionDenied(
172172
activity.getString(R.string.in_app_camera_location_permission_denied)),
173-
null,
174-
false);
173+
null
174+
);
175175
}
176176

177177
/**
@@ -203,8 +203,8 @@ private void askUserToAllowLocationAccess(Activity activity,
203203
defaultKvStore.putBoolean("inAppCameraLocationPref", false);
204204
initiateCameraUpload(activity, resultLauncher);
205205
},
206-
null,
207-
true);
206+
null
207+
);
208208
}
209209

210210
/**

‎app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -566,8 +566,8 @@ private void showNearbyCardPermissionRationale() {
566566
getString(R.string.nearby_card_permission_explanation),
567567
this::requestLocationPermission,
568568
this::displayYouWontSeeNearbyMessage,
569-
checkBoxView,
570-
false);
569+
checkBoxView
570+
);
571571
}
572572

573573
private void displayYouWontSeeNearbyMessage() {

‎app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.kt

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ class DeleteHelper @Inject constructor(
205205
reviewCallback: ReviewController.ReviewCallback
206206
) {
207207
val alert = AlertDialog.Builder(context)
208+
alert.setCancelable(false)
208209
alert.setTitle(question)
209210

210211
val checkedItems = booleanArrayOf(false, false, false, false)

‎app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,7 @@ class DescriptionEditActivity :
149149
getString(titleStringID),
150150
getString(messageStringId),
151151
getString(android.R.string.ok),
152-
null,
153-
true,
152+
null
154153
)
155154
}
156155

@@ -304,7 +303,7 @@ class DescriptionEditActivity :
304303
progressDialog!!.isIndeterminate = true
305304
progressDialog!!.setTitle(getString(R.string.updating_caption_title))
306305
progressDialog!!.setMessage(getString(R.string.updating_caption_message))
307-
progressDialog!!.setCanceledOnTouchOutside(false)
306+
progressDialog!!.setCancelable(false)
308307
progressDialog!!.show()
309308
}
310309

‎app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
133133
askForLocationPermission();
134134
},
135135
null,
136-
null,
137-
false);
136+
null
137+
);
138138
} else {
139139
if (isPermissionDenied) {
140140
locationPermissionsHelper.showAppSettingsDialog(getActivity(),

‎app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ class LocationPermissionsHelper(
7878
activity.getString(R.string.upload_map_location_access)
7979
)
8080
},
81-
null,
82-
false
81+
null
8382
)
8483
} else {
8584
ActivityCompat.requestPermissions(

‎app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1596,8 +1596,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
15961596
getString(R.string.about_translate_cancel),
15971597
{ onDeleteClicked(spinner) },
15981598
{},
1599-
spinner,
1600-
true
1599+
spinner
16011600
)
16021601
if (isDeleted) {
16031602
dialog!!.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
@@ -1616,8 +1615,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
16161615
onDeleteClickeddialogtext(reason)
16171616
},
16181617
{},
1619-
input,
1620-
true
1618+
input
16211619
)
16221620
input.addTextChangedListener(object : TextWatcher {
16231621
fun handleText() {

‎app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ private void showReportDialog(final Media media) {
283283
builder.setItems(R.array.report_violation_options, (dialog, which) -> {
284284
sendReportEmail(media, values[which]);
285285
});
286+
builder.setCancelable(false);
286287
builder.show();
287288
}
288289

‎app/src/main/java/fr/free/nrw/commons/media/ZoomableActivity.kt

+1
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ class ZoomableActivity : BaseActivity() {
196196
val dialog = Dialog(this)
197197
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
198198
dialog.setContentView(R.layout.full_screen_mode_info_dialog)
199+
dialog.setCancelable(false)
199200
(dialog.findViewById(R.id.btn_ok) as Button).setOnClickListener { dialog.dismiss() }
200201
dialog.show()
201202
}

‎app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ public void onActivityResult(Map<String, Boolean> result) {
291291
askForLocationPermission();
292292
},
293293
null,
294-
null,
295-
false);
294+
null
295+
);
296296
} else {
297297
if (isPermissionDenied) {
298298
locationPermissionsHelper.showAppSettingsDialog(getActivity(),

‎app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ public void showAlert(final Bitmap screenshot) {
206206
getString(R.string.cancel),
207207
() -> shareScreen(screenshot),
208208
() -> {},
209-
view,
210-
true);
209+
view
210+
);
211211
}
212212

213213
/**

‎app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,7 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
323323
null,
324324
message,
325325
getString(R.string.ok),
326-
{},
327-
true
326+
{}
328327
)
329328

330329
// binding.imagesUploadedProgressbar.setVisibility(View.INVISIBLE);
@@ -510,8 +509,7 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
510509
title,
511510
message,
512511
getString(R.string.ok),
513-
{},
514-
true
512+
{}
515513
)
516514
}
517515

@@ -527,8 +525,7 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
527525
getString(R.string.read_help_link),
528526
{},
529527
{ Utils.handleWebUrl(requireContext(), Uri.parse(helpLinkUrl)) },
530-
null,
531-
true
528+
null
532529
)
533530
}
534531
/**

‎app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.kt

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class QuizActivity : AppCompatActivity() {
6666
AlertDialog.Builder(this)
6767
.setTitle(getString(R.string.warning))
6868
.setMessage(getString(R.string.quiz_back_button))
69+
.setCancelable(false)
6970
.setPositiveButton(R.string.continue_message) { dialog, _ ->
7071
val intent = Intent(this, QuizResultActivity::class.java)
7172
dialog.dismiss()
@@ -137,6 +138,7 @@ class QuizActivity : AppCompatActivity() {
137138
AlertDialog.Builder(this)
138139
.setTitle(title)
139140
.setMessage(message)
141+
.setCancelable(false)
140142
.setPositiveButton(R.string.continue_message) { dialog, _ ->
141143
questionIndex++
142144
if (questionIndex == quiz.size) {

‎app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt

+1
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ class QuizResultActivity : AppCompatActivity() {
181181
val shareMessage = view.findViewById<TextView>(R.id.alert_text)
182182
shareMessage.setText(R.string.quiz_result_share_message)
183183
alertadd.setView(view)
184+
alertadd.setCancelable(false)
184185
alertadd.setPositiveButton(R.string.about_translate_proceed) { dialog, _ ->
185186
shareScreen(screenshot)
186187
}

‎app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
273273
getString(R.string.read_help_link),
274274
{ },
275275
{ Utils.handleWebUrl(requireContext(), Uri.parse(GET_CONTENT_PICKER_HELP_URL)) },
276-
null,
277-
true
276+
null
278277
)
279278
}
280279

@@ -333,7 +332,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
333332

334333
val dialog = Dialog(requireActivity())
335334
dialog.setContentView(R.layout.dialog_select_language)
336-
dialog.setCanceledOnTouchOutside(true)
335+
dialog.setCancelable(false)
337336
dialog.window?.setLayout(
338337
(resources.displayMetrics.widthPixels * 0.90).toInt(),
339338
(resources.displayMetrics.heightPixels * 0.90).toInt()

‎app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,7 @@ protected void checkBlockStatus() {
270270
getString(R.string.block_notification_title),
271271
getString(R.string.block_notification),
272272
getString(R.string.ok),
273-
this::finish,
274-
true)));
273+
this::finish)));
275274
}
276275

277276
public void checkStoragePermissions() {
@@ -418,16 +417,14 @@ public void onRequestPermissionsResult(final int requestCode,
418417
getString(R.string.storage_permissions_denied),
419418
getString(R.string.unable_to_share_upload_item),
420419
getString(android.R.string.ok),
421-
this::finish,
422-
false);
420+
this::finish);
423421
} else {
424422
DialogUtil.showAlertDialog(this,
425423
getString(R.string.storage_permission_title),
426424
getString(
427425
R.string.write_storage_permission_rationale_for_image_share),
428426
getString(android.R.string.ok),
429-
this::checkStoragePermissions,
430-
false);
427+
this::checkStoragePermissions);
431428
}
432429
}
433430
}
@@ -754,8 +751,7 @@ public void showAlertDialog(int messageResourceId, Runnable onPositiveClick) {
754751
"",
755752
getString(messageResourceId),
756753
getString(R.string.ok),
757-
onPositiveClick,
758-
false);
754+
onPositiveClick);
759755
}
760756

761757
@Override

‎app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ private void initLanguage(int position, UploadMediaDetail description) {
346346
public void onClick(View view) {
347347
Dialog dialog = new Dialog(view.getContext());
348348
dialog.setContentView(R.layout.dialog_select_language);
349-
dialog.setCanceledOnTouchOutside(true);
349+
dialog.setCancelable(false);
350350
dialog.getWindow().setLayout(
351351
(int) (view.getContext().getResources().getDisplayMetrics().widthPixels
352352
* 0.90),

‎app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private void init() {
105105
binding.tooltip.setOnClickListener(new OnClickListener() {
106106
@Override
107107
public void onClick(View v) {
108-
DialogUtil.showAlertDialog(getActivity(), getString(R.string.categories_activity_title), getString(R.string.categories_tooltip), getString(android.R.string.ok), null, true);
108+
DialogUtil.showAlertDialog(getActivity(), getString(R.string.categories_activity_title), getString(R.string.categories_tooltip), getString(android.R.string.ok), null);
109109
}
110110
});
111111
if (media == null) {

‎app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private void init() {
114114
setDepictsSubTitle();
115115
binding.tooltip.setOnClickListener(v -> DialogUtil
116116
.showAlertDialog(getActivity(), getString(R.string.depicts_step_title),
117-
getString(R.string.depicts_tooltip), getString(android.R.string.ok), null, true));
117+
getString(R.string.depicts_tooltip), getString(android.R.string.ok), null));
118118
if (media == null) {
119119
presenter.onAttachView(this);
120120
} else {

‎app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
6969
getString(R.string.license_step_title),
7070
getString(R.string.license_tooltip),
7171
getString(android.R.string.ok),
72-
null, true)
72+
null)
7373
);
7474

7575
initPresenter();

‎app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ private void initRecyclerView() {
309309
*/
310310
private void showInfoAlert(int titleStringID, int messageStringId) {
311311
DialogUtil.showAlertDialog(getActivity(), getString(titleStringID),
312-
getString(messageStringId), getString(android.R.string.ok), null, true);
312+
getString(messageStringId), getString(android.R.string.ok), null);
313313
}
314314

315315

@@ -336,6 +336,7 @@ public void showSimilarImageFragment(String originalFilePath, String possibleFil
336336
BasicKvStore basicKvStore = new BasicKvStore(getActivity(), "IsAnyImageCancelled");
337337
if (!basicKvStore.getBoolean("IsAnyImageCancelled", false)) {
338338
SimilarImageDialogFragment newFragment = new SimilarImageDialogFragment();
339+
newFragment.setCancelable(false);
339340
newFragment.setCallback(new SimilarImageDialogFragment.Callback() {
340341
@Override
341342
public void onPositiveResponse() {
@@ -450,7 +451,8 @@ private void showNearbyPlaceFound(Place place) {
450451
// Execute when user cancels the upload of the specified place
451452
UploadActivity.nearbyPopupAnswers.put(place, false);
452453
},
453-
customLayout, true);
454+
customLayout
455+
);
454456
}
455457
}
456458

@@ -526,8 +528,7 @@ public void showDuplicatePicturePopup(UploadItem uploadItem) {
526528
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
527529
onImageValidationSuccess();
528530
}, null,
529-
checkBoxView,
530-
false);
531+
checkBoxView);
531532
} else {
532533
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
533534
onImageValidationSuccess();
@@ -588,8 +589,7 @@ public void showConnectionErrorPopup() {
588589
basicKvStore.putBoolean(keyForShowingAlertDialog, false);
589590
activity.finish();
590591
},
591-
null,
592-
false
592+
null
593593
);
594594
}
595595
} catch (Exception e) {

0 commit comments

Comments
 (0)