From 7f5f0e8dd832f1e365dabb6c3730c37fd109c456 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Tue, 17 Apr 2018 22:39:55 +0200
Subject: [PATCH] show error message when instance has no custom emojis
---
.../keylesspalace/tusky/ComposeActivity.java | 48 +++++++++++--------
app/src/main/res/values-de/strings.xml | 3 ++
app/src/main/res/values/strings.xml | 2 +
3 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index b74bf4d0..3eb088a0 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -275,15 +275,18 @@ public final class ComposeActivity
emojiView.setLayoutManager(new GridLayoutManager(this, 3, GridLayoutManager.HORIZONTAL, false));
+ enableButton(emojiButton, false, false);
+
mastodonApi.getCustomEmojis().enqueue(new Callback<List<Emoji>>() {
@Override
public void onResponse(@NonNull Call<List<Emoji>> call, @NonNull Response<List<Emoji>> response) {
List<Emoji> emojiList = response.body();
if (emojiList != null) {
-
emojiView.setAdapter(new EmojiAdapter(emojiList, ComposeActivity.this));
+ enableButton(emojiButton, true, emojiList.size() > 0);
+
EmojiListEntity emojiListEntity = new EmojiListEntity(activeAccount.getDomain(), emojiList);
TuskyApplication.getDB().emojiListDao().insertOrReplace(emojiListEntity);
@@ -297,6 +300,7 @@ public final class ComposeActivity
if(emojiListEntity != null) {
emojiView.setAdapter(new EmojiAdapter(emojiListEntity.getEmojiList(), ComposeActivity.this));
+ enableButton(emojiButton, true, emojiListEntity.getEmojiList().size() > 0);
}
}
});
@@ -705,14 +709,24 @@ public final class ComposeActivity
}
private void showEmojis() {
- if (emojiBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN || emojiBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
- emojiBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
- composeOptionsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
- addMediaBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
- } else {
- emojiBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ if(emojiView.getAdapter() != null) {
+ if(emojiView.getAdapter().getItemCount() == 0) {
+ String errorMessage = getString(R.string.error_no_custom_emojis, accountManager.getActiveAccount().getDomain());
+ Toast.makeText(this, errorMessage, Toast.LENGTH_SHORT).show();
+ } else {
+ if (emojiBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN || emojiBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
+ emojiBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+ composeOptionsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ addMediaBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+
+ } else {
+ emojiBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+ }
+ }
+
}
+
}
private void openPickDialog() {
@@ -980,16 +994,10 @@ public final class ComposeActivity
startActivityForResult(intent, MEDIA_PICK_RESULT);
}
- private void enableMediaButtons() {
- pickButton.setEnabled(true);
- ThemeUtils.setDrawableTint(this, pickButton.getDrawable(),
- android.R.attr.textColorTertiary);
- }
-
- private void disableMediaButtons() {
- pickButton.setEnabled(false);
- ThemeUtils.setDrawableTint(this, pickButton.getDrawable(),
- R.attr.compose_media_button_disabled_tint);
+ private void enableButton(ImageButton button, boolean clickable, boolean colorActive) {
+ button.setEnabled(clickable);
+ ThemeUtils.setDrawableTint(this, button.getDrawable(),
+ colorActive ? android.R.attr.textColorTertiary : R.attr.compose_media_button_disabled_tint);
}
private void addMediaToQueue(QueuedMedia.Type type, Bitmap preview, Uri uri, long mediaSize,
@@ -1016,11 +1024,11 @@ public final class ComposeActivity
if (queuedCount == 1) {
// If there's one video in the queue it is full, so disable the button to queue more.
if (item.type == QueuedMedia.Type.VIDEO) {
- disableMediaButtons();
+ enableButton(pickButton, false, false);
}
} else if (queuedCount >= Status.MAX_MEDIA_ATTACHMENTS) {
// Limit the total media attachments, also.
- disableMediaButtons();
+ enableButton(pickButton, false, false);
}
updateHideMediaToggle();
@@ -1127,7 +1135,7 @@ public final class ComposeActivity
updateHideMediaToggle();
}
- enableMediaButtons();
+ enableButton(pickButton, true, true);
cancelReadyingMedia(item);
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 98df5ff1..922d670e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -264,4 +264,7 @@
<string name="send_toot_notification_saved_content">Eine Kopie des Beitrags wurde in deine Entwürfe gespeichert</string>
<string name="send_toot_notification_channel_name">Beiträge senden</string>
+ <string name="error_no_custom_emojis">Deine Instanz %s hat keine Emojis definiert</string>
+
+
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e7c831bb..06e7fa42 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -296,4 +296,6 @@
<string name="send_toot_notification_cancel_title">Sending cancelled</string>
<string name="send_toot_notification_saved_content">A copy of the toot has been saved to your drafts</string>
+ <string name="error_no_custom_emojis">Your instance %s does not have any custom emojis</string>
+
</resources>