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

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

Browse Source
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
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();
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.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
@@ -81,7 +80,7 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
editHistory.setVisibility(View.GONE);
}
String timeStr=TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault()));
if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) {
time.setText(item.parentFragment.getString(R.string.timestamp_via_app, timeStr, ""));
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 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
@@ -140,4 +134,4 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
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 LOCAL_TIMELINE -> R.string.local_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,
LOCAL_TIMELINE,
FEDERATED_TIMELINE,
POST_NOTIFICATIONS,
// 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) {
return MastodonApp.context.getString(switch (status.visibility) {
case PUBLIC -> R.string.visibility_public;
case UNLISTED -> R.string.sk_visibility_unlisted;
case PRIVATE -> R.string.visibility_followers_only;
case DIRECT -> R.string.visibility_private;
});
}
// public static String getVisibilityText(Status status) {
// return MastodonApp.context.getString(switch (status.visibility) {
// case PUBLIC -> R.string.visibility_public;
// case UNLISTED -> R.string.sk_visibility_unlisted;
// case PRIVATE -> R.string.visibility_followers_only;
// case DIRECT -> R.string.visibility_private;;
// });
// }
// https://github.com/tuskyapp/Tusky/pull/3148
public static void reduceSwipeSensitivity(ViewPager2 pager) {