arun/Husky
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CustomEmojis: make emojis small when it's appropriate for UX

Browse Source
This commit is contained in:
Alibek Omarov 2020-05-11 22:19:34 +03:00
parent beb9dd69e4
commit 6417f31767
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
View File

@ -438,7 +438,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
private fun updateToolbar() {
loadedAccount?.let { account ->
val emojifiedName = emojifyString(account.name, account.emojis, accountToolbar)
val emojifiedName = emojifyString(account.name, account.emojis, accountToolbar, true)
try {
supportActionBar?.title = EmojiCompat.get().process(emojifiedName)

2
app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt
View File

@ -130,7 +130,7 @@ class PreferencesActivity : BaseActivity(), SharedPreferences.OnSharedPreference
}
"statusTextSize", "absoluteTimeView", "showBotOverlay", "animateGifAvatars",
"useBlurhash", "showCardsInTimelines", "confirmReblogs", "hideMutedUsers",
"enableSwipeForTabs" -> {
"enableSwipeForTabs", "bigEmojis" -> {
restartActivitiesOnExit = true
}
"language" -> {

2
app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt
View File

@ -18,7 +18,7 @@ internal class FollowRequestViewHolder(itemView: View, private val showHeader: B
fun setupWithAccount(account: Account, formatter: BidiFormatter?) {
id = account.id
val wrappedName = formatter?.unicodeWrap(account.name) ?: account.name
val emojifiedName: CharSequence = emojifyString(wrappedName, account.emojis, itemView)
val emojifiedName: CharSequence = emojifyString(wrappedName, account.emojis, itemView, true)
itemView.displayNameTextView.text = emojifiedName
if (showHeader) {
itemView.notificationTextView?.text = itemView.context.getString(R.string.notification_follow_request_format, emojifiedName)

2
app/src/main/java/com/keylesspalace/tusky/adapter/MutedStatusViewHolder.java
View File

@ -48,7 +48,7 @@ public class MutedStatusViewHolder extends RecyclerView.ViewHolder {
}
protected void setDisplayName(String name, List<Emoji> customEmojis) {
CharSequence emojifiedName = CustomEmojiHelperKt.emojifyString(name, customEmojis, displayName);
CharSequence emojifiedName = CustomEmojiHelperKt.emojifyString(name, customEmojis, displayName, true);
displayName.setText(emojifiedName);
}

6
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View File

@ -347,13 +347,13 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
String format = context.getString(R.string.notification_follow_format);
String wrappedDisplayName = bidiFormatter.unicodeWrap(account.getName());
String wholeMessage = String.format(format, wrappedDisplayName);
CharSequence emojifiedMessage = CustomEmojiHelperKt.emojifyString(wholeMessage, account.getEmojis(), message);
CharSequence emojifiedMessage = CustomEmojiHelperKt.emojifyString(wholeMessage, account.getEmojis(), message, true);
message.setText(emojifiedMessage);
String username = context.getString(R.string.status_username_format, account.getUsername());
usernameView.setText(username);
CharSequence emojifiedDisplayName = CustomEmojiHelperKt.emojifyString(wrappedDisplayName, account.getEmojis(), usernameView);
CharSequence emojifiedDisplayName = CustomEmojiHelperKt.emojifyString(wrappedDisplayName, account.getEmojis(), usernameView, true);
displayNameView.setText(emojifiedDisplayName);
@ -429,7 +429,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
}
private void setDisplayName(String name, List<Emoji> emojis) {
CharSequence emojifiedName = CustomEmojiHelperKt.emojifyString(name, emojis, displayName);
CharSequence emojifiedName = CustomEmojiHelperKt.emojifyString(name, emojis, displayName, true);
displayName.setText(emojifiedName);
}

2
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -195,7 +195,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
protected abstract int getMediaPreviewHeight(Context context);
protected void setDisplayName(String name, List<Emoji> customEmojis) {
CharSequence emojifiedName = CustomEmojiHelperKt.emojifyString(name, customEmojis, displayName);
CharSequence emojifiedName = CustomEmojiHelperKt.emojifyString(name, customEmojis, displayName, true);
displayName.setText(emojifiedName);
}