Skip to content

A
android-yes
Commit 2bfe805a authored by Seatel's avatar Seatel
Browse files
Options

verify latest code.

parent cc64ad80
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 156 deletions
.idea/appInsightsSettings.xml 0 → 100644
View file @ 2bfe805a
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AppInsightsSettings">
<option name="tabSettings">
<map>
<entry key="Android Vitals">
<value>
<InsightsFilterSettings>
<option name="connection">
<ConnectionSetting>
<option name="appId" value="com.seatel.mobilehall" />
</ConnectionSetting>
</option>
<option name="signal" value="SIGNAL_UNSPECIFIED" />
<option name="timeIntervalDays" value="SEVEN_DAYS" />
<option name="visibilityType" value="ALL" />
</InsightsFilterSettings>
</value>
</entry>
</map>
</option>
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
View file @ 2bfe805a
This diff is collapsed.
app/build.gradle
View file @ 2bfe805a
...@@ -46,7 +46,7 @@ android { ...@@ -46,7 +46,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release signingConfig signingConfigs.release
proguardFile '/Users/ryan/Documents/Project/Seatel_android_project/sea-tel-android/app/proguard-rules.pro' proguardFile '/Users/ryan/Documents/Project/Seatel_android_project/sea-tel-android/app/proguard-rules.pro'
ext.alwaysUpdateBuildId = false
} }
debug { debug {
...@@ -202,7 +202,7 @@ dependencies { ...@@ -202,7 +202,7 @@ dependencies {
// test // test
testImplementation 'junit:junit' testImplementation 'junit:junit'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
} }
app/src/main/java/com/seatel/mobilehall/ui/home/adapter/ImageSliderAdapter.kt
View file @ 2bfe805a
...@@ -32,7 +32,6 @@ class ImageSliderAdapter( ...@@ -32,7 +32,6 @@ class ImageSliderAdapter(
val banner = newList[position] val banner = newList[position]
Glide.with(holder.itemView.context).load(banner.imageUrl).into(holder.binding.imageView) Glide.with(holder.itemView.context).load(banner.imageUrl).into(holder.binding.imageView)
holder.itemView.setOnClickListener(View.OnClickListener { holder.itemView.setOnClickListener(View.OnClickListener {
println("action action banner")
when (banner.actionType) { when (banner.actionType) {
"in-app" -> { "in-app" -> {
TermsAndConditionsActivity.launch( TermsAndConditionsActivity.launch(
...@@ -48,7 +47,6 @@ class ImageSliderAdapter( ...@@ -48,7 +47,6 @@ class ImageSliderAdapter(
}) })
} }
override fun getItemCount(): Int { override fun getItemCount(): Int {
return newList.size return newList.size
} }
......
app/src/main/res/layout/activity_outlet_scan_qr.xml
View file @ 2bfe805a
...@@ -5,96 +5,81 @@ ...@@ -5,96 +5,81 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.camera.view.PreviewView
android:id="@+id/scan_qr"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<View
android:id="@+id/frame_overlay"
android:layout_width="match_parent"
android:layout_height="250dp"
android:layout_marginHorizontal="13dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <View
android:id="@+id/statusBarBackground" android:id="@+id/overlay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="match_parent"
android:background="@color/colorPrimaryDark" android:background="@android:color/transparent"
tools:ignore="MissingConstraints" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.Toolbar <RelativeLayout
android:id="@+id/mToolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="wrap_content"
android:background="@color/colorPrimaryDark" android:background="@drawable/bg_toolbar_scan"
app:layout_constraintTop_toBottomOf="@+id/statusBarBackground"> android:paddingTop="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/iv_back" android:id="@+id/ivBack"
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:padding="10dp"
app:srcCompat="@drawable/ic_close_x" />
<ImageView
android:layout_width="60dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:src="@drawable/ic_yes_partner" />
</androidx.appcompat.widget.Toolbar> <com.seatel.mobilehall.util.customview.CustomTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout android:layout_centerHorizontal="true"
android:id="@+id/content_view" android:layout_marginTop="10dp"
android:layout_width="match_parent" android:text="@string/scan_id"
android:layout_height="300dp" android:textColor="@android:color/white"
android:background="@color/colorLightGray" android:textSize="18sp" />
app:layout_constraintTop_toBottomOf="@+id/mToolbar"> <!-- 🔥 Set background color -->
<!-- Full Screen Camera Preview (Hidden Behind Overlay) -->
<androidx.camera.view.PreviewView
android:id="@+id/scan_qr"
android:layout_width="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
android:id="@+id/frame_overlay"
android:layout_width="200dp"
android:layout_height="200dp"
android:background="@drawable/bg_button_stroke_transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- Overlay (Gray Background) -->
<View
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</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_2x_size" android:layout_marginTop="@dimen/margin_3x_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_5x_size" android:layout_marginTop="@dimen/margin_2x_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 +97,9 @@ ...@@ -112,9 +97,9 @@
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>
\ No newline at end of file
app/src/main/res/layout/fragment_yes_member.xml
View file @ 2bfe805a
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
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/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
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"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/iv_qrcode" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/iv_qrcode" android:id="@+id/iv_qrcode"
......
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