chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Adds the local timeline.

Browse source
This commit is contained in:
Vavassor 2017-03-30 22:31:17 -04:00
commit 53376da406
5 changed files with 46 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/keylesspalace/tusky/MainActivity.java
View file

@ -111,7 +111,8 @@ public class MainActivity extends BaseActivity {
String[] pageTitles = {
getString(R.string.title_home),
getString(R.string.title_notifications),
getString(R.string.title_public)
getString(R.string.title_public_federated),
getString(R.string.title_public_local),
};
adapter.setPageTitles(pageTitles);
@ -126,7 +127,8 @@ public class MainActivity extends BaseActivity {
tabLayout.getTabAt(0).setIcon(R.drawable.ic_home_24dp);
tabLayout.getTabAt(1).setIcon(R.drawable.ic_notifications_24dp);
tabLayout.getTabAt(2).setIcon(R.drawable.ic_public_24dp);
tabLayout.getTabAt(2).setIcon(R.drawable.ic_local_24dp);
tabLayout.getTabAt(3).setIcon(R.drawable.ic_public_24dp);
tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
@ -167,7 +169,7 @@ public class MainActivity extends BaseActivity {
}
}
}
for (int i = 0; i < 3; i++) {
for (int i = 0; i < 4; i++) {
tintTab(tabLayout.getTabAt(i), i == tabSelected);
}

9
app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java
View file

@ -43,7 +43,8 @@ public class TimelineFragment extends SFragment implements
enum Kind {
HOME,
PUBLIC,
PUBLIC_LOCAL,
PUBLIC_FEDERATED,
TAG,
USER,
FAVOURITES
@ -186,10 +187,14 @@ public class TimelineFragment extends SFragment implements
listCall = api.homeTimeline(fromId, uptoId, null);
break;
}
case PUBLIC: {
case PUBLIC_FEDERATED: {
listCall = api.publicTimeline(null, fromId, uptoId, null);
break;
}
case PUBLIC_LOCAL: {
listCall = api.publicTimeline(true, fromId, uptoId, null);
break;
}
case TAG: {
listCall = api.hashtagTimeline(hashtagOrId, null, fromId, uptoId, null);
break;

7
app/src/main/java/com/keylesspalace/tusky/TimelinePagerAdapter.java
View file

@ -40,7 +40,10 @@ class TimelinePagerAdapter extends FragmentPagerAdapter {
return NotificationsFragment.newInstance();
}
case 2: {
return TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC);
return TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_LOCAL);
}
case 3: {
return TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_FEDERATED);
}
default: {
return null;
@ -50,7 +53,7 @@ class TimelinePagerAdapter extends FragmentPagerAdapter {
@Override
public int getCount() {
return 3;
return 4;
}
@Override