Browse Source

finish recent fragment

firestoreRecent
oogee 6 years ago
parent
commit
d4a3e90093
  1. 4
      app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
  2. 53
      app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java

4
app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java

@ -147,7 +147,9 @@ public class MainActivity extends BaseActivity implements RecentFragment.RecentF
@Override @Override
public void onRecentFragmentInteraction(RecentItem recentItem) { public void onRecentFragmentInteraction(RecentItem recentItem) {
Intent i = new Intent(MainActivity.this, TopicActivity.class); Intent i = new Intent(MainActivity.this, TopicActivity.class);
i.putExtra(BUNDLE_TOPIC_URL, recentItem.getTopicUrl()); //TODO: Improve this shit with a thmmy url class in model probably
i.putExtra(BUNDLE_TOPIC_URL, "https://www.thmmy.gr/smf/index.php?topic=" +
recentItem.getTopicId() + ".msg" + recentItem.getPostId() + ";topicseen#new");
i.putExtra(BUNDLE_TOPIC_TITLE, recentItem.getTopicTitle()); i.putExtra(BUNDLE_TOPIC_TITLE, recentItem.getTopicTitle());
i.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); i.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
startActivity(i); startActivity(i);

53
app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java

@ -24,10 +24,7 @@ import gr.thmmy.mthmmy.R;
import gr.thmmy.mthmmy.base.BaseApplication; import gr.thmmy.mthmmy.base.BaseApplication;
import gr.thmmy.mthmmy.base.BaseFragment; import gr.thmmy.mthmmy.base.BaseFragment;
import gr.thmmy.mthmmy.model.RecentItem; import gr.thmmy.mthmmy.model.RecentItem;
import gr.thmmy.mthmmy.model.TopicSummary;
import gr.thmmy.mthmmy.session.SessionManager;
import gr.thmmy.mthmmy.utils.CustomRecyclerView; import gr.thmmy.mthmmy.utils.CustomRecyclerView;
import gr.thmmy.mthmmy.utils.NetworkResultCodes;
import me.zhanghai.android.materialprogressbar.MaterialProgressBar; import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
import timber.log.Timber; import timber.log.Timber;
@ -48,7 +45,7 @@ public class RecentFragment extends BaseFragment {
private SwipeRefreshLayout swipeRefreshLayout; private SwipeRefreshLayout swipeRefreshLayout;
private RecentAdapter recentAdapter; private RecentAdapter recentAdapter;
private ArrayList<RecentItem> recentItems; private ArrayList<RecentItem> recentItems = new ArrayList<>();
// Required empty public constructor // Required empty public constructor
public RecentFragment() {} public RecentFragment() {}
@ -78,10 +75,18 @@ public class RecentFragment extends BaseFragment {
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
if (recentItems == null) { if (recentItems == null) {
Timber.d("I'm ere");
new AsyncTask<Void, Void, Void>() {
@Override
protected Void doInBackground(Void... voids) {
DocumentReference docRef = BaseApplication.getInstance().getFirestoredb() DocumentReference docRef = BaseApplication.getInstance().getFirestoredb()
.collection("recent_posts") .collection("recent_posts")
.document("recent"); .document("recent");
Timber.d("I'm here");
docRef.get().addOnCompleteListener(task -> { docRef.get().addOnCompleteListener(task -> {
Timber.d("I'm there");
progressBar.setVisibility(ProgressBar.INVISIBLE);
if (task.isSuccessful()) { if (task.isSuccessful()) {
DocumentSnapshot recentDocument = task.getResult(); DocumentSnapshot recentDocument = task.getResult();
List<DocumentReference> posts = (List<DocumentReference>) recentDocument.get("posts"); List<DocumentReference> posts = (List<DocumentReference>) recentDocument.get("posts");
@ -97,8 +102,14 @@ public class RecentFragment extends BaseFragment {
recentItems.add(recentItem); recentItems.add(recentItem);
} }
}); });
} else {
Toast.makeText(getContext(), "Network error", Toast.LENGTH_SHORT).show();
} }
}); });
return null;
}
}.execute();
progressBar.setVisibility(ProgressBar.VISIBLE);
} }
Timber.d("onActivityCreated"); Timber.d("onActivityCreated");
} }
@ -126,47 +137,13 @@ public class RecentFragment extends BaseFragment {
swipeRefreshLayout = rootView.findViewById(R.id.swiperefresh); swipeRefreshLayout = rootView.findViewById(R.id.swiperefresh);
swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.primary); swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.primary);
swipeRefreshLayout.setColorSchemeResources(R.color.accent); swipeRefreshLayout.setColorSchemeResources(R.color.accent);
swipeRefreshLayout.setOnRefreshListener(() -> {
if (!recentTask.isRunning()) {
recentTask = new RecentTask(this::onRecentTaskStarted, this::onRecentTaskFinished);
recentTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, SessionManager.indexUrl.toString());
}
}
);
} }
return rootView; return rootView;
} }
@Override
public void onDestroy() {
super.onDestroy();
if (recentTask.isRunning())
recentTask.cancel(true);
}
public interface RecentFragmentInteractionListener extends FragmentInteractionListener { public interface RecentFragmentInteractionListener extends FragmentInteractionListener {
void onRecentFragmentInteraction(RecentItem topicSummary); void onRecentFragmentInteraction(RecentItem topicSummary);
} }
private void onRecentTaskStarted() {
progressBar.setVisibility(ProgressBar.VISIBLE);
}
private void onRecentTaskFinished(int resultCode, ArrayList<TopicSummary> fetchedRecent) {
if (resultCode == NetworkResultCodes.SUCCESSFUL) {
topicSummaries.clear();
topicSummaries.addAll(fetchedRecent);
recentAdapter.notifyDataSetChanged();
} else if (resultCode == NetworkResultCodes.NETWORK_ERROR) {
Toast.makeText(getContext(), "Network error", Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getContext(), "Unexpected error," +
" please contact the developers with the details", Toast.LENGTH_LONG).show();
}
progressBar.setVisibility(ProgressBar.INVISIBLE);
swipeRefreshLayout.setRefreshing(false);
}
} }

Loading…
Cancel
Save