From d763fa00d3b42c195eb378198bef0ddd8ea6c9f5 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 24 Jun 2021 13:59:53 +1000 Subject: [PATCH] Add link preview dialog --- .../conversation/v2/ConversationActivityV2.kt | 3 +- .../v2/dialogs/LinkPreviewDialog.kt | 21 +++++++ .../main/res/layout/dialog_link_preview.xml | 57 +++++++++++++++++++ app/src/main/res/values/strings.xml | 4 ++ 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt create mode 100644 app/src/main/res/layout/dialog_link_preview.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index 55489e8416..c3074b944f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.conversation.v2.dialogs.BlockedDialog import org.thoughtcrime.securesms.conversation.v2.dialogs.JoinOpenGroupDialog +import org.thoughtcrime.securesms.conversation.v2.dialogs.LinkPreviewDialog import org.thoughtcrime.securesms.conversation.v2.dialogs.OpenURLDialog import org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarButton import org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarDelegate @@ -413,7 +414,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe // the view) so as to not interfere with all the other gestures. Do not add // onClickListeners directly to message content views. view.onContentClick() - OpenURLDialog("http://iuasfiuhasf.oiasf").show(supportFragmentManager, "Blocked Dialog") + LinkPreviewDialog().show(supportFragmentManager, "Blocked Dialog") } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt new file mode 100644 index 0000000000..590f2c5bd3 --- /dev/null +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/LinkPreviewDialog.kt @@ -0,0 +1,21 @@ +package org.thoughtcrime.securesms.conversation.v2.dialogs + +import android.view.LayoutInflater +import androidx.appcompat.app.AlertDialog +import kotlinx.android.synthetic.main.dialog_link_preview.view.* +import network.loki.messenger.R +import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog + +class LinkPreviewDialog() : BaseDialog() { + + override fun setContentView(builder: AlertDialog.Builder) { + val contentView = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_link_preview, null) + contentView.cancelButton.setOnClickListener { dismiss() } + contentView.enableLinkPreviewsButton.setOnClickListener { enable() } + builder.setView(contentView) + } + + private fun enable() { + + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml new file mode 100644 index 0000000000..67fb381e04 --- /dev/null +++ b/app/src/main/res/layout/dialog_link_preview.xml @@ -0,0 +1,57 @@ + + + + + + + + + +