From cc2650454a5f3daf2ae4a8e165ffa9e7b5705072 Mon Sep 17 00:00:00 2001
From: LooKeR <mohit2002ss@gmail.com>
Date: Sun, 17 Oct 2021 13:04:57 +0530
Subject: [PATCH] Add: Use Card for AppItem Fix: Escape Apostrophi Update:
 Rounded Corner for App Item

---
 build.gradle                                  |  4 +-
 .../looker/droidify/screen/ScreenActivity.kt  |  2 +-
 src/main/res/layout/fragment.xml              |  3 +-
 src/main/res/layout/product_item.xml          | 86 +++++++++++--------
 src/main/res/values-it/strings.xml            |  8 +-
 5 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0b6def36..a6261e90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + versions.kotlin
         classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31'
     }
 }
 
@@ -125,6 +125,8 @@ dependencies {
     implementation 'io.reactivex.rxjava3:rxjava:3.1.1'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
     implementation 'androidx.activity:activity-ktx:1.4.0-rc01'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.13.0'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
     implementation 'com.github.topjohnwu.libsu:core:3.1.2'
diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
index 67e94abe..5451f567 100644
--- a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
@@ -229,7 +229,7 @@ abstract class ScreenActivity : FragmentActivity() {
                 if (!packageName.isNullOrEmpty()) {
                     val fragment = currentFragment
                     if (fragment !is ProductFragment || fragment.packageName != packageName) {
-                        pushFragment(ProductFragment(packageName))
+                        navigateProduct(packageName)
                     }
                 }
             }
diff --git a/src/main/res/layout/fragment.xml b/src/main/res/layout/fragment.xml
index d5090d7e..507709ac 100644
--- a/src/main/res/layout/fragment.xml
+++ b/src/main/res/layout/fragment.xml
@@ -33,7 +33,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="?android:attr/colorBackground"
-        android:layout_marginHorizontal="10dp" />
+        android:background="?android:attr/colorBackground" />
 
 </com.looker.droidify.widget.FragmentLinearLayout>
diff --git a/src/main/res/layout/product_item.xml b/src/main/res/layout/product_item.xml
index f5b164fb..6b75f3f6 100644
--- a/src/main/res/layout/product_item.xml
+++ b/src/main/res/layout/product_item.xml
@@ -1,59 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:background="?android:attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingStart="14dp"
-    android:paddingEnd="16dp">
-
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/icon"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        tools:ignore="ContentDescription" />
+    android:layout_marginHorizontal="10dp"
+    app:cardBackgroundColor="@null"
+    app:cardCornerRadius="12dp"
+    app:cardElevation="0dp"
+    app:strokeColor="@null"
+    app:strokeWidth="0dp">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="14dp"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/icon"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            tools:ignore="ContentDescription" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="14dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:singleLine="true"
+                    android:textColor="?android:attr/textColor"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxWidth="70dp"
+                    android:singleLine="true" />
+
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/name"
-                android:layout_width="0dp"
+                android:id="@+id/summary"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:singleLine="true"
                 android:textColor="?android:attr/textColor"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxWidth="70dp"
-                android:singleLine="true" />
+                android:textSize="14sp" />
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/summary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColor"
-            android:textSize="14sp" />
-
     </LinearLayout>
 
-</LinearLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 6a6bd7ee..05a1643b 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -12,7 +12,7 @@
     <string name="application">Applicazioni</string>
     <string name="application_not_found">Applicazione non trovata</string>
     <string name="author_email">Email autore</string>
-    <string name="author_website">Sito web dell'autore</string>
+    <string name="author_website">Sito web dell\'autore</string>
     <string name="available">Disponibile</string>
     <string name="bug_tracker">Bug tracker</string>
     <string name="cancel">Annulla</string>
@@ -65,7 +65,7 @@
     <string name="install">Installa</string>
     <string name="install_types">Tipi di installazione</string>
     <string name="installed">Installato</string>
-    <string name="integrity_check_error_DESC">Impossibile verificare l'integrità</string>
+    <string name="integrity_check_error_DESC">Impossibile verificare l\'integrità</string>
     <string name="invalid_address">Indirizzo non valido</string>
     <string name="invalid_fingerprint_format">Fingerprint in un formato non valido</string>
     <string name="invalid_metadata_error_DESC">Metadata non validi.</string>
@@ -124,7 +124,7 @@
     applicazioni da repository senza firma.</string>
     <string name="requires_FORMAT">Richiede %s</string>
     <string name="root_permission">Installazione silenziosa</string>
-    <string name="root_permission_description">Permetti i permessi Root per abilitare l'installazione silenziosa</string>
+    <string name="root_permission_description">Permetti i permessi Root per abilitare l\'installazione silenziosa</string>
     <string name="save">Salva</string>
     <string name="saving_details">Salvataggio dettagli</string>
     <string name="screenshots">Screenshots</string>
@@ -163,7 +163,7 @@
     <string name="upstream_source_code_is_not_free">Codice sorgente aggiornato non libero</string>
     <string name="username">Nome utente</string>
     <string name="username_missing">Nome utente mancante</string>
-    <string name="validation_index_error_DESC">L'indice non può essere convalidato</string>
+    <string name="validation_index_error_DESC">L\'indice non può essere convalidato</string>
     <string name="version_FORMAT">Versione %s</string>
     <string name="versions">Versioni</string>
     <string name="waiting_to_start_download">In attesa di inizio del download</string>