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

refactor: fix compilation problems by refactoring old code

Browse Source
This commit is contained in:
LucasGGamerM
2023-06-09 18:52:08 -03:00
parent 7700288dbe
commit bc7f614573
19 changed files with 29 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
View File

@@ -239,11 +239,6 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
smoothScrollRecyclerViewToTop(list);
}
@Override
public boolean isScrolledToTop() {
return list.getChildAt(0).getTop() == 0;
}
@Override
public void onDestroy() {
super.onDestroy();

5
mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
View File

@@ -145,11 +145,6 @@ public class FollowRequestsListFragment extends RecyclerFragment<FollowRequestsL
}
}
@Override
public boolean isScrolledToTop() {
return list.getChildAt(0).getTop() == 0;
}
@Override
public void scrollToTop(){
smoothScrollRecyclerViewToTop(list);

4
mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
View File

@@ -72,10 +72,6 @@ public class FollowedHashtagsFragment extends RecyclerFragment<Hashtag> implemen
return new HashtagsAdapter();
}
@Override
public boolean isScrolledToTop() {
return list.getChildAt(0).getTop() == 0;
}
@Override
public void scrollToTop() {

7
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
View File

@@ -510,7 +510,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
@Override
public void scrollToTop(){
if (((ScrollableToTop) fragments[pager.getCurrentItem()]).isScrolledToTop() &&
if (((IsOnTop) fragments[pager.getCurrentItem()]).isOnTop() &&
GlobalUserPreferences.doubleTapToSwipe && !newPostsBtnShown) {
int nextPage = (pager.getCurrentItem() + 1) % count;
navigateTo(nextPage);
@@ -519,11 +519,6 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
((ScrollableToTop) fragments[pager.getCurrentItem()]).scrollToTop();
}
@Override
public boolean isScrolledToTop() {
return ((ScrollableToTop) fragments[pager.getCurrentItem()]).isScrolledToTop();
}
public void hideNewPostsButton(){
if(!newPostsBtnShown)
return;

5
mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java
View File

@@ -196,11 +196,6 @@ public class ListsFragment extends RecyclerFragment<ListTimeline> implements Scr
return adapter = new ListsAdapter();
}
@Override
public boolean isScrolledToTop() {
return list.getChildAt(0).getTop() == 0;
}
@Override
public void scrollToTop() {
smoothScrollRecyclerViewToTop(list);

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

@@ -212,7 +212,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
@Override
public void scrollToTop(){
if (getFragmentForPage(pager.getCurrentItem()).isScrolledToTop() && GlobalUserPreferences.doubleTapToSwipe) {
if (getFragmentForPage(pager.getCurrentItem()).isOnTop() && GlobalUserPreferences.doubleTapToSwipe) {
int nextPage = (pager.getCurrentItem() + 1) % tabViews.length;
pager.setCurrentItem(nextPage, true);
return;
@@ -220,11 +220,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc
getFragmentForPage(pager.getCurrentItem()).scrollToTop();
}
@Override
public boolean isScrolledToTop() {
return getFragmentForPage(pager.getCurrentItem()).isScrolledToTop();
}
public void loadData(){
refreshFollowRequestsBadge();
if(allNotificationsFragment!=null && !allNotificationsFragment.loaded && !allNotificationsFragment.dataLoading)

19
mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
View File

@@ -448,6 +448,25 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
V.setVisibilityAnimated(fab, View.VISIBLE);
}
public void setNote(String note){
this.note=note;
noteWrap.setVisibility(View.VISIBLE);
noteEdit.setVisibility(View.VISIBLE);
noteEdit.setText(note);
}
private void savePrivateNote(){
new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
@Override
public void onSuccess(Relationship result) {}
@Override
public void onError(ErrorResponse error) {
error.showToast(getActivity());
}
}).exec(accountID);
}
@Override
protected void doLoadData(){
if (remoteAccount != null) {

2
mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
View File

@@ -107,7 +107,7 @@ public class ThreadFragment extends StatusListFragment implements ProvidesAssist
}
for (int deleteThisItem : deleteTheseItems) itemsToModify.remove(deleteThisItem);
if(s.id.equals(mainStatus.id)) {
items.add(new ExtendedFooterStatusDisplayItem(s.id, this, s.getContentStatus()));
items.add(new ExtendedFooterStatusDisplayItem(s.id, this, getAccountID(), s.getContentStatus()));
}
return items;
}

5
mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
View File

@@ -33,9 +33,4 @@ public class StatusFavoritesListFragment extends StatusRelatedAccountListFragmen
? statusUri
: statusUri.buildUpon().appendPath("favourites").build();
}
@Override
public HeaderPaginationRequest<Account> onCreateRemoteRequest(String id, String maxID, int count) {
return null;
}
}

5
mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
View File

@@ -33,9 +33,4 @@ public class StatusReblogsListFragment extends StatusRelatedAccountListFragment{
? statusUri
: statusUri.buildUpon().appendPath("reblogs").build();
}
@Override
public HeaderPaginationRequest<Account> onCreateRemoteRequest(String id, String maxID, int count) {
return null;
}
}

5
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
View File

@@ -143,11 +143,6 @@ public class DiscoverAccountsFragment extends RecyclerFragment<DiscoverAccountsF
smoothScrollRecyclerViewToTop(list);
}
@Override
public boolean isScrolledToTop() {
return list.getChildAt(0).getTop() == 0;
}
@Override
public boolean isOnTop() {
return isRecyclerViewOnTop(list);

9
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
View File

@@ -224,15 +224,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
return view;
}
@Override
public boolean isScrolledToTop() {
if(!searchActive){
return ((ScrollableToTop)getFragmentForPage(pager.getCurrentItem())).isScrolledToTop();
}else{
return searchFragment.isScrolledToTop();
}
}
@Override
public void scrollToTop(){
if(!searchActive){

5
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
View File

@@ -68,11 +68,6 @@ public class DiscoverHashtagsFragment extends RecyclerFragment<Hashtag> implemen
bannerHelper.maybeAddBanner(contentWrap);
}
@Override
public boolean isScrolledToTop() {
return list.getChildAt(0).getTop() == 0;
}
@Override
public void scrollToTop(){
smoothScrollRecyclerViewToTop(list);

5
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
View File

@@ -80,11 +80,6 @@ public class DiscoverNewsFragment extends RecyclerFragment<Card> implements Scro
bannerHelper.maybeAddBanner(contentWrap);
}
@Override
public boolean isScrolledToTop() {
return list.getChildAt(0).getTop() == 0;
}
@Override
public void scrollToTop(){
smoothScrollRecyclerViewToTop(list);