mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add cancel button (#6078)

Browse source 
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
This commit is contained in:
Parneet Singh 2024-12-29 04:50:32 +05:30 • committed by GitHub
parent dec56a3342
commit a6444968fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 67 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/fr/free/nrw/commons/customselector/helper/FolderDeletionHelper.kt
View file

@ -42,6 +42,7 @@ object FolderDeletionHelper {
AlertDialog.Builder(context)
.setTitle(context.getString(R.string.custom_selector_confirm_deletion_title))
.setCancelable(false)
.setMessage(
context.getString(
R.string.custom_selector_confirm_deletion_message,

2
app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
View file

@ -268,6 +268,7 @@ class CustomSelectorActivity :
*/
private fun showWelcomeDialog() {
val dialog = Dialog(this)
dialog.setCancelable(false)
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
dialog.setContentView(R.layout.custom_selector_info_dialog)
(dialog.findViewById(R.id.btn_ok) as Button).setOnClickListener { dialog.dismiss() }
@ -683,6 +684,7 @@ class CustomSelectorActivity :
*/
private fun displayUploadLimitWarning() {
val dialog = Dialog(this)
dialog.setCancelable(false)
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
dialog.setContentView(R.layout.custom_selector_limit_dialog)
(dialog.findViewById(R.id.btn_dismiss_limit_warning) as Button).setOnClickListener { dialog.dismiss() }

2
app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
View file

@ -67,6 +67,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
.setPositiveButton(android.R.string.yes,
(dialog, which) -> setDeleteRecentPositiveButton(context, dialog))
.setNegativeButton(android.R.string.no, null)
.setCancelable(false)
.create()
.show();
}
@ -94,6 +95,7 @@ public class RecentSearchesFragment extends CommonsDaggerSupportFragment {
.setPositiveButton(getString(R.string.delete).toUpperCase(Locale.ROOT),
((dialog, which) -> setDeletePositiveButton(context, dialog, position)))
.setNegativeButton(android.R.string.cancel, null)
.setCancelable(false)
.create()
.show();
}

1
app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.kt
View file

@ -46,6 +46,7 @@ class FeedbackDialog(
// 'SOFT_INPUT_ADJUST_RESIZE: Int' is deprecated. Deprecated in Java
@Suppress("DEPRECATION")
window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
binding.btnCancel.setOnClickListener { dismiss() }
binding.btnSubmitFeedback.setOnClickListener {
try {
submitFeedback()

1
app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file

@ -291,6 +291,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
builder.setItems(R.array.report_violation_options, (dialog, which) -> {
sendReportEmail(media, values[which]);
});
builder.setNegativeButton(R.string.cancel, (dialog, which) -> {});
builder.setCancelable(false);
builder.show();
}

5
app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt
View file

@ -161,7 +161,10 @@ class MoreBottomSheetFragment : BottomSheetDialogFragment() {
override fun onFeedbackSubmit(feedback: Feedback) {
uploadFeedback(feedback)
}
}).show()
}).apply {
setCancelable(false)
show()
}
}
/**

1
app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragment.kt
View file

@ -94,6 +94,7 @@ class MoreBottomSheetLoggedOutFragment : BottomSheetDialogFragment() {
.setMessage(R.string.feedback_sharing_data_alert)
.setCancelable(false)
.setPositiveButton(R.string.ok) { _, _ -> sendFeedback() }
.setNegativeButton(R.string.cancel){_,_ -> }
.show()
}

2
app/src/main/java/fr/free/nrw/commons/nearby/fragments/CommonPlaceClickActions.kt
View file

@ -128,6 +128,8 @@ class CommonPlaceClickActions
AlertDialog
.Builder(activity)
.setMessage(R.string.login_alert_message)
.setCancelable(false)
.setNegativeButton(R.string.cancel){_,_ -> }
.setPositiveButton(R.string.login) { dialog, which ->
setPositiveButton()
}.show()

2
app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
View file

@ -1627,6 +1627,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
// prompt the user to login
new Builder(getContext())
.setMessage(R.string.login_alert_message)
.setCancelable(false)
.setNegativeButton(R.string.cancel, (dialog, which) -> {})
.setPositiveButton(R.string.login, (dialog, which) -> {
// logout of the app
BaseLogoutListener logoutListener = new BaseLogoutListener(getActivity());

1
app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.kt
View file

@ -139,6 +139,7 @@ class QuizActivity : AppCompatActivity() {
.setTitle(title)
.setMessage(message)
.setCancelable(false)
.setNegativeButton(R.string.cancel){_,_ -> }
.setPositiveButton(R.string.continue_message) { dialog, _ ->
questionIndex++
if (questionIndex == quiz.size) {

15
app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.kt
View file

@ -14,6 +14,7 @@ import android.text.TextWatcher
import android.view.KeyEvent
import android.view.View
import android.widget.AdapterView
import android.widget.Button
import android.widget.EditText
import android.widget.ListView
import android.widget.TextView
@ -333,24 +334,16 @@ class SettingsFragment : PreferenceFragmentCompat() {
val dialog = Dialog(requireActivity())
dialog.setContentView(R.layout.dialog_select_language)
dialog.setCancelable(true)// Allow dialog to close with the back button
dialog.setCancelable(false)
dialog.window?.setLayout(
(resources.displayMetrics.widthPixels * 0.90).toInt(),
(resources.displayMetrics.heightPixels * 0.90).toInt()
)
// Handle back button explicitly to dismiss the dialog
dialog.setOnKeyListener { _, keyCode, event ->
if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
dialog.dismiss() // Close the dialog when the back button is pressed
true
} else {
false
}
}
dialog.show()
val editText: EditText = dialog.findViewById(R.id.search_language)
val listView: ListView = dialog.findViewById(R.id.language_list)
val cancelButton = dialog.findViewById<Button>(R.id.cancel_button)
languageHistoryListView = dialog.findViewById(R.id.language_history_list)
recentLanguagesTextView = dialog.findViewById(R.id.recent_searches)
separator = dialog.findViewById(R.id.separator)
@ -359,6 +352,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
listView.adapter = languagesAdapter
cancelButton.setOnClickListener { dialog.dismiss() }
editText.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(charSequence: CharSequence, start: Int, count: Int, after: Int) {
hideRecentLanguagesSection()

1
app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
View file

@ -898,6 +898,7 @@ public class UploadActivity extends BaseActivity implements
.setView(view)
.setTitle(getString(R.string.multiple_files_depiction_header))
.setMessage(getString(R.string.multiple_files_depiction))
.setCancelable(false)
.setPositiveButton("OK", (dialog, which) -> {
if (checkBox.isChecked()) {
// Save the user's choice to not show the dialog again

4
app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
View file

@ -14,6 +14,7 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
@ -357,6 +358,7 @@ public class UploadMediaDetailAdapter extends
EditText editText = dialog.findViewById(R.id.search_language);
ListView listView = dialog.findViewById(R.id.language_list);
final Button cancelButton = dialog.findViewById(R.id.cancel_button);
languageHistoryListView = dialog.findViewById(R.id.language_history_list);
recentLanguagesTextView = dialog.findViewById(R.id.recent_searches);
separator = dialog.findViewById(R.id.separator);
@ -364,6 +366,8 @@ public class UploadMediaDetailAdapter extends
listView.setAdapter(languagesAdapter);
cancelButton.setOnClickListener(v -> dialog.dismiss());
editText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1,

1
app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt
View file

@ -285,6 +285,7 @@ class DepictsFragment : UploadBaseFragment(), DepictsContract.View {
override fun showProgressDialog() {
progressDialog = ProgressDialog(requireContext())
progressDialog!!.setMessage(getString(R.string.please_wait))
progressDialog!!.setCancelable(false)
progressDialog!!.show()
}

35
app/src/main/res/layout/dialog_feedback.xml
View file

@ -132,15 +132,32 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<Button
android:id="@+id/btn_submit_feedback"
android:textColor="@color/white"
android:layout_marginBottom="@dimen/dimen_10"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dimen_10"
android:gravity="center"
android:layout_gravity="center"
android:text="@string/submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:orientation="horizontal">
<Button
android:id="@+id/btn_cancel"
android:textColor="@color/white"
android:layout_gravity="center"
android:layout_weight="1"
android:text="@string/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<Button
android:id="@+id/btn_submit_feedback"
android:textColor="@color/white"
android:layout_weight="1"
android:layout_gravity="center"
android:text="@string/submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</ScrollView>

17
app/src/main/res/layout/dialog_select_language.xml
View file

@ -66,9 +66,18 @@
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:id="@+id/language_list"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/cancel_button"
app:layout_constraintTop_toBottomOf="@+id/all_languages" />
</androidx.constraintlayout.widget.ConstraintLayout>
<Button
android:id="@+id/cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:textColor="@color/primaryColor"
android:background="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>