add progressdialog in detail announcement
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/a32d1439 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/a32d1439 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/a32d1439 Branch: refs/heads/master Commit: a32d143987f0e65913c19d89eb93bf8b46c17718 Parents: 12e1978 Author: Sagar <[email protected]> Authored: Mon Jun 6 02:28:28 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Jun 6 02:28:28 2016 +0530 ---------------------------------------------------------------------- .../ui/anouncements/AnnouncementFragment.java | 26 ++++++++++++++++++-- .../ui/anouncements/AnnouncementMvpView.java | 1 + .../ui/anouncements/AnnouncementPresenter.java | 10 ++++---- 3 files changed, 30 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a32d1439/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java index 26ed857..e72908f 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java @@ -1,5 +1,6 @@ package org.apache.taverna.mobile.ui.anouncements; +import android.app.ProgressDialog; import android.os.Bundle; import android.support.design.widget.Snackbar; import android.support.v4.app.Fragment; @@ -16,6 +17,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.webkit.WebView; +import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; @@ -48,6 +50,9 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL @BindView(R.id.progress_circular) ProgressBar mProgressBar; + private AlertDialog alertDialog; + + private ProgressDialog dialog; private Announcements mAnnouncements; @@ -65,6 +70,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL @Override public void onItemClick(View childView, int position) { + showWaitProgress(true); mAnnouncementPresenter.loadAnnouncementDetails(mAnnouncements.getAnnouncement().get(position).getId()); } @@ -128,7 +134,7 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL } }); - + showProgressbar(true); mAnnouncementPresenter.loadAllAnnouncement(mPageNumber); mRecyclerView.setOnScrollListener(new EndlessRecyclerOnScrollListener(layoutManager) { @@ -194,11 +200,18 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL TextView date = ButterKnife.findById(dialogView, R.id.tvDialogDate); TextView author = ButterKnife.findById(dialogView, R.id.tvDialogAuthor); WebView text = ButterKnife.findById(dialogView, R.id.wvDialogText); + Button buttonOk=ButterKnife.findById(dialogView, R.id.bDialogOK); + buttonOk.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + alertDialog.dismiss(); + } + }); text.loadDataWithBaseURL("", mAnnouncementDetail.getText(), "text/html", "utf-8", ""); date.setText(mAnnouncementDetail.getDate()); title.setText(mAnnouncementDetail.getTitle()); author.setText(mAnnouncementDetail.getAuthor().getContent()); - AlertDialog alertDialog = dialogBuilder.create(); + alertDialog = dialogBuilder.create(); alertDialog.show(); } @@ -218,4 +231,13 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL snackbar.show(); } + + @Override + public void showWaitProgress(boolean b) { + if(b){ + dialog = ProgressDialog.show(getContext(), "Loading", "Please wait...", true); + }else{ + dialog.dismiss(); + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a32d1439/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java index 572829d..11adb16 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementMvpView.java @@ -12,5 +12,6 @@ public interface AnnouncementMvpView extends MvpView { void showAllAnouncement(Announcements announcements); void showProgressbar(boolean b); void showErrorSnackBar(); + void showWaitProgress(boolean b); void showAnnouncementDetail(DetailAnnouncement detailAnnouncement); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/a32d1439/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java index f6f38fb..0fabdcb 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementPresenter.java @@ -37,7 +37,7 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> { } public void loadAllAnnouncement(int pageNumber){ - getMvpView().showProgressbar(true); + mSubscriptions = mDataManager.getAllAnnouncement(pageNumber) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) @@ -49,7 +49,7 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> { @Override public void onError(Throwable e) { - Log.d(LOG_TAG,e.getMessage()); +// Log.d(LOG_TAG,e.getMessage()); getMvpView().showProgressbar(false); getMvpView().showErrorSnackBar(); } @@ -62,20 +62,20 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> { }); } public void loadAnnouncementDetails(String id){ - getMvpView().showProgressbar(true); + mSubscriptions = mDataManager.getAnnouncementDetail(id) .observeOn(AndroidSchedulers.mainThread()) .subscribeOn(Schedulers.io()) .subscribe(new Observer<DetailAnnouncement>() { @Override public void onCompleted() { - getMvpView().showProgressbar(false); + getMvpView().showWaitProgress(false); } @Override public void onError(Throwable e) { Log.d(LOG_TAG,e.getMessage()); - getMvpView().showProgressbar(false); + getMvpView().showWaitProgress(false); getMvpView().showErrorSnackBar(); }
