Merge branch '5140-privacy_score_for_large_text' into 'main' (18385eaa) · Commits · e / os / App Lounge

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

+100 −100

Original line number	Diff line number	Diff line
		@@ -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,26 +109,25 @@
		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:gravity="center"
		android:text="@string/show_more"
		android:textAlignment="center"
		android:gravity="center"
		android:textSize="16sp"
		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"
		app:layout_constraintBottom_toTopOf="@+id/app_author"
		/>
		app:layout_constraintTop_toBottomOf="@+id/app_title" />

		<com.google.android.material.button.MaterialButton
		android:id="@+id/installButton"
		@@ -139,9 +137,9 @@
		android:text="@string/install"
		android:textAllCaps="false"
		android:textSize="18sp"
		android:visibility="invisible"
		app:autoSizeTextType="uniform"
		app:cornerRadius="4dp"
		android:visibility="invisible"
		app:layout_constraintRight_toRightOf="parent"
		app:layout_constraintTop_toTopOf="@+id/app_title" />

		@@ -150,10 +148,10 @@
		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"/>
		app:layout_constraintRight_toRightOf="@+id/installButton"
		app:layout_constraintTop_toTopOf="@+id/installButton" />

		<LinearLayout
		android:id="@+id/appPrivacyScoreLayout"
		@@ -161,10 +159,11 @@
		android:layout_height="wrap_content"
		android:layout_gravity="end"
		android:layout_marginEnd="4dp"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		app:layout_constraintTop_toTopOf="@+id/app_rating_bar"
		app:layout_constraintBottom_toBottomOf="@+id/app_rating_bar"
		app:layout_constraintRight_toRightOf="parent">
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintRight_toRightOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/installButton">

		<ImageView
		android:layout_width="16dp"
		@@ -174,7 +173,7 @@
		<TextView
		android:id="@+id/app_privacy_score"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="4dp"
		android:ellipsize="end"
		android:maxLines="1"
		@@ -186,9 +185,9 @@
		<ProgressBar
		android:id="@+id/progressBar"
		style="?android:attr/progressBarStyle"
		android:visibility="gone"
		android:layout_width="16dp"
		android:layout_height="16dp"/>
		android:layout_height="16dp"
		android:visibility="gone" />

		</LinearLayout>

		@@ -217,4 +216,5 @@
		android:layout_marginTop="12dp"
		android:background="@color/colorGrey"
		app:layout_constraintTop_toBottomOf="@+id/app_rating_bar" />

		</androidx.constraintlayout.widget.ConstraintLayout>