Skip to content
This repository was archived by the owner on Jun 12, 2018. It is now read-only.

Fix issue #2 #5

Open
fadils wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue #2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions android/src/com/parse/f8/view/ScheduleActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
public class ScheduleActivity extends BaseActivity implements
ActionBar.TabListener {

private static ScheduleActivity instance;
private ScheduleSectionsPagerAdapter scheduleSectionsPagerAdapter;
private ViewPager sectionsViewPager;
private ActionBar actionBar;
Expand Down Expand Up @@ -81,6 +82,8 @@ public void onPageSelected(int position) {
actionBar.addTab(scheduleTab);
}

instance = this;

}

public static class ScheduleSectionsPagerAdapter extends
Expand Down Expand Up @@ -161,4 +164,8 @@ public void onTabUnselected(Tab arg0, FragmentTransaction arg1) {
}
}

public static ScheduleActivity getInstance() {
return instance;
}

}
16 changes: 8 additions & 8 deletions android/src/com/parse/f8/view/ScheduleFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@

package com.parse.f8.view;

import java.util.ArrayList;
import java.util.List;

import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
Expand All @@ -46,8 +43,10 @@
import com.parse.f8.model.Talk;
import com.parse.f8.util.TalkListAdapter;

public class ScheduleFragment extends Fragment {
import java.util.ArrayList;
import java.util.List;

public class ScheduleFragment extends Fragment {
public static final String ARG_TRACK = "track";

public String[] scheduleTitles;
Expand Down Expand Up @@ -93,7 +92,8 @@ public void onCreate(Bundle savedInstanceState) {
public void done(Talk talk, ParseException e) {
if (talk != null) {
talkList.add(talk);
if (!getActivity().isFinishing()) {

if (!ScheduleActivity.getInstance().isFinishing()) {
// Update view
updateView();
}
Expand All @@ -102,7 +102,7 @@ public void done(Talk talk, ParseException e) {
});
} else {
// This is a list of talks for a track
adapter = new TalkListAdapter(getActivity(), false);
adapter = new TalkListAdapter(ScheduleActivity.getInstance(), false);
// Get the room info corresponding to this track
Room.findInBackground(track, new GetCallback<Room>() {
@Override
Expand All @@ -119,7 +119,7 @@ public void done(List<Talk> talks, ParseException e) {
adapter.add(talk);
}
}
if (!getActivity().isFinishing()) {
if (!ScheduleActivity.getInstance().isFinishing()) {
// Update view
updateView();
}
Expand Down Expand Up @@ -167,7 +167,7 @@ public void onItemClick(AdapterView<?> parent, View view,
// 1
Talk talk = adapter.getItem(position - 1);
if (!talk.isBreak()) {
Intent intent = new Intent(getActivity(),
Intent intent = new Intent(ScheduleActivity.getInstance(),
TalkActivity.class);
intent.setData(talk.getUri());
startActivity(intent);
Expand Down