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

It finally compiles! Though I need to fix some stuff before releasing

This commit is contained in:
sk22 2023-01-26 15:51:25 +00:00 committed by LucasGGamerM
parent bd4ade0852
commit c3567bcbff
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,4 +249,4 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
displayItems.subList(index, lastIndex).clear(); displayItems.subList(index, lastIndex).clear();
adapter.notifyItemRangeRemoved(index, lastIndex-index); adapter.notifyItemRangeRemoved(index, lastIndex-index);
} }
} }

10
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
View File

@ -2,7 +2,6 @@ package org.joinmastodon.android.ui.displayitems;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
@ -81,7 +80,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
editHistory.setVisibility(View.GONE); editHistory.setVisibility(View.GONE);
} }
String timeStr=TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault())); String timeStr=TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault()));
if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) { if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) {
time.setText(item.parentFragment.getString(R.string.timestamp_via_app, timeStr, "")); time.setText(item.parentFragment.getString(R.string.timestamp_via_app, timeStr, ""));
applicationName.setText(item.status.application.name); applicationName.setText(item.status.application.name);
@ -102,11 +101,6 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
case DIRECT -> R.drawable.ic_fluent_mention_20_regular; case DIRECT -> R.drawable.ic_fluent_mention_20_regular;
case LOCAL -> R.drawable.ic_fluent_eye_20_regular; case LOCAL -> R.drawable.ic_fluent_eye_20_regular;
}); });
visibility.setContentDescription(UiUtils.getVisibilityText(s));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
visibility.setTooltipText(visibility.getContentDescription());
}
} }
@Override @Override
@ -140,4 +134,4 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
Nav.go(item.parentFragment.getActivity(), StatusEditHistoryFragment.class, args); Nav.go(item.parentFragment.getActivity(), StatusEditHistoryFragment.class, args);
} }
} }
} }

4
mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java
View File

@ -37,6 +37,7 @@ public class DiscoverInfoBannerHelper{
case TRENDING_LINKS -> R.string.trending_links_info_banner; case TRENDING_LINKS -> R.string.trending_links_info_banner;
case LOCAL_TIMELINE -> R.string.local_timeline_info_banner; case LOCAL_TIMELINE -> R.string.local_timeline_info_banner;
case FEDERATED_TIMELINE -> R.string.sk_federated_timeline_info_banner; case FEDERATED_TIMELINE -> R.string.sk_federated_timeline_info_banner;
case POST_NOTIFICATIONS -> R.string.sk_notify_posts_info_banner;
}); });
} }
} }
@ -61,6 +62,7 @@ public class DiscoverInfoBannerHelper{
TRENDING_LINKS, TRENDING_LINKS,
LOCAL_TIMELINE, LOCAL_TIMELINE,
FEDERATED_TIMELINE, FEDERATED_TIMELINE,
POST_NOTIFICATIONS,
// ACCOUNTS // ACCOUNTS
} }
} }

16
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@ -1101,14 +1101,14 @@ public class UiUtils{
} }
} }
public static String getVisibilityText(Status status) { // public static String getVisibilityText(Status status) {
return MastodonApp.context.getString(switch (status.visibility) { // return MastodonApp.context.getString(switch (status.visibility) {
case PUBLIC -> R.string.visibility_public; // case PUBLIC -> R.string.visibility_public;
case UNLISTED -> R.string.sk_visibility_unlisted; // case UNLISTED -> R.string.sk_visibility_unlisted;
case PRIVATE -> R.string.visibility_followers_only; // case PRIVATE -> R.string.visibility_followers_only;
case DIRECT -> R.string.visibility_private; // case DIRECT -> R.string.visibility_private;;
}); // });
} // }
// https://github.com/tuskyapp/Tusky/pull/3148 // https://github.com/tuskyapp/Tusky/pull/3148
public static void reduceSwipeSensitivity(ViewPager2 pager) { public static void reduceSwipeSensitivity(ViewPager2 pager) {

3
mastodon/src/main/res/drawable/ic_fluent_arrow_forward_24_regular.xml Normal file
View File

@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M14.723 16.221c-0.293 0.293-0.293 0.768 0 1.06 0.293 0.294 0.768 0.293 1.061 0l4.997-5.003c0.292-0.293 0.292-0.768 0-1.06L15.783 6.22c-0.293-0.293-0.768-0.293-1.06 0-0.294 0.293-0.294 0.767-0.001 1.06l3.72 3.72H10.6c-1.595 0-2.81 0.242-3.889 0.764L6.466 11.89c-1.109 0.593-1.983 1.467-2.576 2.576C3.28 15.606 3 16.884 3 18.6c0 0.414 0.336 0.75 0.75 0.75S4.5 19.014 4.5 18.6c0-1.484 0.228-2.52 0.713-3.428 0.453-0.847 1.113-1.507 1.96-1.96 0.838-0.448 1.786-0.676 3.094-0.709L10.6 12.5h7.837l-3.715 3.721z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>