avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 19:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve: Icon logic in App Detail Page (Again)

Browse Source
This commit is contained in:
LooKeR 2021-11-16 13:30:14 +05:30
parent dfee171812
commit c842b4574a
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/kotlin/com/looker/droidify/screen/ProductAdapter.kt
View File

@ -22,6 +22,8 @@ import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.appcompat.widget.LinearLayoutCompat
import androidx.core.content.res.ResourcesCompat
import androidx.core.net.toUri
@ -73,14 +75,14 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int)
fun onUriClick(uri: Uri, shouldConfirm: Boolean): Boolean
}
enum class Action(val titleResId: Int) {
INSTALL(R.string.install),
UPDATE(R.string.update),
LAUNCH(R.string.launch),
DETAILS(R.string.details),
UNINSTALL(R.string.uninstall),
CANCEL(R.string.cancel),
SHARE(R.string.share)
enum class Action(@StringRes val titleResId: Int, @DrawableRes val iconResId: Int) {
INSTALL(R.string.install, R.drawable.ic_download),
UPDATE(R.string.update, R.drawable.ic_download),
LAUNCH(R.string.launch, R.drawable.ic_launch),
DETAILS(R.string.details, R.drawable.ic_tune),
UNINSTALL(R.string.uninstall, R.drawable.ic_delete),
CANCEL(R.string.cancel, R.drawable.ic_cancel),
SHARE(R.string.share, R.drawable.ic_share)
}
sealed class Status {
@ -1065,6 +1067,7 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int)
holder.action.apply {
visibility = if (action == null) View.GONE else View.VISIBLE
if (action != null) {
icon = context.getDrawable(action.iconResId)
setText(action.titleResId)
setTextColor(
if (action == Action.CANCEL) holder.actionTintOnCancel
@ -1075,13 +1078,6 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int)
backgroundTintList = if (action == Action.CANCEL)
holder.actionTintCancel else holder.actionTintNormal
}
icon =
when (action) {
Action.CANCEL -> context.getDrawable(R.drawable.ic_cancel)
Action.LAUNCH -> context.getDrawable(R.drawable.ic_launch)
Action.DETAILS -> context.getDrawable(R.drawable.ic_tune)
else -> context.getDrawable(R.drawable.ic_download)
}
iconTint = if (action == Action.CANCEL) holder.actionTintOnCancel
else holder.actionTintOnNormal
}

2
src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt
View File

@ -94,7 +94,7 @@ class ProductFragment() : ScreenFragment(), ProductAdapter.Callbacks {
toolbar.menu.apply {
for (action in Action.values()) {
add(0, action.id, 0, action.adapterAction.titleResId)
.setIcon(Utils.getToolbarIcon(toolbar.context, action.adapterAction.iconsId))
.setIcon(Utils.getToolbarIcon(toolbar.context, action.adapterAction.iconResId))
.setVisible(false)
.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS)
.setOnMenuItemClickListener {