Skip to content

A
android-yes
Commit 61191e18 authored by Seatel's avatar Seatel
Browse files
Options

visible yes member (menu-bottom-bar). 

re-design scan screen.
change the color of button scan from black to primary.
parent 2bfe805a
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 54 deletions
.idea/workspace.xml
View file @ 61191e18
......@@ -617,8 +617,7 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="b947e2f9-b70e-404d-b6f9-40fd3f83c1e2" name="Changes" comment="enhance home fragment.">
<change afterPath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" afterDir="false" />
<list default="true" id="b947e2f9-b70e-404d-b6f9-40fd3f83c1e2" name="Changes" comment="verify latest code.">
<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/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.9/checksums/sha1-checksums.bin" afterDir="false" />
......@@ -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/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$/.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>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ChangesViewManager">
<option name="groupingKeys">
<option value="directory" />
</option>
</component>
<component name="ClangdSettings">
<option name="formatViaClangd" value="false" />
</component>
......@@ -958,7 +957,15 @@
<option name="project" value="LOCAL" />
<updated>1752138008359</updated>
</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 />
</component>
<component name="Vcs.Log.Tabs.Properties">
......@@ -978,19 +985,20 @@
<MESSAGE value="hide slide show" />
<MESSAGE value="using viewpager2 instead auto image slider" />
<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 name="play_dynamic_filters_status">
<option name="appIdToCheckInfo">
<map>
<entry key="com.seatel.mobilehall">
<value>
<CheckInfo lastCheckTimestamp="1752455782122" />
<CheckInfo lastCheckTimestamp="1752629109224" />
</value>
</entry>
<entry key="com.seatel.mobilehall.test">
<value>
<CheckInfo lastCheckTimestamp="1752455782150" />
<CheckInfo lastCheckTimestamp="1752629109224" />
</value>
</entry>
</map>
......
app/src/main/java/com/seatel/mobilehall/ui/main/MainActivity.kt
View file @ 61191e18
......@@ -57,7 +57,7 @@ class MainActivity : AppCompatActivity() {
// 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) {
......@@ -66,34 +66,34 @@ class MainActivity : AppCompatActivity() {
ContextCompat.getDrawable(this, R.drawable.ic_yes_memeber_unactive)
}
// Apply color tint to the drawable
// drawable?.setTint(ContextCompat.getColor(this, R.color.colorPrimary))
// yesMemberMenuItem.icon = drawable
// navView.findViewById<View>(yesMemberMenuItem.itemId)?.let { itemView ->
//
// itemView.findViewById<View>(com.google.android.material.R.id.text)?.visibility =
// View.GONE
// itemView.findViewById<View>(com.google.android.material.R.id.navigation_bar_item_large_label_view)?.visibility =
// View.GONE
//
//
// // Customize the icon size if needed
// val iconView =
// itemView.findViewById<View>(com.google.android.material.R.id.navigation_bar_item_icon_view)
//
//
// val iconViewParams: FrameLayout.LayoutParams =
// iconView.layoutParams as FrameLayout.LayoutParams
// iconViewParams.width = TypedValue.applyDimension(
// TypedValue.COMPLEX_UNIT_DIP, 40F, resources.displayMetrics
// ).toInt()
// iconViewParams.height = TypedValue.applyDimension(
// TypedValue.COMPLEX_UNIT_DIP, 40F, resources.displayMetrics
// ).toInt()
// iconView.layoutParams = iconViewParams
// }
//Apply color tint to the drawable
//drawable?.setTint(ContextCompat.getColor(this, R.color.colorPrimary))
yesMemberMenuItem.icon = drawable
navView.findViewById<View>(yesMemberMenuItem.itemId)?.let { itemView ->
itemView.findViewById<View>(com.google.android.material.R.id.text)?.visibility =
View.GONE
itemView.findViewById<View>(com.google.android.material.R.id.navigation_bar_item_large_label_view)?.visibility =
View.GONE
// Customize the icon size if needed
val iconView =
itemView.findViewById<View>(com.google.android.material.R.id.navigation_bar_item_icon_view)
val iconViewParams: FrameLayout.LayoutParams =
iconView.layoutParams as FrameLayout.LayoutParams
iconViewParams.width = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 40F, resources.displayMetrics
).toInt()
iconViewParams.height = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 40F, resources.displayMetrics
).toInt()
iconView.layoutParams = iconViewParams
}
}
......
app/src/main/java/com/seatel/mobilehall/ui/yes_member/fragment/YesMemberFragment.kt
View file @ 61191e18
......@@ -121,9 +121,9 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View {
val colorRes = if (mainModel.eligiblePartner) R.color.colorPrimary else R.color.colorGray
val color = ContextCompat.getColor(requireContext(), colorRes)
ViewCompat.setBackgroundTintList(binding.frameYesPartner, ColorStateList.valueOf(color))
ViewCompat.setBackgroundTintList(binding.frameYesCoins, ColorStateList.valueOf(color))
ViewCompat.setBackgroundTintList(binding.qrCodeContainer, ColorStateList.valueOf(color))
//ViewCompat.setBackgroundTintList(binding.frameYesPartner, ColorStateList.valueOf(color))
//ViewCompat.setBackgroundTintList(binding.frameYesCoins, ColorStateList.valueOf(color))
//ViewCompat.setBackgroundTintList(binding.qrCodeContainer, ColorStateList.valueOf(color))
binding.qrCodeContainer.setOnClickListener {
OutLetScanQrActivity.launch(requireContext())
......
app/src/main/res/drawable/bg_floating_btn_scan.xml 0 → 100644
View file @ 61191e18
<?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
app/src/main/res/layout/fragment_yes_member.xml
View file @ 61191e18
......@@ -319,8 +319,7 @@
android:layout_height="35dp"
android:layout_marginEnd="@dimen/margin_2x_size"
android:layout_marginBottom="@dimen/margin_2x_size"
android:background="@drawable/rounded_corner"
android:backgroundTint="@color/colorPrimary"
android:background="@drawable/bg_floating_btn_scan"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent">
......@@ -332,6 +331,7 @@
android:layout_marginStart="@dimen/margin_1x_size"
android:paddingStart="@dimen/margin_1x_size"
android:text="Scan"
android:textStyle="bold"
android:textColor="@color/white"
android:textSize="@dimen/small_text_size"
app:layout_constraintBottom_toBottomOf="@+id/iv_qrcode"
......
app/src/main/res/menu/bottom_nav_menu.xml
View file @ 61191e18
......@@ -12,10 +12,10 @@
android:icon="@drawable/packages_selector"
android:title="@string/nav_package" />
<!-- <item-->
<!-- android:id="@+id/navigation_yes_member"-->
<!-- android:icon="@drawable/yes_member_selector"-->
<!-- android:title="" />-->
<item
android:id="@+id/navigation_yes_member"
android:icon="@drawable/yes_member_selector"
android:title="" />
<item
android:id="@+id/navigation_usage"
......
app/src/main/res/navigation/mobile_navigation.xml
View file @ 61191e18
......@@ -27,9 +27,10 @@
android:name="com.seatel.mobilehall.ui.profile.fragment.ProfilesFragment"
android:label="@string/nav_profile"
tools:layout="@layout/fragment_profile" />
<!-- <fragment-->
<!-- android:id="@+id/navigation_yes_member"-->
<!-- android:name="com.seatel.mobilehall.ui.yes_member.fragment.YesMemberFragment"-->
<!-- android:label="fragment_yes_member"-->
<!-- tools:layout="@layout/fragment_yes_member" />-->
<fragment
android:id="@+id/navigation_yes_member"
android:name="com.seatel.mobilehall.ui.yes_member.fragment.YesMemberFragment"
android:label="fragment_yes_member"
tools:layout="@layout/fragment_yes_member" />
</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