Stephen Paul Weber created
build.gradle | 1
src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java | 68
src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 8
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 3
src/main/res/layout/activity_add_reaction.xml | 25
src/main/res/layout/dialog_add_reaction.xml | 13
6 files changed, 1 insertion(+), 117 deletions(-)
@@ -89,7 +89,6 @@ dependencies {
implementation "androidx.emoji2:emoji2:1.5.0"
freeImplementation "androidx.emoji2:emoji2-bundled:1.5.0"
- implementation "androidx.emoji2:emoji2-emojipicker:1.5.0"
implementation 'org.bouncycastle:bcmail-jdk18on:1.78.1'
implementation 'org.bouncycastle:bcpg-jdk18on:1.78.1'
@@ -1,68 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.os.Bundle;
-import android.widget.Toast;
-
-import androidx.databinding.DataBindingUtil;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.databinding.ActivityAddReactionBinding;
-
-public class AddReactionActivity extends XmppActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- final ActivityAddReactionBinding binding =
- DataBindingUtil.setContentView(this, R.layout.activity_add_reaction);
- Activities.setStatusAndNavigationBarColors(this, binding.getRoot());
-
- setSupportActionBar(binding.toolbar);
- binding.toolbar.setNavigationIcon(R.drawable.ic_clear_24dp);
- binding.toolbar.setNavigationOnClickListener(v -> finish());
- setTitle(R.string.add_reaction_title);
- binding.emojiPicker.setOnEmojiPickedListener(
- emojiViewItem -> addReaction(emojiViewItem.getEmoji()));
- }
-
- private void addReaction(final String emoji) {
- final var intent = getIntent();
- final var conversation = intent == null ? null : intent.getStringExtra("conversation");
- final var message = intent == null ? null : intent.getStringExtra("message");
- if (Strings.isNullOrEmpty(conversation) || Strings.isNullOrEmpty(message)) {
- Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
- return;
- }
- final var c = xmppConnectionService.findConversationByUuid(conversation);
- final var m = c == null ? null : c.findMessageWithUuid(message);
- if (m == null) {
- Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
- return;
- }
- final var aggregated = m.getAggregatedReactions();
- if (aggregated.ourReactions.contains(emoji)) {
- if (!xmppConnectionService.sendReactions(m, aggregated.ourReactions)) {
- Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
- return;
- }
- } else {
- final ImmutableSet.Builder<String> reactionBuilder = new ImmutableSet.Builder<>();
- reactionBuilder.addAll(aggregated.ourReactions);
- reactionBuilder.add(emoji);
- if (!xmppConnectionService.sendReactions(m, reactionBuilder.build())) {
- Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
- }
- }
- finish();
- }
-
- @Override
- protected void refreshUiReal() {}
-
- @Override
- protected void onBackendConnected() {}
-}
@@ -388,14 +388,6 @@ public abstract class XmppActivity extends ActionBarActivity {
dialog.dismiss();
});
}
- viewBinding.more.setOnClickListener(
- v -> {
- dialog.dismiss();
- final var intent = new Intent(this, AddReactionActivity.class);
- intent.putExtra("conversation", message.getConversation().getUuid());
- intent.putExtra("message", message.getUuid());
- startActivity(intent);
- });
dialog.show();
}
@@ -67,9 +67,6 @@ import com.cheogram.android.Util;
import com.cheogram.android.WebxdcPage;
import com.cheogram.android.WebxdcUpdate;
-import androidx.emoji2.emojipicker.EmojiViewItem;
-import androidx.emoji2.emojipicker.RecentEmojiProvider;
-
import com.google.android.material.button.MaterialButton;
import com.google.android.material.chip.ChipGroup;
import com.google.android.material.color.MaterialColors;
@@ -1,25 +0,0 @@
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <com.google.android.material.appbar.AppBarLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <com.google.android.material.appbar.MaterialToolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?attr/actionBarSize" />
-
- </com.google.android.material.appbar.AppBarLayout>
-
- <androidx.emoji2.emojipicker.EmojiPickerView
- android:id="@+id/emoji_picker"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </LinearLayout>
-</layout>
@@ -15,17 +15,6 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true" />
- <Button
- android:id="@+id/more"
- style="?attr/materialIconButtonFilledStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/emojis"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/more_reactions"
- app:icon="@drawable/ic_more_horiz_24dp" />
-
</RelativeLayout>
-</layout>
+</layout>