varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

NTP-46725 | Owais | margin fix (#15381)

Browse Source 
Co-authored-by: shrihari-raju_navi <shrihari.raju@navi.com>
This commit is contained in:
Sayed Owais Ali
2025-03-13 18:12:23 +05:30
committed by GitHub
parent 396aaf40fe
commit 02f54a5217
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt
View File

@@ -332,28 +332,24 @@ class FundListingFragmentV2 : AmcBaseFragment(), WidgetCallback {
setHeaderWidgetData(
viewModel.getHeaderWidget(selectedItems, filteredList.isNullOrEmpty().orFalse())
)
}
if (selectedItems.isNotNullAndNotEmpty()) {
if (viewModel.isQuickFilterEnabled) {
viewModel.quickFilters?.let {
binding.filter.quickFilterTitle.setSpannableString(it.title)
it.suggestedItems?.let { it1 ->
addQuickFilterChips(it1, isQuickFilter = true)
}
}
} else {
selectedItems?.let { addFilterDataChips(it, isQuickFilter = false) }
binding.filter.quickFilterTitle.visibility = View.GONE
}
if (viewModel.isEligibleForThemeChange == true) {
binding.filter.filterTitle.visibility = View.GONE
}
selectedItems?.let { addFilterDataChips(it, isQuickFilter = false) }
binding.filter.quickFilterTitle.visibility = View.GONE
} else {
viewModel.isQuickFilterEnabled = true
viewModel.quickFilters?.let {
binding.filter.quickFilterTitle.setSpannableString(it.title)
it.suggestedItems?.let { quickFilters ->
addQuickFilterChips(quickFilters, isQuickFilter = true)
selectedItems?.let { items ->
if (items.isEmpty()) {
viewModel.isQuickFilterEnabled = true
}
if (viewModel.isQuickFilterEnabled) {
viewModel.quickFilters?.let {
binding.filter.filterTitle.visibility = View.GONE
binding.filter.quickFilterTitle.setSpannableString(it.title)
it.suggestedItems?.let { quickFilters ->
addQuickFilterChips(quickFilters, isQuickFilter = true)
}
}
} else {
addFilterDataChips(items, isQuickFilter = false)
binding.filter.quickFilterTitle.visibility = View.GONE
}
}
}
@@ -720,7 +716,6 @@ class FundListingFragmentV2 : AmcBaseFragment(), WidgetCallback {
}
private fun setFilterItemList(list: List<Identifier>) {
viewModel.isQuickFilterEnabled = false
viewModel.setSelectedFilterItems(list, screenName)
}

4
android/navi-amc/src/main/res/layout/amc_filter.xml
View File

@@ -20,9 +20,10 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/search_field"
android:layout_width="@dimen/_328dp"
android:layout_width="@dimen/_0dp"
android:layout_height="@dimen/_40dp"
android:layout_marginStart="@dimen/_16dp"
android:layout_marginEnd="@dimen/_8dp"
android:paddingVertical="@dimen/_8dp"
android:background="@drawable/bg_border_grey_4"
android:paddingHorizontal="@dimen/layout_dp_16"
@@ -30,6 +31,7 @@
android:focusable="true"
android:focusableInTouchMode="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/filter_touch"
app:layout_constraintTop_toTopOf="@id/filter_touch"
app:layout_constraintBottom_toBottomOf="@id/filter_touch">

2
android/navi-amc/src/main/res/layout/overview_icon_layout.xml
View File

@@ -23,7 +23,7 @@
android:layout_width="@dimen/_0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:ellipsize="end"
android:maxLines="1"
app:layout_constraintStart_toStartOf="parent"

3
android/navi-amc/src/main/res/layout/portfolio_screen.xml
View File

@@ -82,7 +82,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_24"
android:layout_marginEnd="@dimen/_16dp"
android:layout_marginStart="@dimen/_16dp"
android:scrollbars="none"
@@ -106,7 +105,7 @@
android:id="@+id/investments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_9"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginHorizontal="@dimen/dp_11"
android:layout_marginBottom="@dimen/dp_48"
android:orientation="vertical"