owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changing stuff back to how it was, and changing postsFragment to conversationsFragment

Browse Source
This commit is contained in:
LucasGGamerM
2023-01-22 14:47:28 -03:00
parent 135a98224f
commit 521c742d1a
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
View File

@@ -20,8 +20,6 @@ import org.joinmastodon.android.api.requests.accounts.GetFollowRequests;
import org.joinmastodon.android.events.FollowRequestHandledEvent; import org.joinmastodon.android.events.FollowRequestHandledEvent;
import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.Account;
import org.joinmastodon.android.model.HeaderPaginationList; import org.joinmastodon.android.model.HeaderPaginationList;
import org.joinmastodon.android.model.Notification;
import org.joinmastodon.android.model.Token;
import org.joinmastodon.android.ui.SimpleViewHolder; import org.joinmastodon.android.ui.SimpleViewHolder;
import org.joinmastodon.android.ui.tabs.TabLayout; import org.joinmastodon.android.ui.tabs.TabLayout;
import org.joinmastodon.android.ui.tabs.TabLayoutMediator; import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -46,9 +44,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
private FrameLayout[] tabViews; private FrameLayout[] tabViews;
private TabLayoutMediator tabLayoutMediator; private TabLayoutMediator tabLayoutMediator;
private NotificationsListFragment allNotificationsFragment, mentionsFragment; private NotificationsListFragment allNotificationsFragment, mentionsFragment, conversationsFragment;
private ConversationsTimelineFragment conversationsTimelineFragment;
private String accountID; private String accountID;
@@ -92,7 +88,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
} else if (item.getItemId() == R.id.clear_notifications) { } else if (item.getItemId() == R.id.clear_notifications) {
UiUtils.confirmDeleteNotification(getActivity(), accountID, null, ()->{ UiUtils.confirmDeleteNotification(getActivity(), accountID, null, ()->{
for (int i = 0; i < tabViews.length; i++) { for (int i = 0; i < tabViews.length; i++) {
// getFragmentForPage(i).reload(); getFragmentForPage(i).reload();
} }
}); });
return true; return true;
@@ -155,14 +151,14 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
mentionsFragment.setArguments(args); mentionsFragment.setArguments(args);
args=new Bundle(args); args=new Bundle(args);
args.putBoolean("onlyPosts", true); args.putBoolean("onlyConversations", true);
conversationsTimelineFragment=new ConversationsTimelineFragment(); conversationsFragment =new NotificationsListFragment();
conversationsTimelineFragment.setArguments(args); conversationsFragment.setArguments(args);
getChildFragmentManager().beginTransaction() getChildFragmentManager().beginTransaction()
.add(R.id.notifications_all, allNotificationsFragment) .add(R.id.notifications_all, allNotificationsFragment)
.add(R.id.notifications_mentions, mentionsFragment) .add(R.id.notifications_mentions, mentionsFragment)
.add(R.id.notifications_posts, conversationsTimelineFragment) .add(R.id.notifications_posts, conversationsFragment)
.commit(); .commit();
} }
@@ -172,7 +168,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
tab.setText(switch(position){ tab.setText(switch(position){
case 0 -> R.string.all_notifications; case 0 -> R.string.all_notifications;
case 1 -> R.string.mentions; case 1 -> R.string.mentions;
case 2 -> R.string.sk_conversations; case 2 -> R.string.posts;
default -> throw new IllegalStateException("Unexpected value: "+position); default -> throw new IllegalStateException("Unexpected value: "+position);
}); });
tab.view.textView.setAllCaps(true); tab.view.textView.setAllCaps(true);
@@ -202,7 +198,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
@Override @Override
public void scrollToTop(){ public void scrollToTop(){
// getFragmentForPage(pager.getCurrentItem()).scrollToTop(); getFragmentForPage(pager.getCurrentItem()).scrollToTop();
} }
public void loadData(){ public void loadData(){
@@ -217,11 +213,11 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
getToolbar().setOutlineProvider(null); getToolbar().setOutlineProvider(null);
} }
private Fragment getFragmentForPage(int page){ private NotificationsListFragment getFragmentForPage(int page){
return switch(page){ return switch(page){
case 0 -> allNotificationsFragment; case 0 -> allNotificationsFragment;
case 1 -> mentionsFragment; case 1 -> mentionsFragment;
case 2 -> conversationsTimelineFragment; case 2 -> conversationsFragment;
default -> throw new IllegalStateException("Unexpected value: "+page); default -> throw new IllegalStateException("Unexpected value: "+page);
}; };
} }

3
mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
View File

@@ -40,6 +40,8 @@ import me.grishka.appkit.utils.V;
public class NotificationsListFragment extends BaseStatusListFragment<Notification>{ public class NotificationsListFragment extends BaseStatusListFragment<Notification>{
private boolean onlyMentions; private boolean onlyMentions;
private boolean onlyPosts; private boolean onlyPosts;
private boolean onlyConversations;
private String maxID; private String maxID;
@Override @Override
@@ -59,6 +61,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
super.onAttach(activity); super.onAttach(activity);
onlyMentions=getArguments().getBoolean("onlyMentions", false); onlyMentions=getArguments().getBoolean("onlyMentions", false);
onlyPosts=getArguments().getBoolean("onlyPosts", false); onlyPosts=getArguments().getBoolean("onlyPosts", false);
onlyConversations=getArguments().getBoolean("onlyConversations", false);
} }
@Override @Override