From 4fee34b66107251d86d75f38b35028a6eb0d737a Mon Sep 17 00:00:00 2001 From: X1nto Date: Sat, 17 Apr 2021 13:28:36 +0400 Subject: [PATCH] fixed buttontag getter --- .../adapter/ExpandableAppListAdapter.kt | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt b/app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt index 5ce4240d..a169648f 100644 --- a/app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt +++ b/app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt @@ -43,16 +43,6 @@ class ExpandableAppListAdapter( appTitle.text = dataModel?.appName appDescription.text = dataModel?.appDescription dataModel?.appIcon?.let { appIcon.setImageResource(it) } - appDownload.apply { - val buttonTag = dataModel?.buttonTag?.value - setOnClickListener { viewModel.openInstallDialog(buttonTag, apps[position]) } - contentDescription = activity.getString( - if (buttonTag == ButtonTag.UPDATE) - R.string.accessibility_update - else - R.string.accessibility_download - ) - } appClickableLayout.setOnClickListener { if (isAnimationRunning) return@setOnClickListener val rootHeight = root.measuredHeight @@ -85,6 +75,17 @@ class ExpandableAppListAdapter( changelog = dataModel?.changelog?.value ).show(activity.supportFragmentManager, "info") } + dataModel?.buttonTag?.observe(activity) { buttonTag -> + appDownload.apply { + setOnClickListener { viewModel.openInstallDialog(buttonTag, apps[position]) } + contentDescription = activity.getString( + if (buttonTag == ButtonTag.UPDATE) + R.string.accessibility_update + else + R.string.accessibility_download + ) + } + } dataModel?.isAppInstalled?.observe(activity) { appUninstall.isVisible = it appLaunch.isVisible = it