From 3be0812dd0d95442b74cae5ed2180eb277da3d09 Mon Sep 17 00:00:00 2001 From: Rahul Patel Date: Sun, 21 Jul 2024 15:52:24 +0530 Subject: [PATCH] Add headerSubtitle to ActionHeaderLayout --- .../view/custom/layouts/ActionHeaderLayout.kt | 17 ++++++++++++++--- .../store/view/ui/details/AppDetailsFragment.kt | 2 +- .../res/layout/layout_details_permissions.xml | 12 ++---------- .../main/res/layout/layout_details_privacy.xml | 15 ++------------- app/src/main/res/layout/view_action_header.xml | 16 ++++++++++++++-- app/src/main/res/values/attrs.xml | 1 + 6 files changed, 34 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/custom/layouts/ActionHeaderLayout.kt b/app/src/main/java/com/aurora/store/view/custom/layouts/ActionHeaderLayout.kt index 76af65422..eabd6f2ad 100644 --- a/app/src/main/java/com/aurora/store/view/custom/layouts/ActionHeaderLayout.kt +++ b/app/src/main/java/com/aurora/store/view/custom/layouts/ActionHeaderLayout.kt @@ -51,19 +51,30 @@ class ActionHeaderLayout : RelativeLayout { binding = ViewActionHeaderBinding.bind(view) val typedArray = context.obtainStyledAttributes(attrs, R.styleable.ActionHeaderLayout) - val textPrimary = typedArray.getString(R.styleable.ActionHeaderLayout_headerTitle) + val textTitle = typedArray.getString(R.styleable.ActionHeaderLayout_headerTitle) + val textSubtitle = typedArray.getString(R.styleable.ActionHeaderLayout_headerSubtitle) typedArray.recycle() - textPrimary?.let { + textTitle?.let { binding.txtTitle.text = it } + + textSubtitle?.let { + binding.txtSubtitle.visibility = View.VISIBLE + binding.txtSubtitle.text = it + } } - fun setHeader(header: String?) { + fun setTitle(header: String?) { binding.txtTitle.text = header } + fun setSubTitle(subHeader: String?) { + binding.txtSubtitle.visibility = View.VISIBLE + binding.txtSubtitle.text = subHeader + } + fun addClickListener(onclickListener: OnClickListener?) { binding.imgAction.visibility = View.VISIBLE binding.imgAction.setOnClickListener(onclickListener) diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt index 32a8883bc..0b8c25468 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt @@ -952,7 +952,7 @@ class AppDetailsFragment : BaseFragment() { ) } } - txtPermissionCount.text = ("${app.permissions.size} permissions") + headerPermission.setSubTitle(("${app.permissions.size} permissions")) } } diff --git a/app/src/main/res/layout/layout_details_permissions.xml b/app/src/main/res/layout/layout_details_permissions.xml index 4af8d9ff3..46c359713 100644 --- a/app/src/main/res/layout/layout_details_permissions.xml +++ b/app/src/main/res/layout/layout_details_permissions.xml @@ -34,14 +34,6 @@ android:id="@+id/header_permission" android:layout_width="match_parent" android:layout_height="wrap_content" - app:headerTitle="@string/details_permission" /> - - + app:headerTitle="@string/details_permission" + tools:headerSubtitle="36 permissions" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_details_privacy.xml b/app/src/main/res/layout/layout_details_privacy.xml index bf25d907d..ff0f87088 100644 --- a/app/src/main/res/layout/layout_details_privacy.xml +++ b/app/src/main/res/layout/layout_details_privacy.xml @@ -34,23 +34,14 @@ android:id="@+id/header_privacy" android:layout_width="match_parent" android:layout_height="wrap_content" + app:headerSubtitle="@string/exodus_powered" app:headerTitle="@string/details_privacy" /> - - @@ -60,8 +51,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/txt_status" - android:layout_alignStart="@id/txt_subtitle" - android:layout_alignEnd="@id/txt_subtitle" android:layout_gravity="center_vertical" android:text="@string/action_request_analysis" app:cornerRadius="@dimen/margin_small" /> diff --git a/app/src/main/res/layout/view_action_header.xml b/app/src/main/res/layout/view_action_header.xml index 754093500..d1d48cbec 100644 --- a/app/src/main/res/layout/view_action_header.xml +++ b/app/src/main/res/layout/view_action_header.xml @@ -31,11 +31,23 @@ style="@style/AuroraTextStyle.Subtitle.Alt" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerInParent="true" android:layout_toStartOf="@id/img_action" android:ellipsize="end" android:maxLines="1" - tools:text="Header" /> + tools:text="Title" /> + + +