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

Post actions

Browse Source
This commit is contained in:
Grishka
2022-02-18 01:50:00 +03:00
parent 371faf9bb2
commit bb463aa10a
15 changed files with 256 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java
View File

@@ -4,8 +4,12 @@ import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import com.squareup.otto.Subscribe;
import org.joinmastodon.android.R;
import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
import org.joinmastodon.android.events.StatusDeletedEvent;
import org.joinmastodon.android.model.Account;
import org.joinmastodon.android.model.Status;
import org.parceler.Parcels;
@@ -65,4 +69,16 @@ public class AccountTimelineFragment extends StatusListFragment{
if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
loadData();
}
@Override
@Subscribe
public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
super.onStatusCountersUpdated(ev);
}
@Override
@Subscribe
public void onStatusDeleted(StatusDeletedEvent ev){
super.onStatusDeleted(ev);
}
}

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

@@ -260,6 +260,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
RecyclerView.ViewHolder holder=parent.getChildViewHolder(child);
if(holder instanceof FooterStatusDisplayItem.Holder){
float y=child.getY()+child.getHeight()-V.dp(.5f);
paint.setAlpha(Math.round(255*child.getAlpha()));
c.drawLine(child.getX(), y, child.getX()+child.getWidth(), y, paint);
}
}
@@ -467,6 +468,10 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
}
}
public String getAccountID(){
return accountID;
}
@Nullable
protected <I extends StatusDisplayItem> I findItemOfType(String id, Class<I> type){
for(StatusDisplayItem item:displayItems){

14
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
View File

@@ -20,7 +20,9 @@ import org.joinmastodon.android.E;
import org.joinmastodon.android.R;
import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
import org.joinmastodon.android.api.session.AccountSessionManager;
import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
import org.joinmastodon.android.events.StatusCreatedEvent;
import org.joinmastodon.android.events.StatusDeletedEvent;
import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.utils.UiUtils;
import org.parceler.Parcels;
@@ -107,4 +109,16 @@ public class HomeTimelineFragment extends StatusListFragment{
Toolbar toolbar=getToolbar();
toolbar.addView(logo, new Toolbar.LayoutParams(Gravity.CENTER));
}
@Override
@Subscribe
public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
super.onStatusCountersUpdated(ev);
}
@Override
@Subscribe
public void onStatusDeleted(StatusDeletedEvent ev){
super.onStatusDeleted(ev);
}
}

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

@@ -736,57 +736,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
}
private void confirmToggleMuted(){
new M3AlertDialogBuilder(getActivity())
.setTitle(relationship.muting ? R.string.confirm_unmute_title : R.string.confirm_mute_title)
.setMessage(getString(relationship.muting ? R.string.confirm_unmute : R.string.confirm_mute, account.displayName))
.setPositiveButton(relationship.muting ? R.string.do_unmute : R.string.do_mute, (dlg, i)->toggleMuted())
.setNegativeButton(R.string.cancel, null)
.show();
UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
}
private void confirmToggleBlocked(){
new M3AlertDialogBuilder(getActivity())
.setTitle(relationship.blocking ? R.string.confirm_unblock_title : R.string.confirm_block_title)
.setMessage(getString(relationship.blocking ? R.string.confirm_unblock : R.string.confirm_block, account.displayName))
.setPositiveButton(relationship.blocking ? R.string.do_block : R.string.do_unblock, (dlg, i)->toggleBlocked())
.setNegativeButton(R.string.cancel, null)
.show();
UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
}
private void toggleMuted(){
new SetAccountMuted(account.id, !relationship.muting)
.setCallback(new Callback<>(){
@Override
public void onSuccess(Relationship result){
relationship=result;
updateRelationship();
}
@Override
public void onError(ErrorResponse error){
error.showToast(getActivity());
}
})
.wrapProgress(getActivity(), R.string.loading, false)
.exec(accountID);
}
private void toggleBlocked(){
new SetAccountBlocked(account.id, !relationship.blocking)
.setCallback(new Callback<>(){
@Override
public void onSuccess(Relationship result){
relationship=result;
updateRelationship();
}
@Override
public void onError(ErrorResponse error){
error.showToast(getActivity());
}
})
.wrapProgress(getActivity(), R.string.loading, false)
.exec(accountID);
private void updateRelationship(Relationship r){
relationship=r;
updateRelationship();
}
@Override

16
mastodon/src/main/java/org/joinmastodon/android/fragments/SearchFragment.java
View File

@@ -1,6 +1,10 @@
package org.joinmastodon.android.fragments;
import com.squareup.otto.Subscribe;
import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses;
import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
import org.joinmastodon.android.events.StatusDeletedEvent;
import org.joinmastodon.android.model.Status;
import java.util.List;
@@ -18,4 +22,16 @@ public class SearchFragment extends StatusListFragment{
}
}).exec(accountID);
}
@Override
@Subscribe
public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
super.onStatusCountersUpdated(ev);
}
@Override
@Subscribe
public void onStatusDeleted(StatusDeletedEvent ev){
super.onStatusDeleted(ev);
}
}

38
mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
View File

@@ -1,14 +1,17 @@
package org.joinmastodon.android.fragments;
import android.os.Bundle;
import android.util.Log;
import com.squareup.otto.Subscribe;
import org.joinmastodon.android.E;
import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
import org.joinmastodon.android.events.StatusDeletedEvent;
import org.joinmastodon.android.model.Poll;
import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.PollFooterStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.PollOptionStatusDisplayItem;
import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -87,10 +90,43 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
}
}
@Subscribe
public void onStatusDeleted(StatusDeletedEvent ev){
Log.i("11", "on status deleted!");
if(!ev.accountID.equals(accountID))
return;
Status status=getStatusByID(ev.id);
if(status==null)
return;
data.remove(status);
preloadedData.remove(status);
HeaderStatusDisplayItem item=findItemOfType(ev.id, HeaderStatusDisplayItem.class);
if(item==null)
return;
int index=displayItems.indexOf(item);
int lastIndex;
for(lastIndex=index;lastIndex<displayItems.size();lastIndex++){
if(!displayItems.get(lastIndex).parentID.equals(ev.id))
break;
}
displayItems.subList(index, lastIndex).clear();
adapter.notifyItemRangeRemoved(index, lastIndex-index);
}
protected Status getContentStatusByID(String id){
Status s=getStatusByID(id);
return s==null ? null : s.getContentStatus();
}
protected Status getStatusByID(String id){
for(Status s:data){
if(s.id.equals(id)){
return s.getContentStatus();
return s;
}
}
for(Status s:preloadedData){
if(s.id.equals(id)){
return s;
}
}
return null;

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

@@ -5,8 +5,12 @@ import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.view.View;
import com.squareup.otto.Subscribe;
import org.joinmastodon.android.R;
import org.joinmastodon.android.api.requests.statuses.GetStatusContext;
import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
import org.joinmastodon.android.events.StatusDeletedEvent;
import org.joinmastodon.android.model.Account;
import org.joinmastodon.android.model.StatusContext;
import org.joinmastodon.android.model.Status;
@@ -81,4 +85,16 @@ public class ThreadFragment extends StatusListFragment{
if(!loaded)
footerProgress.setVisibility(View.VISIBLE);
}
@Override
@Subscribe
public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
super.onStatusCountersUpdated(ev);
}
@Override
@Subscribe
public void onStatusDeleted(StatusDeletedEvent ev){
super.onStatusDeleted(ev);
}
}