Merge remote-tracking branch 'origin/showAvatars' into showAvatars

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -19,14 +19,16 @@
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Looper;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
-import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
@@ -37,10 +39,18 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.bumptech.glide.GenericRequestBuilder;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.model.StreamEncoder;
+import com.bumptech.glide.load.resource.file.FileToStreamDecoder;
+import com.caverock.androidsvg.SVG;
+import com.google.android.material.chip.ChipDrawable;
 import com.google.android.material.chip.ChipDrawable;
 import com.nextcloud.client.account.CurrentAccountProvider;
 import com.nextcloud.client.network.ClientFactory;
 import com.nextcloud.common.NextcloudClient;
+import com.nextcloud.utils.text.Spans;
 import com.nextcloud.utils.GlideHelper;
 import com.nextcloud.utils.text.Spans;
 import com.owncloud.android.MainApp;
@@ -62,8 +72,11 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.XmlRes;
 import androidx.recyclerview.widget.RecyclerView;
 import third_parties.fresco.BetterImageSpan;
 
@@ -320,6 +333,74 @@ private ChipDrawable getDrawableForMentionChipSpan(int chipResource, String text
         return chip;
     }
 
+    /**
+     * c&p from Talk: DisplayUtils:227
+     *
+     * @return Spannable
+     */
+    private Spanned searchAndReplaceWithMentionSpan(
+        String key,
+        String text,
+        String id,
+        String label,
+        @XmlRes int chipXmlRes) {
+        Spannable spannableString = new SpannableString(text);
+        String stringText = text.toString();
+        String keyWithBrackets = "{" + key + "}";
+        Matcher m = Pattern.compile(keyWithBrackets, Pattern.CASE_INSENSITIVE | Pattern.LITERAL | Pattern.MULTILINE)
+            .matcher(spannableString);
+        ClickableSpan clickableSpan = new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View view) {
+                //EventBus.getDefault().post(new UserMentionClickEvent(id));
+            }
+        };
+
+        int lastStartIndex = 0;
+        Spans.MentionChipSpan mentionChipSpan;
+
+        while (m.find()) {
+            int start = stringText.indexOf(m.group(), lastStartIndex);
+            int end = start + m.group().length();
+            lastStartIndex = end;
+            Drawable drawableForChip = getDrawableForMentionChipSpan(
+                chipXmlRes,
+                label
+                                                                    );
+
+
+            mentionChipSpan = new Spans.MentionChipSpan(
+                drawableForChip,
+                BetterImageSpan.ALIGN_CENTER,
+                id,
+                label
+            );
+            spannableString.setSpan(mentionChipSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+//            if (chipXmlRes == R.xml.chip_you) {
+//                spannableString.setSpan(
+//                    viewThemeUtils.talk.themeForegroundColorSpan(context),
+//                    start,
+//                    end,
+//                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+//                                       );
+//            }
+//            if ("user" == type && conversationUser.userId != id && !isFederated) {
+//                spannableString.setSpan(clickableSpan, start, end, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+//            }
+        }
+        return spannableString;
+    }
+
+    private Drawable getDrawableForMentionChipSpan(int chipResource, String text) {
+        ChipDrawable chip = ChipDrawable.createFromResource(context, chipResource);
+        chip.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+        chip.setText(text);
+        chip.setChipIconResource(R.drawable.accent_circle);
+        chip.setBounds(0, 0, chip.getIntrinsicWidth(), chip.getIntrinsicHeight());
+
+        return chip;
+    }
+
     private SpannableStringBuilder addClickablePart(RichElement richElement) {
         String text = richElement.getRichSubject();
         SpannableStringBuilder ssb = new SpannableStringBuilder(text);

…/third_parties/fresco/BetterImageSpan.kt …n/thirdparties/fresco/BetterImageSpan.ktapp/src/main/java/third_parties/fresco/BetterImageSpan.kt renamed to app/src/main/kotlin/thirdparties/fresco/BetterImageSpan.kt app/src/main/java/third_parties/fresco/BetterImageSpan.kt renamed to app/src/main/kotlin/thirdparties/fresco/BetterImageSpan.kt

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package third_parties.fresco
+package thirdParties.fresco
 
 import android.graphics.Canvas
 import android.graphics.Paint
@@ -98,18 +98,16 @@ open class BetterImageSpan @JvmOverloads constructor(
         mHeight = mBounds!!.height()
     }
 
-    private fun getOffsetAboveBaseline(fm: Paint.FontMetricsInt): Int {
-        return when (mAlignment) {
-            ALIGN_BOTTOM -> fm.descent - mHeight
-            ALIGN_CENTER -> {
-                val textHeight = fm.descent - fm.ascent
-                val offset = (textHeight - mHeight) / 2
-                fm.ascent + offset
-            }
-
-            ALIGN_BASELINE -> -mHeight
-            else -> -mHeight
+    private fun getOffsetAboveBaseline(fm: Paint.FontMetricsInt): Int = when (mAlignment) {
+        ALIGN_BOTTOM -> fm.descent - mHeight
+        ALIGN_CENTER -> {
+            val textHeight = fm.descent - fm.ascent
+            val offset = (textHeight - mHeight) / 2
+            fm.ascent + offset
         }
+
+        ALIGN_BASELINE -> -mHeight
+        else -> -mHeight
     }
 
     companion object {