Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
android-yes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kheang Chenda
android-yes
Commits
4708f57e
Commit
4708f57e
authored
Jul 07, 2025
by
Seatel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hide yes member.
parent
ab53d5c7
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
177 additions
and
157 deletions
+177
-157
ImageSliderAdapter.kt
...m/seatel/mobilehall/ui/home/adapter/ImageSliderAdapter.kt
+4
-11
HomeFragment.kt
...va/com/seatel/mobilehall/ui/home/fragment/HomeFragment.kt
+27
-4
MainActivity.kt
...c/main/java/com/seatel/mobilehall/ui/main/MainActivity.kt
+27
-27
ServicesFragment.kt
...eatel/mobilehall/ui/packages/fragment/ServicesFragment.kt
+28
-16
OutLetScanQrActivity.kt
...mobilehall/ui/yes_member/activity/OutLetScanQrActivity.kt
+3
-0
YesMemberFragment.kt
...el/mobilehall/ui/yes_member/fragment/YesMemberFragment.kt
+4
-5
icon_scan_qr_code.png
app/src/main/res/drawable/icon_scan_qr_code.png
+0
-0
activity_outlet_scan_qr.xml
app/src/main/res/layout/activity_outlet_scan_qr.xml
+50
-64
fragment_home.xml
app/src/main/res/layout/fragment_home.xml
+4
-4
fragment_yes_member.xml
app/src/main/res/layout/fragment_yes_member.xml
+19
-16
item_home_banner.xml
app/src/main/res/layout/item_home_banner.xml
+0
-0
bottom_nav_menu.xml
app/src/main/res/menu/bottom_nav_menu.xml
+4
-4
mobile_navigation.xml
app/src/main/res/navigation/mobile_navigation.xml
+5
-5
colors.xml
app/src/main/res/values/colors.xml
+1
-0
gradle.properties
gradle.properties
+1
-1
No files found.
app/src/main/java/com/seatel/mobilehall/ui/home/adapter/ImageSliderAdapter.kt
View file @
4708f57e
package
com.seatel.mobilehall.ui.home.adapter
package
com.seatel.mobilehall.ui.home.adapter
import
android.os.Handler
import
android.os.Looper
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
android.widget.ImageView
import
androidx.core.view.size
import
androidx.recyclerview.widget.RecyclerView
import
androidx.recyclerview.widget.RecyclerView
import
androidx.viewpager2.widget.ViewPager2
import
coil.load
import
com.bumptech.glide.Glide
import
com.bumptech.glide.Glide
import
com.seatel.mobilehall.R
import
com.seatel.mobilehall.databinding.ItemHomeBannerBinding
import
com.seatel.mobilehall.databinding.ItemBinding
import
com.seatel.mobilehall.ui.home.model.BannersModel
import
com.seatel.mobilehall.ui.home.model.BannersModel
import
com.seatel.mobilehall.ui.login.activity.TermsAndConditionsActivity
import
com.seatel.mobilehall.ui.login.activity.TermsAndConditionsActivity
...
@@ -24,14 +17,14 @@ class ImageSliderAdapter(
...
@@ -24,14 +17,14 @@ class ImageSliderAdapter(
private
val
newList
:
List
<
BannersModel
>
=
private
val
newList
:
List
<
BannersModel
>
=
listOf
(
banners
.
last
())
+
banners
+
listOf
(
banners
.
first
())
listOf
(
banners
.
last
())
+
banners
+
listOf
(
banners
.
first
())
class
SliderVH
(
val
binding
:
ItemBinding
)
:
RecyclerView
.
ViewHolder
(
binding
.
root
)
class
SliderVH
(
val
binding
:
Item
HomeBanner
Binding
)
:
RecyclerView
.
ViewHolder
(
binding
.
root
)
lateinit
var
binding
:
ItemBinding
lateinit
var
binding
:
Item
HomeBanner
Binding
override
fun
onCreateViewHolder
(
override
fun
onCreateViewHolder
(
parent
:
ViewGroup
,
parent
:
ViewGroup
,
viewType
:
Int
viewType
:
Int
):
ImageSliderAdapter
.
SliderVH
{
):
ImageSliderAdapter
.
SliderVH
{
val
binding
=
ItemBinding
.
inflate
(
LayoutInflater
.
from
(
parent
.
context
),
parent
,
false
)
val
binding
=
Item
HomeBanner
Binding
.
inflate
(
LayoutInflater
.
from
(
parent
.
context
),
parent
,
false
)
return
SliderVH
(
binding
)
return
SliderVH
(
binding
)
}
}
...
...
app/src/main/java/com/seatel/mobilehall/ui/home/fragment/HomeFragment.kt
View file @
4708f57e
...
@@ -486,11 +486,14 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie
...
@@ -486,11 +486,14 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie
gotoPlayStore
(
packageName
=
"com.nacd.stopdrug"
)
gotoPlayStore
(
packageName
=
"com.nacd.stopdrug"
)
}
}
)
)
if
(
bannersList
.
isNotEmpty
()){
viewpager2
.
adapter
=
imageSliderAdapter
viewpager2
.
adapter
=
imageSliderAdapter
viewpager2
.
currentItem
=
1
viewpager2
.
currentItem
=
1
setupAutoScroll
(
bannersList
.
size
+
2
)
setupAutoScroll
(
bannersList
.
size
+
2
)
startAutoScroll
()
startAutoScroll
()
}
}
binding
.
viewpager2
.
setMarginsInDp
(
top
=
6
)
}
}
}
}
}
...
@@ -715,4 +718,24 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie
...
@@ -715,4 +718,24 @@ class HomeFragment : BaseFragment(), View.OnClickListener, BannersInteractor.Vie
}
}
private
fun
View
.
setMarginsInDp
(
left
:
Int
=
0
,
top
:
Int
=
0
,
right
:
Int
=
0
,
bottom
:
Int
=
0
)
{
val
scale
=
context
.
resources
.
displayMetrics
.
density
val
params
=
layoutParams
as
?
ViewGroup
.
MarginLayoutParams
?:
ViewGroup
.
MarginLayoutParams
(
layoutParams
)
params
.
setMargins
(
(
left
*
scale
+
0.5f
).
toInt
(),
(
top
*
scale
+
0.5f
).
toInt
(),
(
right
*
scale
+
0.5f
).
toInt
(),
(
bottom
*
scale
+
0.5f
).
toInt
()
)
layoutParams
=
params
}
}
}
app/src/main/java/com/seatel/mobilehall/ui/main/MainActivity.kt
View file @
4708f57e
...
@@ -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
}
//
}
}
}
...
...
app/src/main/java/com/seatel/mobilehall/ui/packages/fragment/ServicesFragment.kt
View file @
4708f57e
...
@@ -80,16 +80,22 @@ class ServicesFragment : BaseFragment(), AppProductsInteractor.View,
...
@@ -80,16 +80,22 @@ class ServicesFragment : BaseFragment(), AppProductsInteractor.View,
}
}
private
fun
initPresenter
()
{
private
fun
initPresenter
()
{
AppProductsPresenter
(
requireContext
(),
this
).
onGetAppProducts
(
getPhoneLogin
())
//AppProductsPresenter(requireContext(), this).onGetAppProducts(getPhoneLogin())
context
?.
let
{
AppProductsPresenter
(
it
,
this
).
onGetAppProducts
(
getPhoneLogin
())
}
}
}
private
fun
init
()
{
private
fun
init
()
{
if
(
isAdded
){
binding
.
apply
{
binding
.
apply
{
btnPricePlan
.
setOnClickListener
(
this
@ServicesFragment
)
btnPricePlan
.
setOnClickListener
(
this
@ServicesFragment
)
btnPackage
.
setOnClickListener
(
this
@ServicesFragment
)
btnPackage
.
setOnClickListener
(
this
@ServicesFragment
)
buttonSwitchPlan
.
setOnClickListener
(
this
@ServicesFragment
)
buttonSwitchPlan
.
setOnClickListener
(
this
@ServicesFragment
)
}
}
}
}
}
private
fun
setupAdapter
(
list
:
ArrayList
<
AppProductsResponseModel
>)
{
private
fun
setupAdapter
(
list
:
ArrayList
<
AppProductsResponseModel
>)
{
handleItemSelection
(
list
[
0
])
handleItemSelection
(
list
[
0
])
...
@@ -107,11 +113,15 @@ class ServicesFragment : BaseFragment(), AppProductsInteractor.View,
...
@@ -107,11 +113,15 @@ class ServicesFragment : BaseFragment(), AppProductsInteractor.View,
if
(
plan
.
code
==
"rik-reay"
)
{
if
(
plan
.
code
==
"rik-reay"
)
{
RikReayPresenter
(
requireContext
(),
this
).
RikReay
()
RikReayPresenter
(
requireContext
(),
this
).
RikReay
()
}
else
{
}
else
{
ProductServiceDetailPrsenter
(
requireActivity
(),
this
).
onProServiceDetail
(
activity
.
let
{
if
(
it
!=
null
)
{
ProductServiceDetailPrsenter
(
it
,
this
).
onProServiceDetail
(
plan
.
code
!!
,
plan
.
code
!!
,
getPhoneLogin
()
getPhoneLogin
()
)
)
}
}
}
}
}
}
...
@@ -151,6 +161,7 @@ class ServicesFragment : BaseFragment(), AppProductsInteractor.View,
...
@@ -151,6 +161,7 @@ class ServicesFragment : BaseFragment(), AppProductsInteractor.View,
when
(
valuePackSectionModel
.
type
)
{
when
(
valuePackSectionModel
.
type
)
{
Constant
.
LoyKob
->
{
Constant
.
LoyKob
->
{
if
(
isAdded
)
{
binding
.
mRecyclerDetail
.
adapter
=
binding
.
mRecyclerDetail
.
adapter
=
LoyKobsAdapter
(
LoyKobsAdapter
(
requireContext
(),
requireContext
(),
...
@@ -159,6 +170,7 @@ class ServicesFragment : BaseFragment(), AppProductsInteractor.View,
...
@@ -159,6 +170,7 @@ class ServicesFragment : BaseFragment(), AppProductsInteractor.View,
valuePackSectionModel
valuePackSectionModel
)
)
}
}
}
Constant
.
OnePlan
->
{
Constant
.
OnePlan
->
{
binding
.
mRecyclerDetail
.
adapter
=
binding
.
mRecyclerDetail
.
adapter
=
...
...
app/src/main/java/com/seatel/mobilehall/ui/yes_member/activity/OutLetScanQrActivity.kt
View file @
4708f57e
...
@@ -14,7 +14,9 @@ import android.graphics.drawable.BitmapDrawable
...
@@ -14,7 +14,9 @@ import android.graphics.drawable.BitmapDrawable
import
android.os.Bundle
import
android.os.Bundle
import
android.util.Log
import
android.util.Log
import
android.widget.Toast
import
android.widget.Toast
import
androidx.annotation.OptIn
import
androidx.camera.core.CameraSelector
import
androidx.camera.core.CameraSelector
import
androidx.camera.core.ExperimentalGetImage
import
androidx.camera.core.ImageAnalysis
import
androidx.camera.core.ImageAnalysis
import
androidx.camera.core.ImageProxy
import
androidx.camera.core.ImageProxy
import
androidx.camera.core.Preview
import
androidx.camera.core.Preview
...
@@ -104,6 +106,7 @@ class OutLetScanQrActivity : BaseActivity<ActivityOutletScanQrBinding>(),
...
@@ -104,6 +106,7 @@ class OutLetScanQrActivity : BaseActivity<ActivityOutletScanQrBinding>(),
}
}
@OptIn
(
ExperimentalGetImage
::
class
)
private
fun
scanBarcode
(
imageProxy
:
ImageProxy
,
scanner
:
BarcodeScanner
)
{
private
fun
scanBarcode
(
imageProxy
:
ImageProxy
,
scanner
:
BarcodeScanner
)
{
if
(
isScanned
)
{
if
(
isScanned
)
{
imageProxy
.
close
()
imageProxy
.
close
()
...
...
app/src/main/java/com/seatel/mobilehall/ui/yes_member/fragment/YesMemberFragment.kt
View file @
4708f57e
...
@@ -5,7 +5,6 @@ import android.os.Bundle
...
@@ -5,7 +5,6 @@ import android.os.Bundle
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
android.widget.Toast
import
androidx.core.content.ContextCompat
import
androidx.core.content.ContextCompat
import
androidx.core.view.ViewCompat
import
androidx.core.view.ViewCompat
import
androidx.recyclerview.widget.GridLayoutManager
import
androidx.recyclerview.widget.GridLayoutManager
...
@@ -89,7 +88,6 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View {
...
@@ -89,7 +88,6 @@ 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
Toast
.
makeText
(
context
,
"amount of the top partner is ${topPartnerList.size}"
,
Toast
.
LENGTH_SHORT
).
show
()
if
(
topPartnerList
.
isNotEmpty
())
binding
.
tvPartner
.
visibility
=
View
.
VISIBLE
else
binding
.
tvPartner
.
visibility
=
View
.
GONE
if
(
topPartnerList
.
isNotEmpty
())
binding
.
tvPartner
.
visibility
=
View
.
VISIBLE
else
binding
.
tvPartner
.
visibility
=
View
.
GONE
}
}
...
@@ -137,11 +135,12 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View {
...
@@ -137,11 +135,12 @@ class YesMemberFragment : BaseFragment(), MainTopPartnerInteractor.View {
CoinActivity
.
launch
(
requireContext
(),
imgCoin
!!
,
coinEarn
!!
,
coinDescription
!!
)
CoinActivity
.
launch
(
requireContext
(),
imgCoin
!!
,
coinEarn
!!
,
coinDescription
!!
)
}
}
if
(
mainModel
.
coinHidden
)
binding
.
frameYesCoins
.
visibility
=
View
.
GONE
else
binding
.
frameYesCoins
.
visibility
=
View
.
VISIBLE
if
(
mainModel
.
coinHidden
)
binding
.
frameYesCoins
.
visibility
=
if
(
mainModel
.
partnerHidden
){
View
.
GONE
else
binding
.
frameYesCoins
.
visibility
=
View
.
VISIBLE
if
(
mainModel
.
partnerHidden
)
{
binding
.
frameYesPartner
.
visibility
=
View
.
GONE
binding
.
frameYesPartner
.
visibility
=
View
.
GONE
binding
.
qrCodeContainer
.
visibility
=
View
.
GONE
binding
.
qrCodeContainer
.
visibility
=
View
.
GONE
}
else
{
}
else
{
binding
.
frameYesPartner
.
visibility
=
View
.
VISIBLE
binding
.
frameYesPartner
.
visibility
=
View
.
VISIBLE
binding
.
qrCodeContainer
.
visibility
=
View
.
VISIBLE
binding
.
qrCodeContainer
.
visibility
=
View
.
VISIBLE
}
}
...
...
app/src/main/res/drawable/icon_scan_qr_code.png
0 → 100644
View file @
4708f57e
21.2 KB
app/src/main/res/layout/activity_outlet_scan_qr.xml
View file @
4708f57e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
<View
android:id=
"@+id/statusBarBackground"
android:layout_width=
"match_parent"
android:layout_height=
"24dp"
android:background=
"@color/colorPrimaryDark"
tools:ignore=
"MissingConstraints"
/>
<androidx.appcompat.widget.Toolbar
android:id=
"@+id/mToolbar"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:background=
"@color/colorPrimaryDark"
app:layout_constraintTop_toBottomOf=
"@+id/statusBarBackground"
>
<ImageView
android:id=
"@+id/iv_back"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/ic_left_back"
/>
<ImageView
android:layout_width=
"60dp"
android:layout_height=
"40dp"
android:layout_gravity=
"center"
android:src=
"@drawable/ic_yes_partner"
/>
</androidx.appcompat.widget.Toolbar>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/content_view"
android:layout_width=
"match_parent"
android:layout_height=
"300dp"
android:background=
"@color/colorLightGray"
app:layout_constraintTop_toBottomOf=
"@+id/mToolbar"
>
<!-- 🔥 Set background color -->
<!-- Full Screen Camera Preview (Hidden Behind Overlay) -->
<androidx.camera.view.PreviewView
<androidx.camera.view.PreviewView
android:id=
"@+id/scan_qr"
android:id=
"@+id/scan_qr"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
/>
android:scaleType=
"centerCrop"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<!-- Transparent Frame for Camera (200x200) -->
<View
<View
android:id=
"@+id/frame_overlay"
android:id=
"@+id/frame_overlay"
android:layout_width=
"200dp
"
android:layout_width=
"match_parent
"
android:layout_height=
"20
0dp"
android:layout_height=
"25
0dp"
android:background=
"@drawable/bg_button_stroke_transparent
"
android:layout_marginHorizontal=
"13dp
"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
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"
/>
<!-- Overlay (Gray Background) -->
<View
<View
android:id=
"@+id/overlay"
android:id=
"@+id/overlay"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -72,29 +29,56 @@
...
@@ -72,29 +29,56 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@drawable/bg_toolbar_scan"
android:paddingTop=
"24dp"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<ImageView
android:id=
"@+id/ivBack"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:padding=
"10dp"
app:srcCompat=
"@drawable/ic_close_x"
/>
<com.seatel.mobilehall.util.customview.CustomTextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"10dp"
android:text=
"@string/scan_id"
android:textColor=
"@android:color/white"
android:textSize=
"18sp"
/>
</RelativeLayout>
<com.seatel.mobilehall.util.customview.CustomTextView
<com.seatel.mobilehall.util.customview.CustomTextView
android:id=
"@+id/tv_scan_out_qr"
android:id=
"@+id/tv_scan_out_qr"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/margin_
2
x_size"
android:layout_marginTop=
"@dimen/margin_
3
x_size"
android:gravity=
"center_horizontal"
android:gravity=
"center_horizontal"
android:text=
"Scan Outlet QR code"
android:text=
"Scan Outlet QR code"
android:textColor=
"@color/white"
android:textSize=
"@dimen/large_text_size"
android:textSize=
"@dimen/large_text_size"
android:textStyle=
"bold"
android:textStyle=
"bold"
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/
content_view
"
/>
app:layout_constraintTop_toBottomOf=
"@+id/
frame_overlay
"
/>
<com.seatel.mobilehall.util.customview.CustomTextView
<com.seatel.mobilehall.util.customview.CustomTextView
android:id=
"@+id/tv_or"
android:id=
"@+id/tv_or"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/margin_
5
x_size"
android:layout_marginTop=
"@dimen/margin_
2
x_size"
android:gravity=
"center_horizontal"
android:gravity=
"center_horizontal"
android:textStyle=
"bold"
android:text=
"OR"
android:text=
"OR"
android:textColor=
"@color/white"
android:textSize=
"@dimen/large_text_size"
android:textSize=
"@dimen/large_text_size"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
@@ -112,9 +96,11 @@
...
@@ -112,9 +96,11 @@
android:text=
"Type outlet code"
android:text=
"Type outlet code"
android:textColor=
"@color/colorPrimary"
android:textColor=
"@color/colorPrimary"
android:textSize=
"@dimen/small_text_size"
android:textSize=
"@dimen/small_text_size"
android:textStyle=
"bold"
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/tv_or"
/>
app:layout_constraintTop_toBottomOf=
"@+id/tv_or"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_home.xml
View file @
4708f57e
...
@@ -211,7 +211,7 @@
...
@@ -211,7 +211,7 @@
<View
<View
android:id=
"@+id/view3"
android:id=
"@+id/view3"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"10
0
dp"
android:layout_height=
"10
5
dp"
android:background=
"@drawable/header_background"
android:background=
"@drawable/header_background"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
@@ -221,8 +221,7 @@
...
@@ -221,8 +221,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:id=
"@+id/viewpager_banner"
android:id=
"@+id/viewpager_banner"
android:background=
"@color/browser_actions_bg_grey"
android:background=
"@color/browser_actions_bg_grey"
android:layout_height=
"0dp"
android:layout_height=
"wrap_content"
android:paddingTop=
"5dp"
android:layout_marginStart=
"@dimen/margin_1x_size"
android:layout_marginStart=
"@dimen/margin_1x_size"
android:layout_marginEnd=
"@dimen/margin_1x_size"
android:layout_marginEnd=
"@dimen/margin_1x_size"
app:layout_constraintBottom_toBottomOf=
"@id/viewpager2"
app:layout_constraintBottom_toBottomOf=
"@id/viewpager2"
...
@@ -232,7 +231,7 @@
...
@@ -232,7 +231,7 @@
/>
/>
<androidx.viewpager2.widget.ViewPager2
<androidx.viewpager2.widget.ViewPager2
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"
0
dp"
android:layout_height=
"
112
dp"
android:layout_marginStart=
"@dimen/margin_1x_size"
android:layout_marginStart=
"@dimen/margin_1x_size"
android:layout_marginEnd=
"@dimen/margin_1x_size"
android:layout_marginEnd=
"@dimen/margin_1x_size"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
...
@@ -241,6 +240,7 @@
...
@@ -241,6 +240,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
android:id=
"@+id/viewpager2"
/>
android:id=
"@+id/viewpager2"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
...
...
app/src/main/res/layout/fragment_yes_member.xml
View file @
4708f57e
...
@@ -14,10 +14,10 @@
...
@@ -14,10 +14,10 @@
app:layout_constraintTop_toTopOf=
"parent"
>
app:layout_constraintTop_toTopOf=
"parent"
>
<ImageView
<ImageView
android:visibility=
"gone"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/ic_left_back"
/>
android:src=
"@drawable/ic_left_back"
android:visibility=
"gone"
/>
<ImageView
<ImageView
android:layout_width=
"40dp"
android:layout_width=
"40dp"
...
@@ -81,9 +81,9 @@
...
@@ -81,9 +81,9 @@
android:fadingEdge=
"horizontal"
android:fadingEdge=
"horizontal"
android:focusable=
"true"
android:focusable=
"true"
android:focusableInTouchMode=
"true"
android:focusableInTouchMode=
"true"
android:singleLine=
"true"
android:marqueeRepeatLimit=
"marquee_forever"
android:marqueeRepeatLimit=
"marquee_forever"
android:maxLines=
"1"
android:maxLines=
"1"
android:singleLine=
"true"
android:text=
"Top up 5 USD each month to hhhhhhbecome a yes member."
android:text=
"Top up 5 USD each month to hhhhhhbecome a yes member."
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@+id/top_up"
app:layout_constraintEnd_toStartOf=
"@+id/top_up"
...
@@ -119,12 +119,13 @@
...
@@ -119,12 +119,13 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"150dp"
android:layout_height=
"150dp"
android:background=
"@drawable/bg_yes_member"
android:background=
"@drawable/bg_yes_member"
android:backgroundTint=
"@
android:color/darker_gray
"
android:backgroundTint=
"@
color/color_53535369
"
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:visibility=
"gone"
android:visibility=
"gone"
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"
tools:visibility=
"visible"
>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
...
@@ -195,13 +196,13 @@
...
@@ -195,13 +196,13 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"150dp"
android:layout_height=
"150dp"
android:layout_marginTop=
"@dimen/margin_2x_size"
android:layout_marginTop=
"@dimen/margin_2x_size"
android:visibility=
"gone"
tools:visibility=
"visible"
android:background=
"@drawable/bg_yes_member"
android:background=
"@drawable/bg_yes_member"
android:backgroundTint=
"@
android:color/darker_gray
"
android:backgroundTint=
"@
color/color_53535369
"
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:visibility=
"gone"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
tools:visibility=
"visible"
app:layout_constraintTop_toBottomOf=
"@+id/frame_yes_coins"
>
app:layout_constraintTop_toBottomOf=
"@+id/frame_yes_coins"
>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
...
@@ -215,7 +216,7 @@
...
@@ -215,7 +216,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
app:layout_constraintTop_toTopOf=
"parent"
>
<ImageView
<
androidx.appcompat.widget.AppCompat
ImageView
android:id=
"@+id/iv_partner_banner"
android:id=
"@+id/iv_partner_banner"
android:layout_width=
"100dp"
android:layout_width=
"100dp"
android:layout_height=
"50dp"
android:layout_height=
"50dp"
...
@@ -278,11 +279,11 @@
...
@@ -278,11 +279,11 @@
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"
tools:visibility=
"visible"
android:textStyle=
"bold"
android:textStyle=
"bold"
android:visibility=
"gone"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/constraintLayout2"
/>
app:layout_constraintTop_toBottomOf=
"@+id/constraintLayout2"
tools:visibility=
"visible"
/>
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/recyclerPartner"
android:id=
"@+id/recyclerPartner"
...
@@ -304,7 +305,8 @@
...
@@ -304,7 +305,8 @@
android:textStyle=
"bold"
android:textStyle=
"bold"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/recyclerPartner"
/>
app:layout_constraintTop_toBottomOf=
"@+id/recyclerPartner"
tools:visibility=
"visible"
/>
<androidx.recyclerview.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/RecyclerPartnerCategory"
android:id=
"@+id/RecyclerPartnerCategory"
...
@@ -323,13 +325,14 @@
...
@@ -323,13 +325,14 @@
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"
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/rounded_corner"
android:backgroundTint=
"@color/colorGray"
android:backgroundTint=
"@color/colorGray"
android:visibility=
"gone"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
>
app:layout_constraintEnd_toEndOf=
"parent"
tools:visibility=
"visible"
>
<com.seatel.mobilehall.util.customview.CustomTextView
<com.seatel.mobilehall.util.customview.CustomTextView
...
@@ -345,7 +348,7 @@
...
@@ -345,7 +348,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/iv_qrcode"
/>
app:layout_constraintTop_toTopOf=
"@+id/iv_qrcode"
/>
<ImageView
<
androidx.appcompat.widget.AppCompat
ImageView
android:id=
"@+id/iv_qrcode"
android:id=
"@+id/iv_qrcode"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item.xml
→
app/src/main/res/layout/item
_home_banner
.xml
View file @
4708f57e
File moved
app/src/main/res/menu/bottom_nav_menu.xml
View file @
4708f57e
...
@@ -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"
...
...
app/src/main/res/navigation/mobile_navigation.xml
View file @
4708f57e
...
@@ -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
app/src/main/res/values/colors.xml
View file @
4708f57e
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
<color
name=
"color_claim_gray"
>
#BFBFBF
</color>
<color
name=
"color_claim_gray"
>
#BFBFBF
</color>
<color
name=
"button_behind"
>
#FACCE8
</color>
<color
name=
"button_behind"
>
#FACCE8
</color>
<color
name=
"color_light_gray"
>
#F7F7F8
</color>
<color
name=
"color_light_gray"
>
#F7F7F8
</color>
<color
name=
"color_53535369"
>
#53535369
</color>
</resources>
</resources>
\ No newline at end of file
gradle.properties
View file @
4708f57e
...
@@ -22,4 +22,4 @@ kotlin.code.style=official
...
@@ -22,4 +22,4 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass
=
true
android.nonTransitiveRClass
=
true
android.defaults.buildfeatures.buildconfig
=
true
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment