You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/06/08 16:02:34 UTC
[32/40] incubator-taverna-mobile git commit: refactor name according
to coding style
refactor name according to coding style
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/215e06c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/215e06c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/215e06c3
Branch: refs/heads/master
Commit: 215e06c395aa996cd82f7d1753f2e48f374347b1
Parents: 05772c9
Author: Sagar <ku...@gmail.com>
Authored: Fri Jun 3 15:33:26 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Fri Jun 3 15:33:26 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/mobile/data/DataManager.java | 8 +-
.../taverna/mobile/data/model/author.java | 82 ++++++++++++++++++++
.../mobile/data/remote/TavernaService.java | 4 +-
.../mobile/ui/adapter/AnnouncementAdapter.java | 12 +--
.../EndlessRecyclerOnScrollListener.java | 3 +
.../ui/adapter/RecyclerItemClickListner.java | 3 +
.../ui/anouncements/AnnouncementFragment.java | 75 +++++++++---------
.../ui/anouncements/AnnouncementMvpView.java | 7 +-
.../ui/anouncements/AnnouncementPresenter.java | 11 ++-
.../utils/ScrollChildSwipeRefreshLayout.java | 3 +
10 files changed, 157 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
index b9fc1ca..d41accf 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/DataManager.java
@@ -1,12 +1,14 @@
package org.apache.taverna.mobile.data;
-import org.apache.taverna.mobile.data.model.Announcement;
+import org.apache.taverna.mobile.data.model.DetailAnnouncement;
import org.apache.taverna.mobile.data.model.Announcements;
import org.apache.taverna.mobile.data.remote.BaseApiManager;
import rx.Observable;
-
+/**
+ * Created by Sagar
+ */
public class DataManager {
public BaseApiManager mBaseApiManager = new BaseApiManager();
@@ -26,7 +28,7 @@ public class DataManager {
*
* @return Detail of Announcement
*/
- public Observable<Announcement> getAnnouncementDetail(String id){
+ public Observable<DetailAnnouncement> getAnnouncementDetail(String id){
return mBaseApiManager.getTavernaApi().getAnnouncement(id);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/app/src/main/java/org/apache/taverna/mobile/data/model/author.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/model/author.java b/app/src/main/java/org/apache/taverna/mobile/data/model/author.java
new file mode 100644
index 0000000..111f64f
--- /dev/null
+++ b/app/src/main/java/org/apache/taverna/mobile/data/model/author.java
@@ -0,0 +1,82 @@
+package org.apache.taverna.mobile.data.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import org.simpleframework.xml.Attribute;
+import org.simpleframework.xml.Text;
+
+/**
+ * Created by Sagar
+ */
+public class Author implements Parcelable {
+
+ @Attribute(name="resource", required = false)
+ String resource;
+
+
+ @Attribute(name="uri", required = false)
+ String uri;
+
+
+ @Attribute(name="id", required = false)
+ String id;
+
+ @Text
+ String content;
+
+ public String getContent() {
+ return content;
+ }
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+
+ public String getResource() { return this.resource; }
+ public void setResource(String _value) { this.resource = _value; }
+
+
+ public String getUri() { return this.uri; }
+ public void setUri(String _value) { this.uri = _value; }
+
+
+ public String getId() { return this.id; }
+ public void setId(String _value) { this.id = _value; }
+
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeString(this.resource);
+ dest.writeString(this.uri);
+ dest.writeString(this.id);
+ dest.writeString(this.content);
+ }
+
+ public Author() {
+ }
+
+ protected Author(Parcel in) {
+ this.resource = in.readString();
+ this.uri = in.readString();
+ this.id = in.readString();
+ this.content = in.readString();
+ }
+
+ public static final Parcelable.Creator<Author> CREATOR = new Parcelable.Creator<Author>() {
+ @Override
+ public Author createFromParcel(Parcel source) {
+ return new Author(source);
+ }
+
+ @Override
+ public Author[] newArray(int size) {
+ return new Author[size];
+ }
+ };
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
index 8218d3b..f483490 100644
--- a/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
+++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/TavernaService.java
@@ -1,6 +1,6 @@
package org.apache.taverna.mobile.data.remote;
-import org.apache.taverna.mobile.data.model.Announcement;
+import org.apache.taverna.mobile.data.model.DetailAnnouncement;
import org.apache.taverna.mobile.data.model.Announcements;
import retrofit2.http.GET;
@@ -17,5 +17,5 @@ public interface TavernaService {
Observable<Announcements> getAllAnnouncements(@Query("page") int pageNumber);
@GET("/announcement.xml")
- Observable<Announcement> getAnnouncement(@Query("id") String id);
+ Observable<DetailAnnouncement> getAnnouncement(@Query("id") String id);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
index 5cc1c9a..ed705f7 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/AnnouncementAdapter.java
@@ -9,26 +9,28 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import org.apache.taverna.mobile.R;
-import org.apache.taverna.mobile.data.model.Announcements;
-
+import org.apache.taverna.mobile.data.model.Announcement;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
+/**
+ * Created by Sagar
+ */
public class AnnouncementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
- private List<Announcements.Announcement> mAnnouncementList;
+ private List<Announcement> mAnnouncementList;
private final int VIEW_ITEM = 1;
private final int VIEW_PROG = 0;
- public AnnouncementAdapter( List<Announcements.Announcement> announcementList) {
+ public AnnouncementAdapter( List<Announcement> announcementList) {
mAnnouncementList = announcementList;
}
- public void setAnnouncementList(List<Announcements.Announcement> announcementList) {
+ public void setAnnouncementList(List<Announcement> announcementList) {
mAnnouncementList = announcementList;
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java
index c9d1aee..46315ad 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/EndlessRecyclerOnScrollListener.java
@@ -3,6 +3,9 @@ package org.apache.taverna.mobile.ui.adapter;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+/**
+ * Created by Sagar
+ */
public abstract class EndlessRecyclerOnScrollListener extends RecyclerView.OnScrollListener {
public static String TAG = EndlessRecyclerOnScrollListener.class.getSimpleName();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/app/src/main/java/org/apache/taverna/mobile/ui/adapter/RecyclerItemClickListner.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/RecyclerItemClickListner.java b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/RecyclerItemClickListner.java
index d6fd5d1..1e03ff6 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/adapter/RecyclerItemClickListner.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/adapter/RecyclerItemClickListner.java
@@ -7,6 +7,9 @@ import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
+/**
+ * Created by Sagar
+ */
public class RecyclerItemClickListner implements RecyclerView.OnItemTouchListener {
protected OnItemClickListener listener;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/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 692f40c..7fc0e09 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
@@ -23,7 +23,7 @@ import android.widget.TextView;
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.model.Announcement;
+import org.apache.taverna.mobile.data.model.DetailAnnouncement;
import org.apache.taverna.mobile.data.model.Announcements;
import org.apache.taverna.mobile.ui.adapter.AnnouncementAdapter;
import org.apache.taverna.mobile.ui.adapter.EndlessRecyclerOnScrollListener;
@@ -33,27 +33,38 @@ import org.apache.taverna.mobile.utils.ScrollChildSwipeRefreshLayout;
import butterknife.BindView;
import butterknife.ButterKnife;
+/**
+ * Created by Sagar
+ */
public class AnnouncementFragment extends Fragment implements RecyclerItemClickListner.OnItemClickListener, AnnouncementMvpView {
- public final String LOG_TAG = getClass().getSimpleName();
+ public final String LOG_TAG = getClass().getSimpleName();
+
+ @BindView(R.id.rv_movies)
+ RecyclerView mRecyclerView;
- @BindView(R.id.rv_movies) RecyclerView mRecyclerView;
@BindView(R.id.swipe_refresh)
ScrollChildSwipeRefreshLayout mSwipeRefresh;
+
@BindView(R.id.progress_circular)
ProgressBar mProgressBar;
private Announcements mAnnouncements;
+
private DataManager dataManager;
- private AnnouncementPresenter mMainPresenter;
+
+ private AnnouncementPresenter mAnnouncementPresenter;
+
private AnnouncementAdapter mAnnouncementAdapter;
- private String category;
+
private int mPageNumber = 1;
- private Announcement mAnnouncementDetail;
+
+ private DetailAnnouncement mAnnouncementDetail;
+
@Override
public void onItemClick(View childView, int position) {
- mMainPresenter.loadAnnouncementDetails(mAnnouncements.getAnnouncement().get(position).getId());
+ mAnnouncementPresenter.loadAnnouncementDetails(mAnnouncements.getAnnouncement().get(position).getId());
}
@Override
@@ -62,14 +73,13 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
}
-
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
mAnnouncements = new Announcements();
dataManager = new DataManager();
- mMainPresenter = new AnnouncementPresenter(dataManager);
+ mAnnouncementPresenter = new AnnouncementPresenter(dataManager);
}
@@ -77,13 +87,13 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_announcement, container, false);
ButterKnife.bind(this, rootView);
- mMainPresenter.attachView(this);
+ mAnnouncementPresenter.attachView(this);
Toolbar toolbar = (Toolbar) rootView.findViewById(R.id.toolbar);
((AppCompatActivity) getActivity()).setSupportActionBar(toolbar);
final ActionBar ab = ((AppCompatActivity) getActivity()).getSupportActionBar();
- if(ab!=null) {
+ if (ab != null) {
ab.setHomeAsUpIndicator(R.drawable.ic_menu);
ab.setDisplayHomeAsUpEnabled(true);
}
@@ -105,11 +115,10 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
if (networkInfo != null && networkInfo.isConnected()) {
if (mSwipeRefresh.isRefreshing()) {
mPageNumber = 1;
- mMainPresenter.loadAllAnnouncement(mPageNumber);
+ mAnnouncementPresenter.loadAllAnnouncement(mPageNumber);
Log.i(LOG_TAG, "Swipe Refresh");
}
- }
- else {
+ } else {
Log.i(LOG_TAG, "NO Internet Connection");
if (mSwipeRefresh.isRefreshing()) {
mSwipeRefresh.setRefreshing(false);
@@ -120,23 +129,20 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
});
- mMainPresenter.loadAllAnnouncement(mPageNumber);
+ mAnnouncementPresenter.loadAllAnnouncement(mPageNumber);
mRecyclerView.setOnScrollListener(new EndlessRecyclerOnScrollListener(layoutManager) {
@Override
public void onLoadMore(int current_page) {
ConnectivityManager connMgr = (ConnectivityManager) getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
- if (networkInfo != null && networkInfo.isConnected())
- {
+ if (networkInfo != null && networkInfo.isConnected()) {
mAnnouncements.getAnnouncement().add(null);
mAnnouncementAdapter.notifyItemInserted(mAnnouncements.getAnnouncement().size());
mPageNumber = ++mPageNumber;
- mMainPresenter.loadAllAnnouncement(mPageNumber);
+ mAnnouncementPresenter.loadAllAnnouncement(mPageNumber);
Log.i(LOG_TAG, "Loading more");
- }
- else
- {
+ } else {
Log.i(LOG_TAG, "Internet not available. Not loading more posts.");
}
}
@@ -147,19 +153,18 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
@Override
public void onDestroyView() {
super.onDestroyView();
- mMainPresenter.detachView();
+ mAnnouncementPresenter.detachView();
}
-
@Override
public void showAllAnouncement(Announcements announcements) {
- if(mPageNumber == 1){
+ if (mPageNumber == 1) {
mAnnouncements = announcements;
mAnnouncementAdapter = new AnnouncementAdapter(mAnnouncements.getAnnouncement());
mRecyclerView.setAdapter(mAnnouncementAdapter);
- }else {
- mAnnouncements.getAnnouncement().remove(mAnnouncements.getAnnouncement().size()-1);
+ } else {
+ mAnnouncements.getAnnouncement().remove(mAnnouncements.getAnnouncement().size() - 1);
mAnnouncements.getAnnouncement().addAll(announcements.getAnnouncement());
}
@@ -172,23 +177,23 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
@Override
public void showProgressbar(boolean status) {
- if (status){
+ if (status) {
mProgressBar.setVisibility(View.VISIBLE);
- }else
+ } else
mProgressBar.setVisibility(View.GONE);
}
@Override
- public void showAnnouncementDetail(Announcement announcement) {
- mAnnouncementDetail =announcement;
+ public void showAnnouncementDetail(DetailAnnouncement detailAnnouncement) {
+ mAnnouncementDetail = detailAnnouncement;
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext());
LayoutInflater inflater = getActivity().getLayoutInflater();
View dialogView = inflater.inflate(R.layout.detail_annoucement_dialog_layout, null);
dialogBuilder.setView(dialogView);
- TextView title =(TextView) dialogView.findViewById(R.id.tvDialogTitle);
- TextView date =(TextView) dialogView.findViewById(R.id.tvDialogDate);
- TextView author=(TextView) dialogView.findViewById(R.id.tvDialogAuthor);
- WebView text=(WebView) dialogView.findViewById(R.id.wvDialogText);
+ TextView title = ButterKnife.findById(dialogView, R.id.tvDialogTitle);
+ TextView date = ButterKnife.findById(dialogView, R.id.tvDialogDate);
+ TextView author = ButterKnife.findById(dialogView, R.id.tvDialogAuthor);
+ WebView text = ButterKnife.findById(dialogView, R.id.wvDialogText);
text.loadDataWithBaseURL("", mAnnouncementDetail.getText(), "text/html", "utf-8", "");
date.setText(mAnnouncementDetail.getDate());
title.setText(mAnnouncementDetail.getTitle());
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/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 d419387..2c6435f 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
@@ -1,12 +1,15 @@
package org.apache.taverna.mobile.ui.anouncements;
-import org.apache.taverna.mobile.data.model.Announcement;
+import org.apache.taverna.mobile.data.model.DetailAnnouncement;
import org.apache.taverna.mobile.data.model.Announcements;
import org.apache.taverna.mobile.ui.base.MvpView;
+/**
+ * Created by Sagar
+ */
public interface AnnouncementMvpView extends MvpView {
void showAllAnouncement(Announcements announcements);
void showProgressbar(boolean b);
- void showAnnouncementDetail(Announcement announcement);
+ void showAnnouncementDetail(DetailAnnouncement detailAnnouncement);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/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 9cfc6f2..d4d0541 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
@@ -3,7 +3,7 @@ package org.apache.taverna.mobile.ui.anouncements;
import android.util.Log;
import org.apache.taverna.mobile.data.DataManager;
-import org.apache.taverna.mobile.data.model.Announcement;
+import org.apache.taverna.mobile.data.model.DetailAnnouncement;
import org.apache.taverna.mobile.data.model.Announcements;
import org.apache.taverna.mobile.ui.base.BasePresenter;
import rx.Observer;
@@ -11,6 +11,9 @@ import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers;
+/**
+ * Created by Sagar
+ */
public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> {
public final String LOG_TAG = getClass().getSimpleName();
@@ -61,7 +64,7 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> {
mSubscriptions = mDataManager.getAnnouncementDetail(id)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
- .subscribe(new Observer<Announcement>() {
+ .subscribe(new Observer<DetailAnnouncement>() {
@Override
public void onCompleted() {
getMvpView().showProgressbar(false);
@@ -73,8 +76,8 @@ public class AnnouncementPresenter extends BasePresenter<AnnouncementMvpView> {
}
@Override
- public void onNext(Announcement announcement) {
- getMvpView().showAnnouncementDetail(announcement);
+ public void onNext(DetailAnnouncement detailAnnouncement) {
+ getMvpView().showAnnouncementDetail(detailAnnouncement);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/215e06c3/app/src/main/java/org/apache/taverna/mobile/utils/ScrollChildSwipeRefreshLayout.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/ScrollChildSwipeRefreshLayout.java b/app/src/main/java/org/apache/taverna/mobile/utils/ScrollChildSwipeRefreshLayout.java
index f4e0e70..5666e40 100644
--- a/app/src/main/java/org/apache/taverna/mobile/utils/ScrollChildSwipeRefreshLayout.java
+++ b/app/src/main/java/org/apache/taverna/mobile/utils/ScrollChildSwipeRefreshLayout.java
@@ -6,6 +6,9 @@ import android.support.v4.widget.SwipeRefreshLayout;
import android.util.AttributeSet;
import android.view.View;
+/**
+ * Created by Sagar
+ */
public class ScrollChildSwipeRefreshLayout extends SwipeRefreshLayout {
private View mScrollUpChild;