Commit 3a19c097 authored by Seatel's avatar Seatel

enhancement logic on yes-member fragment.

parent 1d455b0a
...@@ -27,8 +27,8 @@ android { ...@@ -27,8 +27,8 @@ android {
applicationId "com.seatel.mobilehall" applicationId "com.seatel.mobilehall"
minSdk 23 minSdk 23
targetSdk 34 targetSdk 34
versionCode 201907125 versionCode 201907130
versionName "2.3.20" versionName "2.3.21"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.release signingConfig signingConfigs.release
......
...@@ -88,12 +88,14 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View { ...@@ -88,12 +88,14 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View {
LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
adapter = YesMemberAdapter(requireContext(), topPartnerList) adapter = YesMemberAdapter(requireContext(), topPartnerList)
binding.recyclerPartner.adapter = adapter binding.recyclerPartner.adapter = adapter
// if (topPartnerList.isNotEmpty()) binding.tvPartner.visibility = View.VISIBLE else binding.tvPartner.visibility = View.GONE
} }
override fun responsePartnerCategorySucceed(partnerCategory: ArrayList<PartnerCategoryModelItem>) { override fun responsePartnerCategorySucceed(partnerCategory: ArrayList<PartnerCategoryModelItem>) {
binding.RecyclerPartnerCategory.layoutManager = GridLayoutManager(context, 2) binding.RecyclerPartnerCategory.layoutManager = GridLayoutManager(context, 2)
partnerCategoryAdapter = MainPartnerCategoryAdapter(requireContext(), partnerCategory) partnerCategoryAdapter = MainPartnerCategoryAdapter(requireContext(), partnerCategory)
binding.RecyclerPartnerCategory.adapter = partnerCategoryAdapter binding.RecyclerPartnerCategory.adapter = partnerCategoryAdapter
// if (partnerCategory.isNotEmpty()) binding.tvPartnerCategory.visibility = View.VISIBLE else binding.tvPartnerCategory.visibility = View.GONE
} }
...@@ -133,16 +135,26 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View { ...@@ -133,16 +135,26 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View {
CoinActivity.launch(requireContext(), imgCoin!!, coinEarn!!, coinDescription!!) CoinActivity.launch(requireContext(), imgCoin!!, coinEarn!!, coinDescription!!)
} }
if (mainModel.coinHidden) binding.frameYesCoins.visibility = if (mainModel.coinHidden) {
View.GONE else binding.frameYesCoins.visibility = View.VISIBLE binding.frameYesCoins.visibility = View.GONE
binding.tvPartnerCategory.visibility = View.GONE
} else {
binding.frameYesCoins.visibility = View.VISIBLE
binding.tvPartnerCategory.visibility = View.VISIBLE
}
if (mainModel.partnerHidden) { if (mainModel.partnerHidden) {
binding.recyclerPartner.visibility = View.GONE
binding.tvPartner.visibility = View.GONE
binding.frameYesPartner.visibility = View.GONE binding.frameYesPartner.visibility = View.GONE
binding.qrCodeContainer.visibility = View.GONE binding.qrCodeContainer.visibility = View.GONE
} else { } else {
binding.recyclerPartner.visibility = View.GONE
binding.tvPartner.visibility = View.VISIBLE
binding.frameYesPartner.visibility = View.VISIBLE binding.frameYesPartner.visibility = View.VISIBLE
binding.qrCodeContainer.visibility = View.VISIBLE binding.qrCodeContainer.visibility = View.VISIBLE
} }
println("coin card${mainModel.coinHidden } partner card${mainModel.partnerHidden}") println("coin card is ${mainModel.coinHidden } partner card is ${mainModel.partnerHidden}")
} }
override fun responseYesMemberMainFail(error: VolleyError) { override fun responseYesMemberMainFail(error: VolleyError) {
......
...@@ -121,6 +121,8 @@ ...@@ -121,6 +121,8 @@
android:background="@drawable/bg_yes_member" android:background="@drawable/bg_yes_member"
android:backgroundTint="@android:color/darker_gray" android:backgroundTint="@android:color/darker_gray"
android:gravity="center_vertical" android:gravity="center_vertical"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
...@@ -197,6 +199,8 @@ ...@@ -197,6 +199,8 @@
android:background="@drawable/bg_yes_member" android:background="@drawable/bg_yes_member"
android:backgroundTint="@android:color/darker_gray" android:backgroundTint="@android:color/darker_gray"
android:gravity="center_vertical" android:gravity="center_vertical"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/frame_yes_coins"> app:layout_constraintTop_toBottomOf="@+id/frame_yes_coins">
...@@ -275,6 +279,7 @@ ...@@ -275,6 +279,7 @@
android:text="Top yes Partner" android:text="Top yes Partner"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="@dimen/extra_large_text_size" android:textSize="@dimen/extra_large_text_size"
android:visibility="gone"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout2" /> app:layout_constraintTop_toBottomOf="@+id/constraintLayout2" />
...@@ -297,6 +302,8 @@ ...@@ -297,6 +302,8 @@
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="@dimen/extra_large_text_size" android:textSize="@dimen/extra_large_text_size"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/recyclerPartner" /> app:layout_constraintTop_toBottomOf="@+id/recyclerPartner" />
...@@ -317,6 +324,8 @@ ...@@ -317,6 +324,8 @@
android:id="@+id/qrCodeContainer" android:id="@+id/qrCodeContainer"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="35dp" android:layout_height="35dp"
android:visibility="gone"
tools:visibility="visible"
android:layout_marginEnd="@dimen/margin_2x_size" android:layout_marginEnd="@dimen/margin_2x_size"
android:layout_marginBottom="@dimen/margin_2x_size" android:layout_marginBottom="@dimen/margin_2x_size"
android:background="@drawable/bg_floating_btn_scan" android:background="@drawable/bg_floating_btn_scan"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment