Commit 61191e18 authored by Seatel's avatar Seatel

visible yes member (menu-bottom-bar).

re-design scan screen.
change the color of button scan from black to primary.
parent 2bfe805a
...@@ -617,8 +617,7 @@ ...@@ -617,8 +617,7 @@
<option name="autoReloadType" value="NONE" /> <option name="autoReloadType" value="NONE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="b947e2f9-b70e-404d-b6f9-40fd3f83c1e2" name="Changes" comment="enhance home fragment."> <list default="true" id="b947e2f9-b70e-404d-b6f9-40fd3f83c1e2" name="Changes" comment="verify latest code.">
<change afterPath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/checksums.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/checksums.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/md5-checksums.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/md5-checksums.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/sha1-checksums.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/sha1-checksums.bin" afterDir="false" />
...@@ -629,17 +628,17 @@ ...@@ -629,17 +628,17 @@
<change beforePath="$PROJECT_DIR$/.gradle/8.9/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/fileHashes/resourceHashesCache.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/8.9/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/adapter/ImageSliderAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/seatel/mobilehall/ui/home/adapter/ImageSliderAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_outlet_scan_qr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_outlet_scan_qr.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_yes_member.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_yes_member.xml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="ChangesViewManager">
<option name="groupingKeys">
<option value="directory" />
</option>
</component>
<component name="ClangdSettings"> <component name="ClangdSettings">
<option name="formatViaClangd" value="false" /> <option name="formatViaClangd" value="false" />
</component> </component>
...@@ -958,7 +957,15 @@ ...@@ -958,7 +957,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1752138008359</updated> <updated>1752138008359</updated>
</task> </task>
<option name="localTasksCounter" value="7" /> <task id="LOCAL-00007" summary="verify latest code.">
<option name="closed" value="true" />
<created>1752629247547</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1752629247547</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
...@@ -978,19 +985,20 @@ ...@@ -978,19 +985,20 @@
<MESSAGE value="hide slide show" /> <MESSAGE value="hide slide show" />
<MESSAGE value="using viewpager2 instead auto image slider" /> <MESSAGE value="using viewpager2 instead auto image slider" />
<MESSAGE value="enhance home fragment." /> <MESSAGE value="enhance home fragment." />
<option name="LAST_COMMIT_MESSAGE" value="enhance home fragment." /> <MESSAGE value="verify latest code." />
<option name="LAST_COMMIT_MESSAGE" value="verify latest code." />
</component> </component>
<component name="play_dynamic_filters_status"> <component name="play_dynamic_filters_status">
<option name="appIdToCheckInfo"> <option name="appIdToCheckInfo">
<map> <map>
<entry key="com.seatel.mobilehall"> <entry key="com.seatel.mobilehall">
<value> <value>
<CheckInfo lastCheckTimestamp="1752455782122" /> <CheckInfo lastCheckTimestamp="1752629109224" />
</value> </value>
</entry> </entry>
<entry key="com.seatel.mobilehall.test"> <entry key="com.seatel.mobilehall.test">
<value> <value>
<CheckInfo lastCheckTimestamp="1752455782150" /> <CheckInfo lastCheckTimestamp="1752629109224" />
</value> </value>
</entry> </entry>
</map> </map>
......
...@@ -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) {
...@@ -66,34 +66,34 @@ class MainActivity : AppCompatActivity() { ...@@ -66,34 +66,34 @@ class MainActivity : AppCompatActivity() {
ContextCompat.getDrawable(this, R.drawable.ic_yes_memeber_unactive) ContextCompat.getDrawable(this, R.drawable.ic_yes_memeber_unactive)
} }
// 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
// } }
} }
......
...@@ -121,9 +121,9 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View { ...@@ -121,9 +121,9 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View {
val colorRes = if (mainModel.eligiblePartner) R.color.colorPrimary else R.color.colorGray val colorRes = if (mainModel.eligiblePartner) R.color.colorPrimary else R.color.colorGray
val color = ContextCompat.getColor(requireContext(), colorRes) val color = ContextCompat.getColor(requireContext(), colorRes)
ViewCompat.setBackgroundTintList(binding.frameYesPartner, ColorStateList.valueOf(color)) //ViewCompat.setBackgroundTintList(binding.frameYesPartner, ColorStateList.valueOf(color))
ViewCompat.setBackgroundTintList(binding.frameYesCoins, ColorStateList.valueOf(color)) //ViewCompat.setBackgroundTintList(binding.frameYesCoins, ColorStateList.valueOf(color))
ViewCompat.setBackgroundTintList(binding.qrCodeContainer, ColorStateList.valueOf(color)) //ViewCompat.setBackgroundTintList(binding.qrCodeContainer, ColorStateList.valueOf(color))
binding.qrCodeContainer.setOnClickListener { binding.qrCodeContainer.setOnClickListener {
OutLetScanQrActivity.launch(requireContext()) OutLetScanQrActivity.launch(requireContext())
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="#ffffff" />
<solid android:color="@color/colorPrimary" />
<padding
android:left="1dp"
android:right="1dp"
android:top="1dp" />
<corners android:radius="50dp" />
</shape>
\ No newline at end of file
...@@ -319,8 +319,7 @@ ...@@ -319,8 +319,7 @@
android:layout_height="35dp" android:layout_height="35dp"
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/rounded_corner" android:background="@drawable/bg_floating_btn_scan"
android:backgroundTint="@color/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
...@@ -332,6 +331,7 @@ ...@@ -332,6 +331,7 @@
android:layout_marginStart="@dimen/margin_1x_size" android:layout_marginStart="@dimen/margin_1x_size"
android:paddingStart="@dimen/margin_1x_size" android:paddingStart="@dimen/margin_1x_size"
android:text="Scan" android:text="Scan"
android:textStyle="bold"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/small_text_size" android:textSize="@dimen/small_text_size"
app:layout_constraintBottom_toBottomOf="@+id/iv_qrcode" app:layout_constraintBottom_toBottomOf="@+id/iv_qrcode"
......
...@@ -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,10 @@ ...@@ -27,9 +27,10 @@
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-->
<!-- android:id="@+id/navigation_yes_member"--> <fragment
<!-- android:name="com.seatel.mobilehall.ui.yes_member.fragment.YesMemberFragment"--> android:id="@+id/navigation_yes_member"
<!-- android:label="fragment_yes_member"--> android:name="com.seatel.mobilehall.ui.yes_member.fragment.YesMemberFragment"
<!-- tools:layout="@layout/fragment_yes_member" />--> android:label="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