forked from mastodon/mastodon-android
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
closes #127
- Loading branch information
Showing
16 changed files
with
335 additions
and
10 deletions.
There are no files selected for viewing
10 changes: 10 additions & 0 deletions
10
...rc/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package org.joinmastodon.android.api.requests.announcements; | ||
|
|
||
| import org.joinmastodon.android.api.MastodonAPIRequest; | ||
|
|
||
| public class DismissAnnouncement extends MastodonAPIRequest<Object>{ | ||
| public DismissAnnouncement(String id){ | ||
| super(HttpMethod.POST, "/announcements/" + id + "/dismiss", Object.class); | ||
| setRequestBody(new Object()); | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
...n/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package org.joinmastodon.android.api.requests.announcements; | ||
|
|
||
| import com.google.gson.reflect.TypeToken; | ||
|
|
||
| import org.joinmastodon.android.api.MastodonAPIRequest; | ||
| import org.joinmastodon.android.model.Announcement; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class GetAnnouncements extends MastodonAPIRequest<List<Announcement>> { | ||
| public GetAnnouncements(boolean withDismissed) { | ||
| super(MastodonAPIRequest.HttpMethod.GET, "/announcements", new TypeToken<>(){}); | ||
| addQueryParameter("with_dismissed", withDismissed ? "true" : "false"); | ||
| } | ||
| } |
107 changes: 107 additions & 0 deletions
107
mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package org.joinmastodon.android.fragments; | ||
|
|
||
| import android.app.Activity; | ||
| import android.os.Bundle; | ||
| import android.text.TextUtils; | ||
| import android.view.View; | ||
| import android.widget.ImageButton; | ||
|
|
||
| import com.squareup.otto.Subscribe; | ||
|
|
||
| import org.joinmastodon.android.E; | ||
| import org.joinmastodon.android.R; | ||
| import org.joinmastodon.android.api.requests.announcements.GetAnnouncements; | ||
| import org.joinmastodon.android.api.requests.statuses.CreateStatus; | ||
| import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses; | ||
| import org.joinmastodon.android.api.session.AccountSession; | ||
| import org.joinmastodon.android.api.session.AccountSessionManager; | ||
| import org.joinmastodon.android.events.ScheduledStatusCreatedEvent; | ||
| import org.joinmastodon.android.events.ScheduledStatusDeletedEvent; | ||
| import org.joinmastodon.android.model.Account; | ||
| import org.joinmastodon.android.model.Announcement; | ||
| import org.joinmastodon.android.model.HeaderPaginationList; | ||
| import org.joinmastodon.android.model.Instance; | ||
| import org.joinmastodon.android.model.ScheduledStatus; | ||
| import org.joinmastodon.android.model.Status; | ||
| import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem; | ||
| import org.joinmastodon.android.ui.displayitems.StatusDisplayItem; | ||
| import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem; | ||
| import org.joinmastodon.android.ui.text.HtmlParser; | ||
| import org.joinmastodon.android.ui.utils.UiUtils; | ||
| import org.parceler.Parcels; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import me.grishka.appkit.Nav; | ||
| import me.grishka.appkit.api.PaginatedList; | ||
| import me.grishka.appkit.api.SimpleCallback; | ||
|
|
||
| public class AnnouncementsFragment extends BaseStatusListFragment<Announcement> { | ||
| private Instance instance; | ||
| private AccountSession session; | ||
| private List<String> unreadIDs = null; | ||
|
|
||
| @Override | ||
| public void onAttach(Activity activity){ | ||
| super.onAttach(activity); | ||
| setTitle(R.string.sk_announcements); | ||
| session = AccountSessionManager.getInstance().getAccount(accountID); | ||
| instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain); | ||
| loadData(); | ||
| } | ||
|
|
||
| @Override | ||
| protected List<StatusDisplayItem> buildDisplayItems(Announcement a) { | ||
| if(TextUtils.isEmpty(a.content)) return List.of(); | ||
| Account instanceUser = new Account(); | ||
| instanceUser.id = instanceUser.acct = instanceUser.username = session.domain; | ||
| instanceUser.displayName = instance.title; | ||
| instanceUser.url = "https://"+session.domain+"/about"; | ||
| instanceUser.avatar = instanceUser.avatarStatic = instance.thumbnail; | ||
| instanceUser.emojis = List.of(); | ||
| Status fakeStatus = a.toStatus(); | ||
| return List.of( | ||
| HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead), | ||
| new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus) | ||
| ); | ||
| } | ||
|
|
||
| public void onMarkAsRead(String id) { | ||
| if (unreadIDs == null) return; | ||
| unreadIDs.remove(id); | ||
| if (unreadIDs.size() == 0) setResult(true, null); | ||
| } | ||
|
|
||
| @Override | ||
| public void onDestroy() { | ||
| super.onDestroy(); | ||
| } | ||
|
|
||
| @Override | ||
| protected void addAccountToKnown(Announcement s) {} | ||
|
|
||
| @Override | ||
| public void onItemClick(String id) { | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDataLoaded(List<Announcement> d, boolean more) { | ||
| unreadIDs = d.stream().filter(a -> !a.read).map(a -> a.id).collect(Collectors.toList()); | ||
| super.onDataLoaded(d, more); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doLoadData(int offset, int count){ | ||
| currentRequest=new GetAnnouncements(true) | ||
| .setCallback(new SimpleCallback<>(this){ | ||
| @Override | ||
| public void onSuccess(List<Announcement> result){ | ||
| onDataLoaded(result, false); | ||
| } | ||
| }) | ||
| .exec(accountID); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
mastodon/src/main/java/org/joinmastodon/android/model/Announcement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| package org.joinmastodon.android.model; | ||
|
|
||
| import org.joinmastodon.android.api.RequiredField; | ||
| import org.parceler.Parcel; | ||
|
|
||
| import java.time.Instant; | ||
| import java.util.List; | ||
|
|
||
| @Parcel | ||
| public class Announcement extends BaseModel implements DisplayItemsParent { | ||
| @RequiredField | ||
| public String id; | ||
| @RequiredField | ||
| public String content; | ||
| public Instant startsAt; | ||
| public Instant endsAt; | ||
| public boolean published; | ||
| public boolean allDay; | ||
| public Instant publishedAt; | ||
| public Instant updatedAt; | ||
| public boolean read; | ||
| public List<Emoji> emojis; | ||
| public List<Mention> mentions; | ||
| public List<Hashtag> tags; | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "Announcement{" + | ||
| "id='" + id + '\'' + | ||
| ", content='" + content + '\'' + | ||
| ", startsAt=" + startsAt + | ||
| ", endsAt=" + endsAt + | ||
| ", published=" + published + | ||
| ", allDay=" + allDay + | ||
| ", publishedAt=" + publishedAt + | ||
| ", updatedAt=" + updatedAt + | ||
| ", read=" + read + | ||
| ", emojis=" + emojis + | ||
| ", mentions=" + mentions + | ||
| ", tags=" + tags + | ||
| '}'; | ||
| } | ||
|
|
||
| public Status toStatus() { | ||
| Status s = new Status(); | ||
| s.id = id; | ||
| s.mediaAttachments = List.of(); | ||
| s.createdAt = startsAt != null ? startsAt : publishedAt; | ||
| if (updatedAt != null) s.editedAt = updatedAt; | ||
| s.content = s.text = content; | ||
| s.spoilerText = ""; | ||
| s.visibility = StatusPrivacy.PUBLIC; | ||
| s.mentions = List.of(); | ||
| s.tags = List.of(); | ||
| s.emojis = List.of(); | ||
| return s; | ||
| } | ||
|
|
||
| @Override | ||
| public String getID() { | ||
| return id; | ||
| } | ||
| } |
Oops, something went wrong.