Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistent usage of dialogs in the app #871

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Consistent usage of dialogs in the app #871

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2accd20
added constant material dialogue box to places where old dialogue box…
cdhiraj40 Dec 7, 2021
0a68347
added ProgressBarDialog for single track uploading dialog
cdhiraj40 Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions org.envirocar.app/src/org/envirocar/app/views/tracklist/TrackListLocalCardFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import android.widget.TextView;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;

import com.afollestad.materialdialogs.MaterialDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
Expand All @@ -40,6 +41,7 @@
import org.envirocar.app.interactor.UploadAllTracks;
import org.envirocar.app.interactor.UploadTrack;
import org.envirocar.app.views.trackdetails.TrackDetailsActivity;
import org.envirocar.app.views.utils.DialogUtils;
import org.envirocar.app.views.utils.ECAnimationUtils;
import org.envirocar.core.entity.Track;
import org.envirocar.core.events.TrackFinishedEvent;
Expand Down Expand Up @@ -341,7 +343,7 @@ private void onUploadAllLocalTracks(DialogInterface dialog, int which) {
*/
private class UploadTrackDialogObserver extends DisposableObserver<Track> {
private View contentView;
private MaterialDialog dialog;
private AlertDialog dialog;
private Track track;

/**
Expand All @@ -363,12 +365,11 @@ public UploadTrackDialogObserver(Track track) {
protected void onStart() {
super.onStart();
// Create the dialog to show.
this.dialog = new MaterialDialog.Builder(getContext())
.title(R.string.track_list_upload_track_uploading)
.customView(contentView, false)
.cancelable(false)
.negativeText(R.string.cancel)
.onNegative((materialDialog, dialogAction) -> {
this.dialog = DialogUtils.createProgressBarDialogBuilder(getContext(),
R.string.track_list_upload_track_uploading,
R.drawable.ic_cloud_upload_white_24dp,
getString(R.string.track_list_upload_track_content)+"\n" +track.getName())
.setNegativeButton(R.string.cancel,(dialog, which) -> {
dispose();
})
.show();
Expand Down Expand Up @@ -446,7 +447,7 @@ private class UploadTracksDialogObserver extends DisposableObserver<UploadAllTra
private ProgressBar progressBar;
private TextView percentageText;
private TextView progressText;
private MaterialDialog dialog;
private AlertDialog dialog;
private View contentView;

/**
Expand All @@ -473,11 +474,13 @@ public void onStart() {
return;

updateProgressView(0);
dialog = new MaterialDialog.Builder(getContext())
.title(R.string.track_list_upload_track_uploading)
.customView(contentView, false)
.negativeText(R.string.cancel)
.onNegative((dialog, dialogAction) -> dispose())
dialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MaterialDialog)
.setTitle(R.string.track_list_upload_track_uploading)
.setIcon(R.drawable.ic_cloud_upload_white_24dp)
.setView(contentView)
.setNegativeButton(R.string.cancel,(materialDialog, dialogAction) -> {
dispose();
})
.show();
}

Expand Down