From 29855dda8322708d21115dc539b35ced7b5bb39f Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Mon, 28 Jun 2021 16:36:34 +0200
Subject: [PATCH] new link preview layout, added comments

Signed-off-by: nuclearfog <hatespirit666@gmail.com>
---
 app/build.gradle                              |  4 +--
 .../twidda/database/DatabaseAdapter.java      | 10 ++++--
 .../nuclearfog/twidda/dialog/LinkDialog.java  |  7 ++--
 .../main/res/layout/dialog_link_preview.xml   | 36 +++++++++----------
 app/src/main/res/values/dimens.xml            |  2 +-
 5 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5ceb7a56..b1ea1406 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,8 +38,8 @@ android {
 
 proguardDictionaries {
     dictionaryNames = ['dict/class-dictionary', 'dict/package-dictionary', 'dict/obfuscation-dictionary']
-    minLineLength 1 // minimum package name length
-    maxLineLength 6 // maximum package name length
+    minLineLength 4 // minimum package name length
+    maxLineLength 8 // maximum package name length
     linesCountInDictionary 3000 // maximum class count
 }
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
index 56e46965..e52f0404 100644
--- a/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
@@ -134,20 +134,26 @@ public class DatabaseAdapter {
             + AccountTable.KEY2 + " TEXT);";
 
     /**
-     * index for tweet table
+     * table index for tweet table
      */
     private static final String INDX_TWEET = "CREATE INDEX IF NOT EXISTS idx_tweet"
             + " ON " + TweetTable.NAME + "(" + TweetTable.USER + ");";
 
     /**
-     * index for trend table
+     * table index for trend table
      */
     private static final String INDX_TREND = "CREATE INDEX IF NOT EXISTS idx_trend"
             + " ON " + TrendTable.NAME + "(" + TrendTable.ID + ");";
 
+    /**
+     * table index for tweet register
+     */
     private static final String INDX_TWEET_REG = "CREATE INDEX IF NOT EXISTS idx_tweet_register"
             + " ON " + TweetRegisterTable.NAME + "(" + TweetRegisterTable.OWNER + "," + TweetRegisterTable.ID + ");";
 
+    /**
+     * table index for user register
+     */
     private static final String INDX_USER_REG = "CREATE INDEX IF NOT EXISTS idx_user_register"
             + " ON " + UserRegisterTable.NAME + "(" + UserRegisterTable.OWNER + "," + UserRegisterTable.ID + ");";
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/dialog/LinkDialog.java b/app/src/main/java/org/nuclearfog/twidda/dialog/LinkDialog.java
index ac3a0094..f1ee1ec2 100644
--- a/app/src/main/java/org/nuclearfog/twidda/dialog/LinkDialog.java
+++ b/app/src/main/java/org/nuclearfog/twidda/dialog/LinkDialog.java
@@ -24,6 +24,7 @@ import org.nuclearfog.twidda.backend.utils.AppStyles;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import static android.widget.Toast.LENGTH_SHORT;
+import static com.squareup.picasso.NetworkPolicy.NO_STORE;
 
 /**
  * dialog class to show link preview
@@ -105,8 +106,10 @@ public class LinkDialog extends Dialog implements LinkPreviewCallback, OnClickLi
             if (!sourceContent.getImages().isEmpty()) {
                 // load first image as preview
                 String link = sourceContent.getImages().get(0);
-                if (link != null && link.startsWith("https://"))
-                    Picasso.get().load(link).into(preview);
+                if (link != null && link.startsWith("https://")) {
+                    // load image without caching
+                    Picasso.get().load(link).networkPolicy(NO_STORE).into(preview);
+                }
             } else {
                 // no image preview
                 preview.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml
index f91bfdbf..4fd1c642 100644
--- a/app/src/main/res/layout/dialog_link_preview.xml
+++ b/app/src/main/res/layout/dialog_link_preview.xml
@@ -10,21 +10,11 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:contentDescription="@string/dialog_link_image_preview"
-        app:layout_constraintDimensionRatio="1.0"
-        app:layout_constraintWidth_percent="0.2"
+        android:scaleType="centerCrop"
+        app:layout_constraintDimensionRatio="2.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/link_preview_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dialog_linkpreview_margin"
-        android:maxLines="2"
-        android:textSize="@dimen/dialog_linkpreview_textsize_title"
-        app:layout_constraintStart_toEndOf="@id/link_preview_image"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/link_preview_close" />
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <ImageView
         android:id="@+id/link_preview_close"
@@ -32,16 +22,26 @@
         android:layout_height="@dimen/dialog_linkpreview_btn_size"
         android:contentDescription="@string/dialog_link_close"
         android:layout_margin="@dimen/dialog_linkpreview_margin"
-        app:layout_constraintStart_toEndOf="@id/link_preview_title"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
     <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/link_preview_title_barrier"
+        android:id="@+id/link_preview_image_barrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="link_preview_image,link_preview_title,link_preview_close" />
+        app:constraint_referenced_ids="link_preview_image,link_preview_close"
+        app:barrierDirection="bottom" />
+
+    <TextView
+        android:id="@+id/link_preview_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dialog_linkpreview_margin"
+        android:singleLine="true"
+        android:textSize="@dimen/dialog_linkpreview_textsize_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/link_preview_image"
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
         android:id="@+id/link_preview_description"
@@ -53,7 +53,7 @@
         android:fadeScrollbars="false"
         android:layout_margin="@dimen/dialog_linkpreview_margin"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/link_preview_title_barrier"
+        app:layout_constraintTop_toBottomOf="@id/link_preview_title"
         app:layout_constraintEnd_toEndOf="parent" />
 
     <ProgressBar
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 91fdfacd..5a63bda8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -207,7 +207,7 @@
     <!--dimens of link preview-->
     <dimen name="dialog_linkpreview_textsize_title">18sp</dimen>
     <dimen name="dialog_linkpreview_textsize_description">14sp</dimen>
-    <dimen name="dialog_linkpreview_btn_size">30sp</dimen>
+    <dimen name="dialog_linkpreview_btn_size">32dp</dimen>
     <dimen name="dialog_linkpreview_margin">4dp</dimen>
     <dimen name="dialog_linkpreview_padding">5dp</dimen>
     <integer name="dialog_description_line_count">10</integer>