Merge branch '5139-new_layout_app_item' into 'main' (63617ee6) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,6 @@ class ApplicationListRVAdapter(
		private fun ApplicationListItemBinding.updateRating(searchApp: FusedApp) {
		if (searchApp.ratings.usageQualityScore != -1.0) {
		appRating.text = searchApp.ratings.usageQualityScore.toString()
		appRatingBar.rating = searchApp.ratings.usageQualityScore.toFloat()
		}
		}

		@@ -456,6 +455,7 @@ class ApplicationListRVAdapter(
		searchApp.isFree -> {
		materialButton.enableInstallButton()
		materialButton.text = materialButton.context.getString(R.string.install)
		materialButton.strokeColor = ContextCompat.getColorStateList(holder.itemView.context, R.color.light_grey)
		applicationListItemBinding.progressBarInstall.visibility = View.GONE
		}
		else -> {

app/src/main/res/drawable/ic_star.xml

+7 −25

Original line number	Diff line number	Diff line
		<!--
		~ Apps Quickly and easily install Android apps onto your device!
		~ Copyright (C) 2021 E FOUNDATION
		~
		~ This program is free software: you can redistribute it and/or modify
		~ it under the terms of the GNU General Public License as published by
		~ the Free Software Foundation, either version 3 of the License, or
		~ (at your option) any later version.
		~
		~ This program is distributed in the hope that it will be useful,
		~ but WITHOUT ANY WARRANTY; without even the implied warranty of
		~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		~ GNU General Public License for more details.
		~
		~ You should have received a copy of the GNU General Public License
		~ along with this program. If not, see <https://www.gnu.org/licenses/>.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:tint="?android:attr/colorControlNormal">
		android:width="14dp"
		android:height="13dp"
		android:viewportWidth="14"
		android:viewportHeight="13">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
		android:pathData="M7,10.513L11.12,13L10.027,8.313L13.667,5.16L8.873,4.753L7,0.333L5.127,4.753L0.333,5.16L3.973,8.313L2.88,13L7,10.513Z"
		android:fillColor="#FFC300"
		android:fillType="evenOdd"/>
		</vector>

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

+33 −44

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		android:id="@+id/applicationList"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_margin="5dp"
		android:layout_margin="10dp"
		android:background="?android:attr/selectableItemBackground"
		android:clickable="true"
		android:focusable="true">
		@@ -41,8 +41,8 @@

		<androidx.cardview.widget.CardView
		android:id="@+id/app_icon_card"
		android:layout_width="75dp"
		android:layout_height="75dp"
		android:layout_width="65dp"
		android:layout_height="65dp"
		app:cardCornerRadius="12dp"
		app:cardElevation="0dp"
		app:layout_constraintLeft_toLeftOf="parent"
		@@ -63,11 +63,12 @@
		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:textSize="13sp"
		android:singleLine="true"
		android:ellipsize="end"
		app:layout_constraintLeft_toRightOf="@+id/app_icon_card"
		app:layout_constraintRight_toLeftOf="@+id/installButton"
		app:layout_constraintTop_toTopOf="@+id/app_icon_card"
		tools:text="Google Chrome - Fast and Secured" />

		@@ -78,25 +79,22 @@
		android:ellipsize="end"
		android:maxLines="1"
		android:textColor="?android:textColorPrimary"
		android:textSize="14sp"
		app:layout_constraintBottom_toTopOf="@+id/app_rating_bar"
		android:alpha=".6"
		android:textSize="13sp"
		app:layout_constraintTop_toTopOf="@+id/app_icon_card"
		app:layout_constraintLeft_toLeftOf="@+id/app_title"
		app:layout_constraintRight_toLeftOf="@+id/installButton"
		app:layout_constraintTop_toBottomOf="@+id/app_title"
		app:layout_constraintBottom_toBottomOf="@+id/app_icon_card"
		tools:text="App author" />

		<RatingBar
		android:id="@+id/app_rating_bar"
		style="?android:attr/ratingBarStyleSmall"
		<ImageView
		android:id="@+id/icon_star"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:isIndicator="true"
		android:numStars="5"
		android:progressBackgroundTint="@color/colorAccent"
		android:progressTint="@color/colorAccent"
		android:stepSize="0.1"
		app:layout_constraintTop_toBottomOf="@+id/installButton"
		app:layout_constraintLeft_toLeftOf="@+id/app_title" />
		android:src="@drawable/ic_star"
		android:layout_marginBottom="1dp"
		app:layout_constraintBottom_toBottomOf="@+id/app_icon_card"
		app:layout_constraintLeft_toLeftOf="@+id/app_author"/>

		<TextView
		android:id="@+id/app_rating"
		@@ -107,10 +105,10 @@
		android:maxLines="1"
		android:text="@string/not_available"
		android:textColor="?android:textColorPrimary"
		android:textSize="14sp"
		app:layout_constraintBottom_toBottomOf="@+id/app_rating_bar"
		app:layout_constraintLeft_toRightOf="@+id/app_rating_bar"
		app:layout_constraintTop_toTopOf="@+id/app_rating_bar" />
		android:textSize="13sp"
		app:layout_constraintTop_toTopOf="@+id/icon_star"
		app:layout_constraintBottom_toBottomOf="@+id/icon_star"
		app:layout_constraintLeft_toRightOf="@+id/icon_star" />

		<TextView
		android:id="@+id/showMore"
		@@ -131,16 +129,15 @@
		<com.google.android.material.button.MaterialButton
		android:id="@+id/installButton"
		style="@style/InstallButtonStyle"
		android:layout_width="120dp"
		android:layout_height="43dp"
		android:layout_width="80dp"
		android:layout_height="40dp"
		android:text="@string/install"
		android:textAllCaps="false"
		android:textSize="18sp"
		android:textAllCaps="true"
		android:visibility="invisible"
		app:autoSizeTextType="uniform"
		android:textSize="13sp"
		app:cornerRadius="4dp"
		app:layout_constraintRight_toRightOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/app_title" />
		app:layout_constraintTop_toTopOf="@+id/app_title" />

		<ProgressBar
		android:id="@+id/progressBarInstall"
		@@ -160,13 +157,13 @@
		android:layout_marginEnd="4dp"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintBottom_toBottomOf="@+id/sourceTag"
		app:layout_constraintRight_toRightOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/installButton">
		app:layout_constraintTop_toTopOf="@+id/sourceTag">

		<ImageView
		android:layout_width="16dp"
		android:layout_height="16dp"
		android:layout_width="14dp"
		android:layout_height="14dp"
		android:src="@drawable/ic_lock" />

		<TextView
		@@ -178,7 +175,7 @@
		android:maxLines="1"
		android:text="@string/not_available"
		android:textColor="?android:textColorPrimary"
		android:textSize="14sp"
		android:textSize="13sp"
		android:visibility="gone" />

		<ProgressBar
		@@ -202,18 +199,10 @@
		android:text="Open Source"
		android:textAllCaps="false"
		android:textColor="#626262"
		android:textSize="14sp"
		android:textSize="13sp"
		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" />

		</androidx.constraintlayout.widget.ConstraintLayout>
		No newline at end of file