Commit cc11c3e9 authored by Seatel's avatar Seatel

enhance home fragment.

parent c0fa8c41
...@@ -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 201907119 versionCode 201907125
versionName "2.3.18" versionName "2.3.20"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.release signingConfig signingConfigs.release
......
...@@ -131,6 +131,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie ...@@ -131,6 +131,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie
// checkLogin() // checkLogin()
stopAutoScroll() stopAutoScroll()
} }
startAutoScroll()
return binding.root return binding.root
} }
...@@ -475,14 +476,10 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie ...@@ -475,14 +476,10 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie
} }
override fun onGetBannersSucceed(bannersList: ArrayList<BannersModel>) { override fun onGetBannersSucceed(bannersList: ArrayList<BannersModel>) {
if (bannersList.isEmpty()) {
println("bannersList is empty")
} else {
binding.run { binding.run {
imageSliderAdapter = ImageSliderAdapter( imageSliderAdapter = ImageSliderAdapter(
bannersList, bannersList,
onActionLink = { onActionLink = {
Toast.makeText(context, "Banner clicked at position: $it", Toast.LENGTH_SHORT).show()
gotoPlayStore(packageName = "com.nacd.stopdrug") gotoPlayStore(packageName = "com.nacd.stopdrug")
} }
) )
...@@ -495,7 +492,6 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie ...@@ -495,7 +492,6 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie
binding.viewpager2.setMarginsInDp(top = 6) binding.viewpager2.setMarginsInDp(top = 6)
} }
} }
}
private fun setupAutoScroll(bannerList : Int){ private fun setupAutoScroll(bannerList : Int){
binding.viewpager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback(){ binding.viewpager2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback(){
......
...@@ -57,7 +57,7 @@ class MainActivity : AppCompatActivity() { ...@@ -57,7 +57,7 @@ class MainActivity : AppCompatActivity() {
// Hide text for the "yes member" item // Hide text for the "yes member" item
val yesMemberMenuItem = navView.menu.findItem(R.id.navigation_yes_member) //val yesMemberMenuItem = navView.menu.findItem(R.id.navigation_yes_member)
val drawable = if (yesMember) { val drawable = if (yesMember) {
...@@ -68,32 +68,32 @@ class MainActivity : AppCompatActivity() { ...@@ -68,32 +68,32 @@ class MainActivity : AppCompatActivity() {
// Apply color tint to the drawable // Apply color tint to the drawable
// drawable?.setTint(ContextCompat.getColor(this, R.color.colorPrimary)) // drawable?.setTint(ContextCompat.getColor(this, R.color.colorPrimary))
yesMemberMenuItem.icon = drawable // yesMemberMenuItem.icon = drawable
navView.findViewById<View>(yesMemberMenuItem.itemId)?.let { itemView -> // navView.findViewById<View>(yesMemberMenuItem.itemId)?.let { itemView ->
//
itemView.findViewById<View>(com.google.android.material.R.id.text)?.visibility = // itemView.findViewById<View>(com.google.android.material.R.id.text)?.visibility =
View.GONE // View.GONE
itemView.findViewById<View>(com.google.android.material.R.id.navigation_bar_item_large_label_view)?.visibility = // itemView.findViewById<View>(com.google.android.material.R.id.navigation_bar_item_large_label_view)?.visibility =
View.GONE // View.GONE
//
//
// Customize the icon size if needed // // Customize the icon size if needed
val iconView = // val iconView =
itemView.findViewById<View>(com.google.android.material.R.id.navigation_bar_item_icon_view) // itemView.findViewById<View>(com.google.android.material.R.id.navigation_bar_item_icon_view)
//
//
val iconViewParams: FrameLayout.LayoutParams = // val iconViewParams: FrameLayout.LayoutParams =
iconView.layoutParams as FrameLayout.LayoutParams // iconView.layoutParams as FrameLayout.LayoutParams
iconViewParams.width = TypedValue.applyDimension( // iconViewParams.width = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 40F, resources.displayMetrics // TypedValue.COMPLEX_UNIT_DIP, 40F, resources.displayMetrics
).toInt() // ).toInt()
iconViewParams.height = TypedValue.applyDimension( // iconViewParams.height = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 40F, resources.displayMetrics // TypedValue.COMPLEX_UNIT_DIP, 40F, resources.displayMetrics
).toInt() // ).toInt()
iconView.layoutParams = iconViewParams // iconView.layoutParams = iconViewParams
} // }
} }
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
android:icon="@drawable/packages_selector" android:icon="@drawable/packages_selector"
android:title="@string/nav_package" /> android:title="@string/nav_package" />
<item <!-- <item-->
android:id="@+id/navigation_yes_member" <!-- android:id="@+id/navigation_yes_member"-->
android:icon="@drawable/yes_member_selector" <!-- android:icon="@drawable/yes_member_selector"-->
android:title="" /> <!-- android:title="" />-->
<item <item
android:id="@+id/navigation_usage" android:id="@+id/navigation_usage"
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
android:name="com.seatel.mobilehall.ui.profile.fragment.ProfilesFragment" android:name="com.seatel.mobilehall.ui.profile.fragment.ProfilesFragment"
android:label="@string/nav_profile" android:label="@string/nav_profile"
tools:layout="@layout/fragment_profile" /> tools:layout="@layout/fragment_profile" />
<fragment <!-- <fragment-->
android:id="@+id/navigation_yes_member" <!-- android:id="@+id/navigation_yes_member"-->
android:name="com.seatel.mobilehall.ui.yes_member.fragment.YesMemberFragment" <!-- android:name="com.seatel.mobilehall.ui.yes_member.fragment.YesMemberFragment"-->
android:label="fragment_yes_member" <!-- android:label="fragment_yes_member"-->
tools:layout="@layout/fragment_yes_member" /> <!-- tools:layout="@layout/fragment_yes_member" />-->
</navigation> </navigation>
\ No newline at end of file
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