diff --git a/mastodon/src/github/res/drawable/ic_fluent_dismiss_20_filled.xml b/mastodon/src/github/res/drawable/ic_fluent_dismiss_20_filled.xml new file mode 100644 index 000000000..331183ba2 --- /dev/null +++ b/mastodon/src/github/res/drawable/ic_fluent_dismiss_20_filled.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/github/res/drawable/ic_fluent_mention_20_regular.xml b/mastodon/src/github/res/drawable/ic_fluent_mention_20_regular.xml new file mode 100644 index 000000000..77a55c495 --- /dev/null +++ b/mastodon/src/github/res/drawable/ic_fluent_mention_20_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/github/res/drawable/ic_fluent_speaker_0_24_regular.xml b/mastodon/src/github/res/drawable/ic_fluent_speaker_0_24_regular.xml new file mode 100644 index 000000000..8a35ff41e --- /dev/null +++ b/mastodon/src/github/res/drawable/ic_fluent_speaker_0_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/github/res/drawable/ic_fluent_speaker_0_28_regular.xml b/mastodon/src/github/res/drawable/ic_fluent_speaker_0_28_regular.xml new file mode 100644 index 000000000..53c6f5b6a --- /dev/null +++ b/mastodon/src/github/res/drawable/ic_fluent_speaker_0_28_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/github/res/drawable/ic_fluent_speaker_off_24_regular.xml b/mastodon/src/github/res/drawable/ic_fluent_speaker_off_24_regular.xml new file mode 100644 index 000000000..e1b6ba1c9 --- /dev/null +++ b/mastodon/src/github/res/drawable/ic_fluent_speaker_off_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/github/res/drawable/ic_fluent_speaker_off_28_regular.xml b/mastodon/src/github/res/drawable/ic_fluent_speaker_off_28_regular.xml new file mode 100644 index 000000000..05defaa38 --- /dev/null +++ b/mastodon/src/github/res/drawable/ic_fluent_speaker_off_28_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 22f4ca314..d673e0aa4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -683,7 +683,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr } updateSensitive(); - updateScheduledAt(scheduledAt != null ? scheduledAt : scheduledStatus != null ? scheduledStatus.scheduledAt : null); if(editingStatus!=null){ updateCharCounter(); @@ -819,12 +818,12 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr } private void resetPublishButtonText() { - int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save; - if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) { - publishButton.setText(GlobalUserPreferences.publishButtonText); - } else { - publishButton.setText(publishText); - } +// int publishText = editingStatus==null || redraftStatus ? R.string.publish : R.string.save; +// if (publishText == R.string.publish && !GlobalUserPreferences.publishButtonText.isEmpty()) { +// publishButton.setText(GlobalUserPreferences.publishButtonText); +// } else { +// publishButton.setText(publishText); +// } } private void updatePublishButtonState(){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java index f2d847219..37649f7af 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java @@ -54,7 +54,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{ @Override protected List buildDisplayItems(Status s){ - List items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false); + List items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null); int idx=data.indexOf(s); if(idx>=0){ String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault())); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java index dcbeed3c4..98ecfdcda 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java @@ -29,7 +29,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment{ protected EventListener eventListener=new EventListener(); protected List buildDisplayItems(Status s){ - return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true); + return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true, null); } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java index cfbb2f295..86451742e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java @@ -75,7 +75,7 @@ public class SearchFragment extends BaseStatusListFragment{ return switch(s.type){ case ACCOUNT -> Collections.singletonList(new AccountStatusDisplayItem(s.id, this, s.account)); case HASHTAG -> Collections.singletonList(new HashtagStatusDisplayItem(s.id, this, s.hashtag)); - case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true); + case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null); }; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java index c7b84c2ec..f71552e56 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java @@ -237,7 +237,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{ @Override protected List buildDisplayItems(Status s){ - List items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false); + List items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null); for(StatusDisplayItem item:items){ if(item instanceof ImageStatusDisplayItem isdi){ isdi.horizontalInset=V.dp(40+32); diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Account.java b/mastodon/src/main/java/org/joinmastodon/android/model/Account.java index 47d99bc3c..18e077c63 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Account.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Account.java @@ -164,6 +164,10 @@ public class Account extends BaseModel{ return '@'+acct; } + public String getShortUsername() { + return '@'+acct.split("@")[0]; + } + @Override public String toString(){ return "Account{"+ diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/FilterResult.java b/mastodon/src/main/java/org/joinmastodon/android/model/FilterResult.java new file mode 100644 index 000000000..2b67ef4bf --- /dev/null +++ b/mastodon/src/main/java/org/joinmastodon/android/model/FilterResult.java @@ -0,0 +1,8 @@ +package org.joinmastodon.android.model; + +import org.parceler.Parcel; + +@Parcel +public class FilterResult extends BaseModel { + public Filter filter; +} diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java index 6560d2fbe..895a53e23 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Status.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Status.java @@ -20,7 +20,7 @@ public class Status extends BaseModel implements DisplayItemsParent{ public Instant createdAt; @RequiredField public Account account; -// @RequiredField + // @RequiredField public String content; @RequiredField public StatusPrivacy visibility; @@ -40,7 +40,7 @@ public class Status extends BaseModel implements DisplayItemsParent{ public long favouritesCount; public long repliesCount; public Instant editedAt; - public boolean wantsTranslation; + public List filtered; public String url; public String inReplyToId; @@ -50,7 +50,6 @@ public class Status extends BaseModel implements DisplayItemsParent{ public Card card; public String language; public String text; - public String translation; public boolean favourited; public boolean reblogged; diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java index 36e907616..3bed895d5 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java @@ -176,7 +176,7 @@ public abstract class StatusDisplayItem{ } public Holder(Context context, int layout, ViewGroup parent){ - super(context, layout, parent); + super(context, layout, parent); } public String getItemID(){ diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml index 9529d4c7b..4adb201c0 100644 --- a/mastodon/src/main/res/layout/display_item_header.xml +++ b/mastodon/src/main/res/layout/display_item_header.xml @@ -14,20 +14,34 @@ android:layout_alignParentTop="true" android:layout_alignParentEnd="true" android:layout_marginTop="-6dp" - android:layout_marginRight="-8dp" + android:layout_marginEnd="-8dp" android:background="?android:selectableItemBackgroundBorderless" android:contentDescription="@string/more_options" android:scaleType="center" android:src="@drawable/ic_post_more" android:tint="?android:textColorSecondary" /> + +