From 6ef16a840d12d923b739faac83de5f38dd38bb36 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 18 May 2023 11:10:24 +0530 Subject: [PATCH] Drop dependency upon expansionpanel library Deprecated Signed-off-by: Aayush Gupta --- app/build.gradle | 3 -- .../view/epoxy/views/app/AppUpdateView.kt | 14 ++++--- app/src/main/res/drawable/ic_arrow_down.xml | 10 +++++ app/src/main/res/drawable/ic_arrow_up.xml | 10 +++++ app/src/main/res/layout/view_app_update.xml | 38 +++++++------------ 5 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 app/src/main/res/drawable/ic_arrow_down.xml create mode 100644 app/src/main/res/drawable/ic_arrow_up.xml diff --git a/app/build.gradle b/app/build.gradle index 4d17c2388..3f7dd6240 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -148,9 +148,6 @@ dependencies { implementation "androidx.navigation:navigation-fragment-ktx:${versions.navigation}" implementation "androidx.navigation:navigation-ui-ktx:${versions.navigation}" - //UI Addons - implementation "com.github.florent37:expansionpanel:1.2.4" - //Easy Permission implementation "com.github.quickpermissions:quickpermissions-kotlin:0.4.1" diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt index e2f973c1d..725a55bf0 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt @@ -21,8 +21,10 @@ package com.aurora.store.view.epoxy.views.app import android.content.Context import android.util.AttributeSet +import android.view.View import android.widget.RelativeLayout import androidx.core.text.HtmlCompat +import androidx.core.view.isVisible import com.airbnb.epoxy.CallbackProp import com.airbnb.epoxy.ModelProp import com.airbnb.epoxy.ModelView @@ -92,12 +94,12 @@ class AppUpdateView : RelativeLayout { context.getString(R.string.details_changelog_unavailable) B.headerIndicator.setOnClickListener { - B.expansionLayout.let { - if (it.isExpanded) { - it.collapse(true) - } else { - it.expand(true) - } + if (B.txtChangelog.isVisible) { + B.headerIndicator.load(R.drawable.ic_arrow_down) + B.txtChangelog.visibility = View.GONE + } else { + B.headerIndicator.load(R.drawable.ic_arrow_up) + B.txtChangelog.visibility = View.VISIBLE } } } diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml new file mode 100644 index 000000000..68fd4058e --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_down.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml new file mode 100644 index 000000000..ef2e9825c --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_up.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/view_app_update.xml b/app/src/main/res/layout/view_app_update.xml index 595273b6d..bb1fbd908 100644 --- a/app/src/main/res/layout/view_app_update.xml +++ b/app/src/main/res/layout/view_app_update.xml @@ -29,13 +29,10 @@ android:paddingStart="@dimen/padding_normal" android:paddingEnd="@dimen/padding_small"> - + android:layout_height="wrap_content"> - + - - - - + android:layout_marginTop="@dimen/margin_small" + android:background="@drawable/bg_changelog" + android:ellipsize="end" + android:minHeight="?actionBarSize" + android:singleLine="false" + android:textAppearance="@style/TextAppearance.Aurora.Line2" + android:textIsSelectable="true" + android:visibility="gone" /> \ No newline at end of file