From 459d9ab0f17eefddc66ef73358345c84a913b770 Mon Sep 17 00:00:00 2001
From: riz081 <rizqikaibnu@gmail.com>
Date: Fri, 30 May 2025 16:13:51 +0700
Subject: [PATCH] improve page struct

---
 .../com/example/bdkipoc/ReceiptActivity.java  |   6 +-
 .../res/drawable/button_finish_background.xml |   9 ++
 app/src/main/res/drawable/ic_email.png        | Bin 0 -> 1090 bytes
 app/src/main/res/drawable/ic_print.png        | Bin 0 -> 586 bytes
 app/src/main/res/layout/activity_receipt.xml  | 139 ++++++++++++------
 5 files changed, 104 insertions(+), 50 deletions(-)
 create mode 100644 app/src/main/res/drawable/button_finish_background.xml
 create mode 100644 app/src/main/res/drawable/ic_email.png
 create mode 100644 app/src/main/res/drawable/ic_print.png

diff --git a/app/src/main/java/com/example/bdkipoc/ReceiptActivity.java b/app/src/main/java/com/example/bdkipoc/ReceiptActivity.java
index 2fd4067..1478d5b 100644
--- a/app/src/main/java/com/example/bdkipoc/ReceiptActivity.java
+++ b/app/src/main/java/com/example/bdkipoc/ReceiptActivity.java
@@ -36,8 +36,8 @@ public class ReceiptActivity extends AppCompatActivity {
     private TextView finalTotal;
     
     // Action buttons
-    private Button printButton;
-    private Button emailButton;
+    private LinearLayout printButton;
+    private LinearLayout emailButton;
     private Button finishButton;
 
     @Override
@@ -88,7 +88,7 @@ public class ReceiptActivity extends AppCompatActivity {
         serviceFee = findViewById(R.id.service_fee);
         finalTotal = findViewById(R.id.final_total);
         
-        // Action buttons
+        // Action buttons - Updated to LinearLayout
         printButton = findViewById(R.id.print_button);
         emailButton = findViewById(R.id.email_button);
         finishButton = findViewById(R.id.finish_button);
diff --git a/app/src/main/res/drawable/button_finish_background.xml b/app/src/main/res/drawable/button_finish_background.xml
new file mode 100644
index 0000000..29b123f
--- /dev/null
+++ b/app/src/main/res/drawable/button_finish_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    
+    <solid android:color="#3498DB" />
+    
+    <corners android:radius="8dp" />
+    
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_email.png b/app/src/main/res/drawable/ic_email.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3049479f9b0c32cb7dcc332da2fd26e7c38aa46
GIT binary patch
literal 1090
zcmV-I1ikx-P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1J_AJK~#7F?O024
z+CUI(2~uU)m?Mx~miPd1!42R9CMPgnxUgVhyy3F~pTPJ8<OY!P0q_mN4dNB7kn-Lz
zatRQ&KG>>C^r~!-m`}gyp4UAik|ITl6e<2^7>9mnHk)PBG;h(OgvWv;gBNjRX504F
zU@%ztHOTnAY_(dqhG~ppd=ZZ)k{nK8!#CK{IRAbwPft(3b{p(@04rZKGv;r8cWme0
zah#DPgiIz=upPT$7{&#k?X_KjCuZI@+1*YseyF~{b^U(7A<3g|wX9QoR#ixg%)CFE
zJ{`*HzaeFYk|YdmLsdO&_Tv`(2)G;e#Sy1tS=LYzg4MQ$w1KwhS9@ZTJ=7WTR)fnP
zz`6kvrPXRx8;wRU@(E}(8iiagH$fPe@wb2q{Xl3>{o0yujKhu<d_FUra{1hx8(cmZ
zoC9-BIVb1F!ky8UL+#%pAk^Mow|9nBc*G;sY5I{Qv;uOaOHjYZ)pAvN&+BG@ai!Pm
z)gfnhvLQiFl;y}!i4$XU4$jr@_3J@GHV^?~&>M6#i2_#%`{HO43#GZ#D_?-OuQ*rG
zzJUo4YG6ldLRBzicnq247*Lv#Y|4fjyd5fWh9W><f}c<*?u$iSnT7EWN+vOuAx4E`
zOGtz!KyY&_g~G&2W?R;r(igNp+k*HM#@Dq>R=VBpvqV570>mo`$}ChPsLX1aoO@;R
zP^B3JkqHp4%wi?)C4kH#WJ-Fo7AceL8#g(|BH+SV>rJR-7U5CdZNqmUs*G3r$5tgm
zY-A-SJjthkRh^;qEh9W8SnbYoxuj<#pU+?FnnqQ*3?J>SN}TW^VtGJ^gi1a<J0ST~
zT$!c8i1k1Ga|<%o^H7?KCn-*^udhoI1Ca@|+wBV&M&k=AbLz8$E3=Go*=+D<lH)t~
zFycvy#q5{tJWf)K6hcfsFrXuwm1gD~dw<tqQGaU;lDN6KS>U)h)JgFaQhFyL5!wT<
zHM&kd{ce9O5dp7_IYykM7?^;Yd@xxfZu0ShV{9cw%bJ8qih&61*65rtu6lT}l@txB
zhB<q@OTe#2Kc?|6qMkkWu2oRiIQ)caeANR@L@Q00GB*yIR<mOo>IQ<+OIcpHS3MxP
zWwW0LRBFe0IC7017rSQ<BV!zt*?j_zY&Iq~ltir2j{)!514?zNOhcyMZMR22C!o!D
z8wFQ{8vR&MNzt+I-DeOP@3!&1+=Z0!Ui3mg(hHw*ow5f*-2*8}Ri%p0P2s`YX=KSd
z3bR{%!J8zwfOm(&*m$ou3%2!ooz(UE;v*zGMT!(DQv5sk3tn+2=El0^;Q#;t07*qo
IM6N<$f-G(7LjV8(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_print.png b/app/src/main/res/drawable/ic_print.png
new file mode 100644
index 0000000000000000000000000000000000000000..da22143e10ff3302d073876a135d8cee7ba61c06
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0pCePK~#7F?U-9m
z!ax*;{}vy4a0hk??7+GLT!JRt-qaOXRv^A{2@!XID-d^3S74XG0=W2(X$Ubm&Gd{J
zNassPf%d@pJLlE`JRXn7Q)L1O>2x}e+wJx~2!eAHJK8L1GZ>G@eFzW<Xti2#7>4f<
zK>MrVaJWE8LI~g;j38vaUPln%T!8d9L;^?zArx={0n!x^{drCV0cQ}v_*E4|Rz-qf
zi7HcAM%(T79ZOvU4q&fXuur_|uF(omO^SyEZs}7*^4Cdi5;HzyIEFr4>ds5csB^pk
z*POfnQ6nRBmby0xV3Ia@xJF5&0zM~`$qWKmsv|fQ@I$ZHi(o#}WPA?DAjFCQhS3XO
zG0adiR01JZ1guu8=UT1yVPZqUb6CKNfa!FqoU!7NDOLn<;8Vk%(ZI(QTO3Uea9Vvb
z&4JBkb38e~T7FB1ViOy+0<eHqK;EQc6p)9)4F3Rq&=v=+0M6k9#`p5T&VlNlyO`%S
zH>SG_stU0Qrh8wh_rJUPSJ4AaVF(@Sw0Za32`DoT&_*57z0c`rG)iEItt5U>y}-n#
zUazOHfE59G4rFkER6w)a?TYq>m<yr}1F3+9)B!1_1aL!Z&N`mKBD@h+a>C>Bcs$kO
Y8>bhUV^2HPhX4Qo07*qoM6N<$f;b57WdHyG

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_receipt.xml b/app/src/main/res/layout/activity_receipt.xml
index c3bcd8b..c984672 100644
--- a/app/src/main/res/layout/activity_receipt.xml
+++ b/app/src/main/res/layout/activity_receipt.xml
@@ -13,7 +13,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#FFFFFF"
+        android:background="#F5F5F5"
         tools:context=".ReceiptActivity">
 
         <!-- Red Status Bar (Override purple) -->
@@ -28,7 +28,7 @@
         <View
             android:id="@+id/red_header_background"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="120dp"
             android:background="#E31937"
             app:layout_constraintTop_toBottomOf="@id/red_status_bar"/>
 
@@ -40,18 +40,19 @@
             android:orientation="horizontal"
             android:gravity="center_vertical"
             android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="8dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/red_status_bar"
-            app:layout_constraintBottom_toBottomOf="@id/red_header_background">
+            app:layout_constraintTop_toBottomOf="@id/red_status_bar">
 
             <!-- Back Arrow -->
             <ImageView
                 android:id="@+id/backArrow"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
                 android:src="@drawable/ic_arrow_back"
+                android:tint="@android:color/white"
                 android:contentDescription="Kembali" />
 
             <!-- Title Text -->
@@ -62,22 +63,22 @@
                 android:layout_marginStart="8dp"
                 android:text="Kembali"
                 android:textColor="@android:color/white"
-                android:textSize="14sp"
+                android:textSize="16sp"
                 android:fontFamily="@font/inter"/>
 
         </LinearLayout>
 
-        <!-- Receipt Card -->
+        <!-- Receipt Card - Positioned to overlap header by half -->
         <androidx.cardview.widget.CardView
             android:id="@+id/receipt_card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="60dp"
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="12dp"
-            app:cardElevation="4dp"
-            app:layout_constraintTop_toBottomOf="@id/red_header_background">
+            app:cardElevation="8dp"
+            app:layout_constraintTop_toBottomOf="@id/red_status_bar">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -94,23 +95,31 @@
                     android:layout_marginBottom="16dp">
 
                     <!-- EDC Merchant Logo/Text -->
-                    <TextView
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="EDC"
-                        android:textColor="#E31937"
-                        android:textSize="24sp"
-                        android:textStyle="bold"
-                        android:fontFamily="@font/inter"/>
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Merchant"
-                        android:textColor="#3F51B5"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        android:fontFamily="@font/inter"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="EDC "
+                            android:textColor="#E31937"
+                            android:textSize="24sp"
+                            android:textStyle="bold"
+                            android:fontFamily="@font/inter"/>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Merchant"
+                            android:textColor="#3F51B5"
+                            android:textSize="24sp"
+                            android:textStyle="bold"
+                            android:fontFamily="@font/inter"/>
+
+                    </LinearLayout>
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -119,7 +128,7 @@
                         android:textColor="#333333"
                         android:textSize="12sp"
                         android:fontFamily="@font/inter"
-                        android:layout_marginTop="4dp"/>
+                        android:layout_marginTop="2dp"/>
 
                 </LinearLayout>
 
@@ -443,40 +452,75 @@
             </LinearLayout>
         </androidx.cardview.widget.CardView>
 
-        <!-- Action Buttons -->
+        <!-- Action Buttons (Print & Email) -->
         <LinearLayout
+            android:id="@+id/action_buttons_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_margin="16dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
             app:layout_constraintTop_toBottomOf="@id/receipt_card">
 
             <!-- Print Button -->
-            <Button
+            <LinearLayout
                 android:id="@+id/print_button"
                 android:layout_width="0dp"
-                android:layout_height="48dp"
+                android:layout_height="56dp"
                 android:layout_weight="1"
                 android:layout_marginEnd="8dp"
-                android:text="📄 Cetak Ulang"
-                android:textColor="#666666"
-                android:textSize="14sp"
+                android:orientation="horizontal"
+                android:gravity="center"
                 android:background="@drawable/button_secondary_background"
-                android:fontFamily="@font/inter"/>
+                android:clickable="true"
+                android:focusable="true">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ic_print"
+                    android:tint="#666666"
+                    android:layout_marginEnd="8dp"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Cetak Ulang"
+                    android:textColor="#666666"
+                    android:textSize="14sp"
+                    android:fontFamily="@font/inter"/>
+
+            </LinearLayout>
 
             <!-- Email Button -->
-            <Button
+            <LinearLayout
                 android:id="@+id/email_button"
                 android:layout_width="0dp"
-                android:layout_height="48dp"
+                android:layout_height="56dp"
                 android:layout_weight="1"
                 android:layout_marginStart="8dp"
-                android:text="📧 Email"
-                android:textColor="#666666"
-                android:textSize="14sp"
+                android:orientation="horizontal"
+                android:gravity="center"
                 android:background="@drawable/button_secondary_background"
-                android:fontFamily="@font/inter"/>
+                android:clickable="true"
+                android:focusable="true">
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ic_email"
+                    android:tint="#666666"
+                    android:layout_marginEnd="8dp"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Email"
+                    android:textColor="#666666"
+                    android:textSize="14sp"
+                    android:fontFamily="@font/inter"/>
+
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -484,16 +528,17 @@
         <Button
             android:id="@+id/finish_button"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_margin="16dp"
-            android:layout_marginTop="8dp"
+            android:layout_height="56dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="24dp"
             android:text="Selesai"
             android:textColor="@android:color/white"
             android:textSize="16sp"
             android:textStyle="bold"
-            android:background="@drawable/button_active_background"
+            android:background="@drawable/button_finish_background"
             android:fontFamily="@font/inter"
-            app:layout_constraintTop_toBottomOf="@id/receipt_card"
+            app:layout_constraintTop_toBottomOf="@id/action_buttons_container"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintVertical_bias="0"/>