Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix offset issue with column

This commit is contained in:
stom79 2018-10-12 17:45:18 +02:00
parent 446bfa1d42
commit ad8b554144
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
View File

@ -1793,7 +1793,7 @@ public abstract class BaseMainActivity extends BaseActivity
@NonNull
@Override
public Object instantiateItem(ViewGroup container, int position) {
public Object instantiateItem(@NonNull ViewGroup container, int position) {
Fragment createdFragment = (Fragment) super.instantiateItem(container, position);
// save the appropriate reference depending on position
switch (position) {
@ -1804,13 +1804,18 @@ public abstract class BaseMainActivity extends BaseActivity
notificationsFragment = (DisplayNotificationsFragment) createdFragment;
break;
case 2:
if ( !display_local && display_global)
federatedFragment = (DisplayStatusFragment) createdFragment;
if( display_local)
if( !display_direct && display_local)
localFragment = (DisplayStatusFragment) createdFragment;
break;
else if ( !display_direct && display_global)
federatedFragment = (DisplayStatusFragment) createdFragment;
case 3:
if( display_local && display_global)
if( display_direct && display_local)
localFragment = (DisplayStatusFragment) createdFragment;
else if( !display_direct && display_local && display_global)
federatedFragment = (DisplayStatusFragment) createdFragment;
break;
case 4:
if( display_direct && display_local && display_global)
federatedFragment = (DisplayStatusFragment) createdFragment;
break;
}