avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-28 05:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update: Refine app sheet

Browse Source
This commit is contained in:
machiav3lli 2022-02-28 01:38:45 +01:00
parent ad349831e5
commit 96686738fa
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/com/looker/droidify/ui/adapters/AppDetailAdapter.kt
View File

@ -337,7 +337,6 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
val status = itemView.findViewById<MaterialTextView>(R.id.status)!! val status = itemView.findViewById<MaterialTextView>(R.id.status)!!
val progress = itemView.findViewById<LinearProgressIndicator>(R.id.progress)!! val progress = itemView.findViewById<LinearProgressIndicator>(R.id.progress)!!
val progressIcon: Drawable
val defaultIcon: Drawable val defaultIcon: Drawable
val actionTintNormal = action.context.getColorFromAttr(R.attr.colorPrimary) val actionTintNormal = action.context.getColorFromAttr(R.attr.colorPrimary)
@ -347,9 +346,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
init { init {
action.height = itemView.resources.sizeScaled(48) action.height = itemView.resources.sizeScaled(48)
val (progressIcon, defaultIcon) = Utils.getDefaultApplicationIcons(icon.context) this.defaultIcon = Utils.getDefaultApplicationIcon(icon.context)
this.progressIcon = progressIcon
this.defaultIcon = defaultIcon
} }
val targetBlock = itemView.findViewById<LinearLayoutCompat>(R.id.sdk_block)!! val targetBlock = itemView.findViewById<LinearLayoutCompat>(R.id.sdk_block)!!
@ -1078,7 +1075,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) :
item.product.icon, item.product.metadataIcon, item.repository item.product.icon, item.product.metadataIcon, item.repository
) )
) { ) {
placeholder(holder.progressIcon) placeholder(holder.defaultIcon)
error(holder.defaultIcon) error(holder.defaultIcon)
} }
holder.name.text = item.product.name holder.name.text = item.product.name

15
src/main/kotlin/com/looker/droidify/utility/Utils.kt
View File

@ -25,7 +25,6 @@ import com.looker.droidify.utility.extension.android.versionCodeCompat
import com.looker.droidify.utility.extension.json.Json import com.looker.droidify.utility.extension.json.Json
import com.looker.droidify.utility.extension.json.parseDictionary import com.looker.droidify.utility.extension.json.parseDictionary
import com.looker.droidify.utility.extension.json.writeDictionary import com.looker.droidify.utility.extension.json.writeDictionary
import com.looker.droidify.utility.extension.resources.getColorFromAttr
import com.looker.droidify.utility.extension.resources.getDrawableCompat import com.looker.droidify.utility.extension.resources.getDrawableCompat
import com.looker.droidify.utility.extension.text.hex import com.looker.droidify.utility.extension.text.hex
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
@ -37,23 +36,13 @@ import java.security.cert.CertificateEncodingException
import java.util.* import java.util.*
object Utils { object Utils {
private fun createDefaultApplicationIcon(context: Context, tintAttrResId: Int): Drawable {
return context.getDrawableCompat(R.drawable.ic_application_default).mutate()
.apply { setTintList(context.getColorFromAttr(tintAttrResId)) }
}
fun PackageInfo.toInstalledItem(): Installed { fun PackageInfo.toInstalledItem(): Installed {
val signatureString = singleSignature?.let(Utils::calculateHash).orEmpty() val signatureString = singleSignature?.let(Utils::calculateHash).orEmpty()
return Installed(packageName, versionName.orEmpty(), versionCodeCompat, signatureString) return Installed(packageName, versionName.orEmpty(), versionCodeCompat, signatureString)
} }
fun getDefaultApplicationIcons(context: Context): Pair<Drawable, Drawable> { fun getDefaultApplicationIcon(context: Context): Drawable =
val progressIcon: Drawable = context.getDrawableCompat(R.drawable.ic_placeholder)
createDefaultApplicationIcon(context, android.R.attr.textColorSecondary)
val defaultIcon: Drawable =
createDefaultApplicationIcon(context, R.attr.colorAccent)
return Pair(progressIcon, defaultIcon)
}
fun getToolbarIcon(context: Context, resId: Int): Drawable { fun getToolbarIcon(context: Context, resId: Int): Drawable {
return context.getDrawableCompat(resId).mutate() return context.getDrawableCompat(resId).mutate()

10
src/main/res/layout/item_app_info_x.xml
View File

@ -18,7 +18,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp" android:layout_marginHorizontal="12dp"
android:layout_marginVertical="4dp" android:layout_marginVertical="4dp"
android:background="@drawable/background_border"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@id/status_layout" app:layout_constraintBottom_toTopOf="@id/status_layout"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -28,14 +27,14 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal">
android:padding="8dp">
<com.google.android.material.imageview.ShapeableImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="64dp" android:layout_width="72dp"
android:layout_height="64dp" android:layout_height="72dp"
app:shapeAppearanceOverlay="@style/Shape.Medium" app:shapeAppearanceOverlay="@style/Shape.Medium"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
@ -68,6 +67,7 @@
android:id="@+id/release_info" android:id="@+id/release_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_border"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"