diff --git a/bondoman/app/src/main/res/layout/fragment_transaction_page.xml b/bondoman/app/src/main/res/layout/fragment_transaction_page.xml index 24e74d8963d2341d1e36d126131da1f6b22b92b1..4bb602a7a87634458761bc0ffdff42414dd38191 100644 --- a/bondoman/app/src/main/res/layout/fragment_transaction_page.xml +++ b/bondoman/app/src/main/res/layout/fragment_transaction_page.xml @@ -22,7 +22,8 @@ android:id="@+id/balance_transaction" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="25sp" + android:paddingStart="25sp" + android:paddingEnd="0sp" android:layout_marginTop="30dp" android:orientation="vertical" app:layout_constraintTop_toBottomOf="@id/header_layout" @@ -33,7 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="10dp" - android:text="Arta Sampeyan" + android:text="@string/transaction_balance" android:textSize="14sp" android:textStyle="normal|bold" android:textColor="@color/secondary" @@ -71,7 +72,7 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_marginBottom="10dp" android:layout_marginEnd="20dp" - android:text="+" + android:text="@string/transaction_add" android:background="@drawable/round_button" /> diff --git a/bondoman/app/src/main/res/layout/item_transaction.xml b/bondoman/app/src/main/res/layout/item_transaction.xml index 57cfd7f01a8c81043990d14bb008e31702d4cd21..0cc73b49b1afb21ad856053f106e597ef5e23c92 100644 --- a/bondoman/app/src/main/res/layout/item_transaction.xml +++ b/bondoman/app/src/main/res/layout/item_transaction.xml @@ -9,9 +9,10 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="20dp" + android:layout_margin="15dp" android:orientation="horizontal" app:layout_constraintTop_toTopOf="parent" + android:baselineAligned="false" > <LinearLayout @@ -20,7 +21,7 @@ android:layout_weight="1.3" android:orientation="vertical" android:layout_gravity="center" - > + tools:ignore="UseCompoundDrawables"> <ImageView android:id="@+id/image_transaction" @@ -28,6 +29,7 @@ android:layout_height="60dp" tools:src="@drawable/expenses_logo" android:layout_gravity="center" + android:contentDescription="@string/item_transaction_logo" /> <TextView @@ -48,8 +50,8 @@ android:layout_height="wrap_content" android:layout_weight="3" android:orientation="vertical" - android:layout_marginLeft="2dp" - android:layout_marginRight="5dp" + android:layout_marginStart="2dp" + android:layout_marginEnd="5dp" android:layout_gravity="center" > @@ -57,7 +59,7 @@ android:id="@+id/description_transaction" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Kerupuk Kulit" + android:text="@string/item_transaction_judul" android:fontFamily="@font/font_poppins" android:textColor="@color/black" android:textSize="20sp" @@ -69,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="@font/font_poppins" - android:text="IDR5.000" + android:text="@string/item_transaction_price" android:textColor="@color/black" android:textSize="20sp" android:textStyle="normal" @@ -81,7 +83,7 @@ <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="2" + android:layout_weight="2.3" android:orientation="vertical" android:layout_gravity="center" > @@ -93,25 +95,27 @@ android:fontFamily="@font/font_poppins" android:layout_gravity="end" android:gravity="end" - android:text="14/03/2024" + android:text="@string/item_transaction_date" android:textColor="@color/black" - android:textSize="14sp" + android:textSize="12sp" android:textStyle="normal" app:layout_constraintStart_toEndOf="@id/description_transaction" /> <Button android:id="@+id/edit_button" android:layout_width="wrap_content" - android:layout_height="30sp" + android:layout_height="wrap_content" android:layout_gravity="end" - android:gravity="end" - android:textSize="20sp" - android:fontFamily="@font/font_poppins" android:background="@android:color/transparent" - android:drawableLeft="@drawable/baseline_edit_24" - android:paddingLeft="8dp" + android:contentDescription="@string/item_transaction_edit" + android:drawableStart="@drawable/baseline_edit_24" + android:fontFamily="@font/font_poppins" + android:gravity="bottom" + android:paddingStart="20dp" + android:paddingEnd="0dp" + android:text="@string/item_transaction_edit" android:textAllCaps="false" - android:text="Edit" /> + android:textSize="20sp" /> <LinearLayout android:id="@+id/linear_layout_transaction" @@ -120,14 +124,12 @@ android:orientation="horizontal" android:gravity="end" android:clickable="true" - - - > + tools:ignore="UseCompoundDrawables"> <ImageView android:layout_width="24dp" android:layout_height="24dp" android:src="@drawable/map_logo" - android:contentDescription="Map icon" + android:contentDescription="@string/item_transaction_map" android:layout_gravity="center" /> <TextView @@ -135,14 +137,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/font_poppins" - android:text="Seno Medika" + android:text="@string/item_transaction_location" android:textColor="@color/black" android:textSize="14sp" app:layout_constraintStart_toEndOf="@id/image_transaction" android:gravity="end" android:layout_gravity="center" /> - </LinearLayout> </LinearLayout> diff --git a/bondoman/app/src/main/res/values/strings.xml b/bondoman/app/src/main/res/values/strings.xml index eb88f3cce36aae38697dee778edb629e154d2ea4..94f0cdf9abe4c833e81e4a5e9c29dda73fd431f3 100644 --- a/bondoman/app/src/main/res/values/strings.xml +++ b/bondoman/app/src/main/res/values/strings.xml @@ -13,7 +13,7 @@ <string name="defCategory">Category</string> - <!-- Tambah Transaksi--> + <!-- Tambah Transaksi --> <string name="label_judul">Judhul</string> <string name="label_nominal">Rega</string> <string name="label_kategori">Bab</string> @@ -26,8 +26,35 @@ <string name="kategori_pengeluaran">Pengeluaran</string> <string name="kategori_pemasukan">Pemasukan</string> <string name="scan_header">SCAN</string> + <string name="twibbon_header">TWIBBON</string> <string name="tumbas_header">TUMBAS</string> <string name="graf_header">GRAF</string> <string name="settings_header">PENATANAN</string> + <!-- Twibbon Page --> + <string name="twibbon_after_take">retake? click the shutter button again</string> + <string name="twibbon_back">Back to scan page</string> + <string name="twibbon_frame">Twibbon frame</string> + <string name="twibbon_take_picture">Take picture</string> + <string name="twibbon_flip_camera">Flip camera</string> + + <!-- Scan Page --> + <string name="scan_take_picture">Take picture</string> + <string name="scan_to_twibbon_1">Looking for twibbon?</string> + <string name="scan_to_twibbon_2">click here</string> + <string name="select_photos">" select photos "</string> + + <!-- Item Transaction --> + <string name="item_transaction_edit">Edit</string> + <string name="item_transaction_map">Map icon</string> + <string name="item_transaction_judul">Kerupuk Kulit</string> + <string name="item_transaction_price">IDR5.000</string> + <string name="item_transaction_date">14/03/2024</string> + <string name="item_transaction_location">Seno Medika</string> + <string name="item_transaction_logo">Tumbas or upah logo</string> + + <!-- Transaction Page --> + <string name="transaction_balance">Arta Sampeyan</string> + <string name="transaction_add">+</string> + </resources> \ No newline at end of file