From f864ebd969d6a9da870054d9473ecae880fe12fb Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 13 Jul 2020 19:12:05 +0200 Subject: [PATCH] copy release notes --- .../StatusListAdapter.java | 8 +++- .../android/drawer/StatusListAdapter.java | 4 -- .../android/drawers/StatusListAdapter.java | 37 +++++++++++++++++++ 3 files changed, 43 insertions(+), 6 deletions(-) rename app/src/common/java/app/fedilab/android/{drawer => drawers}/StatusListAdapter.java (92%) delete mode 100644 app/src/lite/java/app/fedilab/android/drawer/StatusListAdapter.java create mode 100644 app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java diff --git a/app/src/common/java/app/fedilab/android/drawer/StatusListAdapter.java b/app/src/common/java/app/fedilab/android/drawers/StatusListAdapter.java similarity index 92% rename from app/src/common/java/app/fedilab/android/drawer/StatusListAdapter.java rename to app/src/common/java/app/fedilab/android/drawers/StatusListAdapter.java index 96f27ba0a..a9bfb1156 100644 --- a/app/src/common/java/app/fedilab/android/drawer/StatusListAdapter.java +++ b/app/src/common/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -16,6 +16,10 @@ package app.fedilab.android.drawer; import android.os.AsyncTask; import android.view.inputmethod.InputMethodManager; +import com.vanniktech.emoji.EmojiManager; +import com.vanniktech.emoji.EmojiPopup; +import com.vanniktech.emoji.one.EmojiOneProvider; + import app.fedilab.android.asynctasks.PostActionAsyncTask; import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask; import app.fedilab.android.client.API; @@ -30,7 +34,7 @@ public class StatusListAdapter extends BaseStatusListAdapter { super(statusDrawerParams); } - protected void statusAddReactionClick(){ + public void statusAddReactionClick(){ EmojiManager.install(new EmojiOneProvider()); final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.status_add_reaction).setOnEmojiPopupDismissListener(() -> { InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE); @@ -64,7 +68,7 @@ public class StatusListAdapter extends BaseStatusListAdapter { } else { statusAction = alreadyAdded ? API.StatusAction.REMOVE_PLEROMA_REACTION : API.StatusAction.ADD_PLEROMA_REACTION; } - new PostActionAsyncTask(context, statusAction, status.getId(), null, emojiStr, BaseStatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + new PostActionAsyncTask(context, statusAction, status.getId(), null, emojiStr, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }) .build(holder.fake_edittext); emojiPopup.toggle(); diff --git a/app/src/lite/java/app/fedilab/android/drawer/StatusListAdapter.java b/app/src/lite/java/app/fedilab/android/drawer/StatusListAdapter.java deleted file mode 100644 index e438964dd..000000000 --- a/app/src/lite/java/app/fedilab/android/drawer/StatusListAdapter.java +++ /dev/null @@ -1,4 +0,0 @@ -package app.fedilab.android.drawer; - -public class StatusListAdapter { -} diff --git a/app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java new file mode 100644 index 000000000..58a0ce846 --- /dev/null +++ b/app/src/lite/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -0,0 +1,37 @@ +package app.fedilab.android.drawer; +/* Copyright 2020 Thomas Schneider + * + * This file is a part of Fedilab + * + * This program is free software; you can redistribute it and/or modify it under the terms of the + * GNU General Public License as published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Fedilab; if not, + * see . */ +import android.os.AsyncTask; +import android.view.inputmethod.InputMethodManager; + +import app.fedilab.android.asynctasks.PostActionAsyncTask; +import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask; +import app.fedilab.android.client.API; +import app.fedilab.android.client.Entities.Reaction; +import app.fedilab.android.client.Entities.StatusDrawerParams; +import app.fedilab.android.drawers.BaseStatusListAdapter; + +import static android.content.Context.INPUT_METHOD_SERVICE; + +public class StatusListAdapter extends BaseStatusListAdapter { + public StatusListAdapter(StatusDrawerParams statusDrawerParams) { + super(statusDrawerParams); + } + + protected void statusAddReactionClick(){ + + } + +}