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

Fix tab not hidden

This commit is contained in:
Thomas 2022-06-11 18:42:00 +02:00
parent 6b043fc451
commit b043744070
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/client/entities/app/BottomMenu.java
View File

@ -122,7 +122,7 @@ public class BottomMenu implements Serializable {
bottomNavigationView.getMenu().clear();
BottomMenu bottomMenu = null;
try {
bottomMenu = getAllBottomMenu(account);
bottomMenu = getBottomMenu(account);
} catch (DBException e) {
e.printStackTrace();
}

4
app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
View File

@ -148,7 +148,7 @@ public class PinnedTimelineHelper {
activityMainBinding.tabLayout.removeAllTabs();
//Small hack to hide first tabs (they represent the item of the bottom menu)
int toRemove = itemToRemoveInBottomMenu(activity);
for (int i = 0; i < BOTTOM_TIMELINE_COUNT - toRemove; i++) {
for (int i = 0; i < (BOTTOM_TIMELINE_COUNT - toRemove); i++) {
activityMainBinding.tabLayout.addTab(activityMainBinding.tabLayout.newTab());
((ViewGroup) activityMainBinding.tabLayout.getChildAt(0)).getChildAt(i).setVisibility(View.GONE);
}
@ -216,7 +216,7 @@ public class PinnedTimelineHelper {
@Override
public void onPageSelected(int position) {
if (position < BOTTOM_TIMELINE_COUNT) {
if (position < BOTTOM_TIMELINE_COUNT - toRemove) {
activityMainBinding.bottomNavView.getMenu().getItem(position).setChecked(true);
} else {
activityMainBinding.bottomNavView.getMenu().setGroupCheckable(0, true, false);

10
app/src/main/java/app/fedilab/android/ui/pageadapter/FedilabPageAdapter.java
View File

@ -16,6 +16,7 @@ package app.fedilab.android.ui.pageadapter;
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
@ -74,10 +75,11 @@ public class FedilabPageAdapter extends FragmentStatePagerAdapter {
FragmentMastodonTimeline fragment = new FragmentMastodonTimeline();
Bundle bundle = new Bundle();
//Position 3 is for notifications
if (position < BOTTOM_TIMELINE_COUNT - toRemove) {
Log.v(Helper.TAG, "position: " + position + " -> " + (BOTTOM_TIMELINE_COUNT - toRemove));
if (position < (BOTTOM_TIMELINE_COUNT - toRemove)) {
if (bottomMenu != null) {
BottomMenu.ItemMenuType type = BottomMenu.getType(bottomMenu, position);
Log.v(Helper.TAG, "type: " + type);
if (type == null) {
return fragment;
}
@ -99,9 +101,10 @@ public class FedilabPageAdapter extends FragmentStatePagerAdapter {
} else {
int pinnedPosition = position - (BOTTOM_TIMELINE_COUNT - toRemove); //Real position has an offset.
Log.v(Helper.TAG, "pinnedPosition: " + pinnedPosition);
PinnedTimeline pinnedTimeline = pinned.pinnedTimelines.get(pinnedPosition);
bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, pinnedTimeline.type);
Log.v(Helper.TAG, " pinnedTimeline.type: " + pinnedTimeline.type);
if (pinnedTimeline.type == Timeline.TimeLineEnum.LIST) {
bundle.putString(Helper.ARG_LIST_ID, pinnedTimeline.mastodonList.id);
} else if (pinnedTimeline.type == Timeline.TimeLineEnum.TAG) {
@ -119,7 +122,6 @@ public class FedilabPageAdapter extends FragmentStatePagerAdapter {
@Override
public int getCount() {
if (pinned != null && pinned.pinnedTimelines != null) {
return pinned.pinnedTimelines.size() + BOTTOM_TIMELINE_COUNT - toRemove;
} else {