From 68dbf59ef6cfae26e075d075a6685562e1a7ba03 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sun, 16 Aug 2020 06:25:57 +0900 Subject: [PATCH] Add image upload icon to dms layout and handle click --- .../activities/DirectMessageThread.java | 87 +++++++++++++++---- app/src/main/res/drawable/ic_image_24.xml | 10 +++ app/src/main/res/drawable/ic_send_24.xml | 10 +++ app/src/main/res/layout/activity_dms.xml | 41 ++++++--- app/src/main/res/values/strings.xml | 1 + 5 files changed, 120 insertions(+), 29 deletions(-) create mode 100644 app/src/main/res/drawable/ic_image_24.xml create mode 100644 app/src/main/res/drawable/ic_send_24.xml diff --git a/app/src/main/java/awais/instagrabber/activities/DirectMessageThread.java b/app/src/main/java/awais/instagrabber/activities/DirectMessageThread.java index 2230e064..80a42dea 100644 --- a/app/src/main/java/awais/instagrabber/activities/DirectMessageThread.java +++ b/app/src/main/java/awais/instagrabber/activities/DirectMessageThread.java @@ -1,9 +1,12 @@ package awais.instagrabber.activities; +import android.app.Activity; import android.content.Intent; +import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; +import android.provider.OpenableColumns; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -13,6 +16,8 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import java.io.FileNotFoundException; +import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -36,7 +41,12 @@ import awais.instagrabber.models.enums.UserInboxDirection; import awais.instagrabber.utils.Constants; import awais.instagrabber.utils.Utils; +import static android.view.View.VISIBLE; + public final class DirectMessageThread extends BaseLanguageActivity { + private static final String TAG = "DirectMessageThread"; + private static final int PICK_IMAGE = 100; + private DirectItemModel directItemModel; private String threadId; private String endCursor; @@ -86,24 +96,34 @@ public final class DirectMessageThread extends BaseLanguageActivity { dmsBinding.swipeRefreshLayout.setRefreshing(false); } }; - private final View.OnClickListener newCommentListener = v -> { - if (Utils.isEmpty(dmsBinding.commentText.getText().toString())) { - Toast.makeText(getApplicationContext(), R.string.comment_send_empty_comment, Toast.LENGTH_SHORT).show(); - return; - } - final CommentAction action = new CommentAction(dmsBinding.commentText.getText().toString(), threadId); - action.setOnTaskCompleteListener(result -> { - if (!result) { - Toast.makeText(getApplicationContext(), R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show(); + private final View.OnClickListener clickListener = v -> { + if (v == dmsBinding.commentSend) { + if (Utils.isEmpty(dmsBinding.commentText.getText().toString())) { + Toast.makeText(getApplicationContext(), R.string.comment_send_empty_comment, Toast.LENGTH_SHORT).show(); return; } - dmsBinding.commentText.setText(""); - dmsBinding.commentText.clearFocus(); - directItemModels.clear(); - messageItemsAdapter.notifyDataSetChanged(); - new UserInboxFetcher(threadId, UserInboxDirection.OLDER, null, fetchListener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - }); - action.execute(); + final CommentAction action = new CommentAction(dmsBinding.commentText.getText().toString(), threadId); + action.setOnTaskCompleteListener(result -> { + if (!result) { + Toast.makeText(getApplicationContext(), R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show(); + return; + } + dmsBinding.commentText.setText(""); + dmsBinding.commentText.clearFocus(); + directItemModels.clear(); + messageItemsAdapter.notifyDataSetChanged(); + new UserInboxFetcher(threadId, UserInboxDirection.OLDER, null, fetchListener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + }); + action.execute(); + return; + } + if (v == dmsBinding.image) { + final Intent intent = new Intent(); + intent.setType("image/*"); + intent.setAction(Intent.ACTION_GET_CONTENT); + startActivityForResult(Intent.createChooser(intent, getString(R.string.select_picture)), PICK_IMAGE); + } + }; @Override @@ -121,9 +141,11 @@ public final class DirectMessageThread extends BaseLanguageActivity { } dmsBinding.swipeRefreshLayout.setEnabled(false); - dmsBinding.commentText.setVisibility(View.VISIBLE); - dmsBinding.commentSend.setVisibility(View.VISIBLE); - dmsBinding.commentSend.setOnClickListener(newCommentListener); + dmsBinding.commentText.setVisibility(VISIBLE); + dmsBinding.commentSend.setVisibility(VISIBLE); + dmsBinding.image.setVisibility(VISIBLE); + dmsBinding.commentSend.setOnClickListener(clickListener); + dmsBinding.image.setOnClickListener(clickListener); final LinearLayoutManager layoutManager = new LinearLayoutManager(this, RecyclerView.VERTICAL, true); dmsBinding.rvDirectMessages.setLayoutManager(layoutManager); @@ -199,6 +221,33 @@ public final class DirectMessageThread extends BaseLanguageActivity { new UserInboxFetcher(threadModel.getThreadId(), UserInboxDirection.OLDER, null, fetchListener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == PICK_IMAGE && resultCode == Activity.RESULT_OK) { + if (data == null || data.getData() == null) { + Log.w(TAG, "data is null!"); + return; + } + Cursor cursor = null; + try { + final Uri uri = data.getData(); + cursor = getContentResolver().query(uri, null, null, null, null); + if (cursor != null) { + final int contentLength = cursor.getColumnIndex(OpenableColumns.SIZE); + final InputStream inputStream = getContentResolver().openInputStream(uri); + // TODO Handle image upload + } + } catch (FileNotFoundException e) { + Log.e(TAG, "Error opening InputStream", e); + } finally { + if (cursor != null) { + cursor.close(); + } + } + } + } + @Nullable private ProfileModel getUser(final long userId) { if (users != null) { diff --git a/app/src/main/res/drawable/ic_image_24.xml b/app/src/main/res/drawable/ic_image_24.xml new file mode 100644 index 00000000..a740230c --- /dev/null +++ b/app/src/main/res/drawable/ic_image_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_send_24.xml b/app/src/main/res/drawable/ic_send_24.xml new file mode 100644 index 00000000..fe37f93f --- /dev/null +++ b/app/src/main/res/drawable/ic_send_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_dms.xml b/app/src/main/res/layout/activity_dms.xml index 1f2f2c48..6bd5f945 100755 --- a/app/src/main/res/layout/activity_dms.xml +++ b/app/src/main/res/layout/activity_dms.xml @@ -9,14 +9,13 @@ + android:layout_height="0dp" + android:layout_weight="8"> + android:paddingStart="8dp" + android:paddingLeft="8dp" + android:paddingEnd="4dp" + android:paddingRight="4dp" + android:scrollHorizontally="false" + android:visibility="visible" /> + + - + android:paddingBottom="4dp" + android:visibility="visible" + app:srcCompat="@drawable/ic_send_24" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 984f5ee9..a7682f9d 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -213,4 +213,5 @@ Use AMOLED mode for Dark theme Activity InstaGrabber\nCopyright (C) 2019 AWAiS\nCopyright (C) 2020 Austin Huang, Ammar Githam\n\nThis 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. See https://www.gnu.org/licenses/.\n\nTHIS SOFTWARE IS PROVIDED BY THE AUTHOR \'\'AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\nSee project page for third-party attributions. + Select Picture