Create link preview draft view

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -224,11 +224,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         linkPreviewViewModel.linkPreviewState.observe(this, { previewState: LinkPreviewState? ->
             if (previewState == null) return@observe
             if (previewState.isLoading) {
-                Log.d("Test", "Loading link preview.")
+                inputBar.draftLinkPreview()
-                // inputPanel.setLinkPreviewLoading()
             } else {
-                Log.d("Test", "Setting link preview: " + previewState.linkPreview.isPresent)
+                inputBar.updateLinkPreviewDraft(glide, previewState.linkPreview.get())
-                // inputPanel.setLinkPreview(glideRequests, previewState.linkPreview)
             }
         })
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt

@@ -0,0 +1,38 @@
+package org.thoughtcrime.securesms.conversation.v2.components
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import androidx.core.view.isVisible
+import kotlinx.android.synthetic.main.view_link_preview_draft.view.*
+import network.loki.messenger.R
+import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
+import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.mms.ImageSlide
+
+class LinkPreviewDraftView : LinearLayout {
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) { initialize() }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { initialize() }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { initialize() }
+
+    private fun initialize() {
+        LayoutInflater.from(context).inflate(R.layout.view_link_preview_draft, this)
+        linkPreviewDraftContainer.isVisible = false
+        thumbnailImageView.clipToOutline = true
+    }
+    // endregion
+
+    // region Updating
+    fun update(glide: GlideRequests, linkPreview: LinkPreview) {
+        linkPreviewDraftContainer.isVisible = true
+        linkPreviewDraftLoader.isVisible = false
+        if (linkPreview.getThumbnail().isPresent) {
+            thumbnailImageView.setImageResource(glide, ImageSlide(context, linkPreview.getThumbnail().get()), false, false)
+        }
+        linkPreviewDraftTitleTextView.text = linkPreview.title
+    }
+    // endregion
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt

@@ -2,24 +2,23 @@ package org.thoughtcrime.securesms.conversation.v2.input_bar
 
 import android.content.Context
 import android.content.res.Resources
-import android.text.Editable
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.MotionEvent
-import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.view_input_bar.view.*
 import kotlinx.android.synthetic.main.view_quote.view.*
 import network.loki.messenger.R
+import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
+import org.thoughtcrime.securesms.conversation.v2.components.LinkPreviewDraftView
 import org.thoughtcrime.securesms.conversation.v2.messages.QuoteView
 import org.thoughtcrime.securesms.conversation.v2.messages.QuoteViewDelegate
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.loki.utilities.toDp
 import org.thoughtcrime.securesms.loki.utilities.toPx
-import org.thoughtcrime.securesms.mms.SlideDeck
+import org.thoughtcrime.securesms.mms.GlideRequests
 import kotlin.math.max
 import kotlin.math.roundToInt
 
@@ -27,6 +26,7 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate {
     private val screenWidth = Resources.getSystem().displayMetrics.widthPixels
     private val vMargin by lazy { toDp(4, resources) }
     private val minHeight by lazy { toPx(56, resources) }
+    private var linkPreviewDraftView: LinkPreviewDraftView? = null
     var delegate: InputBarDelegate? = null
     var additionalContentHeight = 0
 
@@ -96,6 +96,7 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate {
     }
 
     fun draftQuote(message: MessageRecord) {
+        linkPreviewDraftView = null
         inputBarAdditionalContentContainer.removeAllViews()
         val quoteView = QuoteView(context, QuoteView.Mode.Draft)
         quoteView.delegate = this
@@ -121,6 +122,22 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate {
         additionalContentHeight = 0
         setHeight(newHeight)
     }
+
+    fun draftLinkPreview() {
+        val linkPreviewDraftHeight = toPx(88, resources)
+        inputBarAdditionalContentContainer.removeAllViews()
+        val linkPreviewDraftView = LinkPreviewDraftView(context)
+        this.linkPreviewDraftView = linkPreviewDraftView
+        inputBarAdditionalContentContainer.addView(linkPreviewDraftView)
+        val newHeight = max(inputBarEditText.height + 2 * vMargin, minHeight) + linkPreviewDraftHeight
+        additionalContentHeight = linkPreviewDraftHeight
+        setHeight(newHeight)
+    }
+
+    fun updateLinkPreviewDraft(glide: GlideRequests, linkPreview: LinkPreview) {
+        val linkPreviewDraftView = this.linkPreviewDraftView ?: return
+        linkPreviewDraftView.update(glide, linkPreview)
+    }
     // endregion
 }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt

@@ -1,20 +1,12 @@
 package org.thoughtcrime.securesms.conversation.v2.messages
 
 import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Outline
-import android.graphics.Path
-import android.graphics.RectF
 import android.graphics.drawable.Drawable
-import android.os.Build
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.LinearLayout
 import androidx.core.content.res.ResourcesCompat
-import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.view_link_preview.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord

app/src/main/res/layout/view_link_preview_draft.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="88dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:paddingHorizontal="@dimen/medium_spacing">
+
+    <RelativeLayout
+        android:id="@+id/linkPreviewDraftContainer"
+        android:layout_width="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_height="wrap_content">
+
+        <RelativeLayout
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true">
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_centerInParent="true"
+                android:src="@drawable/ic_link"
+                app:tint="@color/text" />
+
+            <org.thoughtcrime.securesms.conversation.v2.utilities.ThumbnailView
+                android:id="@+id/thumbnailImageView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop" />
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/linkPreviewDraftTitleTextView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingStart="80dp"
+            android:paddingEnd="30dp"
+            android:layout_centerInParent="true"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/small_font_size"
+            android:textStyle="bold"
+            tools:text="The Day The Dinosaurs Died - Minute by Minute"
+            android:maxLines="3"
+            android:ellipsize="end"
+            android:textColor="@color/text" />
+
+        <ImageView
+            android:id="@+id/linkPreviewDraftCancelButton"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:padding="6dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_close_white_48dp"
+            app:tint="@color/text" />
+
+    </RelativeLayout>
+
+    <com.github.ybq.android.spinkit.SpinKitView
+        android:id="@+id/linkPreviewDraftLoader"
+        style="@style/SpinKitView.Large.ThreeBounce"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:SpinKit_Color="@color/text"
+        android:layout_centerInParent="true" />
+
+</RelativeLayout>