From 8938eb532a4f1ff61b0f43200d059f79d5cdf95d Mon Sep 17 00:00:00 2001
From: SayantanRC <sayantan.rc@e.email>
Date: Wed, 13 Jul 2022 20:37:04 +0530
Subject: [PATCH 1/2] issue_5140: fix list item privacy score constraints

---
 .../main/res/layout/application_list_item.xml | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout/application_list_item.xml b/app/src/main/res/layout/application_list_item.xml
index 9c0be1e12..88d70bcb3 100644
--- a/app/src/main/res/layout/application_list_item.xml
+++ b/app/src/main/res/layout/application_list_item.xml
@@ -155,42 +155,43 @@
             app:layout_constraintLeft_toLeftOf="@+id/installButton"
             app:layout_constraintRight_toRightOf="@+id/installButton"/>
 
-        <LinearLayout
-            android:id="@+id/appPrivacyScoreLayout"
+    <LinearLayout
+        android:id="@+id/appPrivacyScoreLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginEnd="4dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/installButton">
+
+        <ImageView
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:src="@drawable/ic_lock" />
+
+        <TextView
+            android:id="@+id/app_privacy_score"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="4dp"
-            android:orientation="horizontal"
-            app:layout_constraintTop_toTopOf="@+id/app_rating_bar"
-            app:layout_constraintBottom_toBottomOf="@+id/app_rating_bar"
-            app:layout_constraintRight_toRightOf="parent">
-
-            <ImageView
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:src="@drawable/ic_lock" />
-
-            <TextView
-                android:id="@+id/app_privacy_score"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginStart="4dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:text="@string/not_available"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="14sp"
-                android:visibility="gone"/>
-
-            <ProgressBar
-                android:id="@+id/progressBar"
-                style="?android:attr/progressBarStyle"
-                android:visibility="gone"
-                android:layout_width="16dp"
-                android:layout_height="16dp"/>
-
-        </LinearLayout>
+            android:layout_marginStart="4dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/not_available"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="14sp"
+            android:visibility="gone" />
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:visibility="gone" />
+
+    </LinearLayout>
 
         <TextView
             android:id="@+id/sourceTag"
-- 
GitLab


From ac1aa6de3d7bed70e100f7e3ccb1a1830486d70a Mon Sep 17 00:00:00 2001
From: SayantanRC <sayantan.rc@e.email>
Date: Wed, 13 Jul 2022 20:38:20 +0530
Subject: [PATCH 2/2] issue_5140: fix list item xml code indentation

---
 .../main/res/layout/application_list_item.xml | 141 +++++++++---------
 1 file changed, 70 insertions(+), 71 deletions(-)

diff --git a/app/src/main/res/layout/application_list_item.xml b/app/src/main/res/layout/application_list_item.xml
index 88d70bcb3..0984cf0a6 100644
--- a/app/src/main/res/layout/application_list_item.xml
+++ b/app/src/main/res/layout/application_list_item.xml
@@ -33,12 +33,11 @@
         android:id="@+id/placeholder_progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"
-        />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.cardview.widget.CardView
         android:id="@+id/app_icon_card"
@@ -63,11 +62,11 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="2dp"
+        android:layout_marginEnd="4dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorPrimary"
         android:textSize="16sp"
-        android:layout_marginEnd="4dp"
         app:layout_constraintLeft_toRightOf="@+id/app_icon_card"
         app:layout_constraintRight_toLeftOf="@+id/installButton"
         app:layout_constraintTop_toTopOf="@+id/app_icon_card"
@@ -81,10 +80,10 @@
         android:maxLines="1"
         android:textColor="?android:textColorPrimary"
         android:textSize="14sp"
+        app:layout_constraintBottom_toTopOf="@+id/app_rating_bar"
         app:layout_constraintLeft_toLeftOf="@+id/app_title"
         app:layout_constraintRight_toLeftOf="@+id/installButton"
         app:layout_constraintTop_toBottomOf="@+id/app_title"
-        app:layout_constraintBottom_toTopOf="@+id/app_rating_bar"
         tools:text="App author" />
 
     <RatingBar
@@ -110,50 +109,49 @@
         android:text="@string/not_available"
         android:textColor="?android:textColorPrimary"
         android:textSize="14sp"
-        app:layout_constraintTop_toTopOf="@+id/app_rating_bar"
         app:layout_constraintBottom_toBottomOf="@+id/app_rating_bar"
-        app:layout_constraintLeft_toRightOf="@+id/app_rating_bar" />
+        app:layout_constraintLeft_toRightOf="@+id/app_rating_bar"
+        app:layout_constraintTop_toTopOf="@+id/app_rating_bar" />
 
-        <TextView
-            android:id="@+id/showMore"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/show_more"
-            android:textAlignment="center"
-            android:gravity="center"
-            android:textSize="16sp"
-            android:textColor="@color/install_button_background"
-            android:textStyle="bold"
-            android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="@id/installButton"
-            app:layout_constraintRight_toRightOf="@id/installButton"
-            app:layout_constraintTop_toBottomOf="@+id/app_title"
-            app:layout_constraintBottom_toTopOf="@+id/app_author"
-            />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/installButton"
-            style="@style/InstallButtonStyle"
-            android:layout_width="120dp"
-            android:layout_height="43dp"
-            android:text="@string/install"
-            android:textAllCaps="false"
-            android:textSize="18sp"
-            app:autoSizeTextType="uniform"
-            app:cornerRadius="4dp"
-            android:visibility="invisible"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/app_title" />
+    <TextView
+        android:id="@+id/showMore"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/show_more"
+        android:textAlignment="center"
+        android:textColor="@color/install_button_background"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/app_author"
+        app:layout_constraintLeft_toLeftOf="@id/installButton"
+        app:layout_constraintRight_toRightOf="@id/installButton"
+        app:layout_constraintTop_toBottomOf="@+id/app_title" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/installButton"
+        style="@style/InstallButtonStyle"
+        android:layout_width="120dp"
+        android:layout_height="43dp"
+        android:text="@string/install"
+        android:textAllCaps="false"
+        android:textSize="18sp"
+        android:visibility="invisible"
+        app:autoSizeTextType="uniform"
+        app:cornerRadius="4dp"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/app_title" />
 
-        <ProgressBar
-            android:id="@+id/progressBarInstall"
-            style="?android:attr/progressBarStyle"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            app:layout_constraintTop_toTopOf="@+id/installButton"
-            app:layout_constraintBottom_toBottomOf="@+id/installButton"
-            app:layout_constraintLeft_toLeftOf="@+id/installButton"
-            app:layout_constraintRight_toRightOf="@+id/installButton"/>
+    <ProgressBar
+        android:id="@+id/progressBarInstall"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        app:layout_constraintBottom_toBottomOf="@+id/installButton"
+        app:layout_constraintLeft_toLeftOf="@+id/installButton"
+        app:layout_constraintRight_toRightOf="@+id/installButton"
+        app:layout_constraintTop_toTopOf="@+id/installButton" />
 
     <LinearLayout
         android:id="@+id/appPrivacyScoreLayout"
@@ -161,8 +159,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:layout_marginEnd="4dp"
-        android:orientation="horizontal"
         android:gravity="center_vertical"
+        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/installButton">
@@ -193,29 +191,30 @@
 
     </LinearLayout>
 
-        <TextView
-            android:id="@+id/sourceTag"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/bg_tag_rounded"
-            android:paddingStart="6dp"
-            android:paddingTop="2dp"
-            android:paddingEnd="6dp"
-            android:paddingBottom="2dp"
-            android:text="Open Source"
-            android:textAllCaps="false"
-            android:textColor="#626262"
-            android:textSize="14sp"
-            app:layout_constraintBottom_toBottomOf="@id/app_rating"
-            app:layout_constraintLeft_toRightOf="@+id/app_rating"
-            app:layout_constraintRight_toLeftOf="@+id/appPrivacyScoreLayout"
-            app:layout_constraintTop_toTopOf="@id/app_rating" />
+    <TextView
+        android:id="@+id/sourceTag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_tag_rounded"
+        android:paddingStart="6dp"
+        android:paddingTop="2dp"
+        android:paddingEnd="6dp"
+        android:paddingBottom="2dp"
+        android:text="Open Source"
+        android:textAllCaps="false"
+        android:textColor="#626262"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@id/app_rating"
+        app:layout_constraintLeft_toRightOf="@+id/app_rating"
+        app:layout_constraintRight_toLeftOf="@+id/appPrivacyScoreLayout"
+        app:layout_constraintTop_toTopOf="@id/app_rating" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginTop="12dp"
+        android:background="@color/colorGrey"
+        app:layout_constraintTop_toBottomOf="@+id/app_rating_bar" />
 
-        <View
-            android:id="@+id/divider"
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="12dp"
-            android:background="@color/colorGrey"
-            app:layout_constraintTop_toBottomOf="@+id/app_rating_bar" />
 </androidx.constraintlayout.widget.ConstraintLayout>
-- 
GitLab