diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 76bdcfcf12935651cbf15e37c8835f9e9e4d9c49..82f1d54ca84923f40953004257bc3d8fca3d6139 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -14,39 +14,36 @@
android:id="@+id/transactionText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center"
- android:padding="16dp"
- android:text="Settings"
- android:textColor="?attr/colorSecondary"
- android:textSize="20sp"
- android:fontFamily="@font/playfairdisplay_extrabold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:contentDescription="settings"/>
+ android:gravity="center"
+ android:padding="16dp"
+ android:text="@string/title_settings"
+ android:textColor="?attr/colorSecondary"
+ style="@style/Headline3" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/formLayout"
- android:layout_width="350dp"
+ android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transactionText"
- app:layout_constraintBottom_toBottomOf="parent">
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_margin="10dp">
<TextView
android:id="@+id/generalLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="center"
- android:text="General"
- android:textColor="@color/N1"
- android:textSize="15sp"
- android:fontFamily="@font/playfairdisplay_semibold"
- android:layout_marginTop="15dp"
app:layout_constraintTop_toTopOf="@id/formLayout"
app:layout_constraintStart_toStartOf="parent"
- android:contentDescription="general title" />
+ android:layout_marginTop="15dp"
+ android:gravity="center"
+ android:text="@string/label_general"
+ android:textColor="?attr/colorSecondary"
+ style="@style/Label" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/saveLayout"
@@ -57,39 +54,40 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="5dp"
- android:background="@drawable/rounded_input_field"
- android:contentDescription="save to local button">
+ android:background="@drawable/rounded_input_field">
<ImageView
android:id="@+id/downloadLogo"
android:layout_width="15dp"
android:layout_height="15dp"
- android:src="@drawable/download_ic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="5dp"
- android:contentDescription="download logo"/>
+ android:src="@drawable/download_ic"
+ android:contentDescription="@string/alt_download_icon"
+ app:tint="?attr/colorSecondary" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="Save to local"
- android:textSize="16sp"
- android:layout_marginStart="15dp"
- android:fontFamily="@font/poppins_regular"
app:layout_constraintStart_toEndOf="@id/downloadLogo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- android:contentDescription="save to local"/>
+ android:layout_marginStart="15dp"
+ android:text="@string/save_to_local"
+ android:textColor="?attr/colorSecondary"
+ style="@style/Body1" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/rightarrow_dark_ic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toBottomOf="parent" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:src="@drawable/rightarrow_dark_ic"
+ android:contentDescription="@string/alt_right_arrow"
+ app:tint="?attr/colorSecondary"/>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -97,44 +95,45 @@
android:id="@+id/shareLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:padding="7dp"
app:layout_constraintTop_toBottomOf="@id/saveLayout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="5dp"
- android:background="@drawable/rounded_input_field"
- android:contentDescription="save to local button">
+ android:padding="7dp"
+ android:background="@drawable/rounded_input_field">
<ImageView
android:id="@+id/shareLogo"
android:layout_width="15dp"
android:layout_height="15dp"
- android:src="@drawable/share_ic"
+ android:layout_marginStart="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- android:layout_marginStart="5dp"
- android:contentDescription="share logo"/>
+ android:src="@drawable/share_ic"
+ android:contentDescription="@string/alt_share_icon"
+ app:tint="?attr/colorSecondary"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="Share via email"
- android:textSize="16sp"
- android:layout_marginStart="15dp"
- android:fontFamily="@font/poppins_regular"
app:layout_constraintStart_toEndOf="@id/shareLogo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- android:contentDescription="share via email"/>
+ android:layout_marginStart="15dp"
+ android:text="@string/share_via_email"
+ android:textColor="?attr/colorSecondary"
+ style="@style/Body1" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/rightarrow_dark_ic"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toBottomOf="parent" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:src="@drawable/rightarrow_dark_ic"
+ android:contentDescription="@string/alt_right_arrow"
+ app:tint="?attr/colorSecondary"/>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -142,50 +141,47 @@
android:id="@+id/preferencesLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="center"
- android:text="Preferences"
- android:textColor="@color/N1"
- android:textSize="15sp"
- android:fontFamily="@font/playfairdisplay_semibold"
- android:layout_marginTop="25dp"
app:layout_constraintTop_toBottomOf="@id/shareLayout"
app:layout_constraintStart_toStartOf="parent"
- android:contentDescription="preferences title" />
+ android:layout_marginTop="25dp"
+ android:gravity="center"
+ android:text="@string/label_preferences"
+ android:textColor="?attr/colorSecondary"
+ style="@style/Label" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/randomizeLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:padding="7dp"
app:layout_constraintTop_toBottomOf="@id/preferencesLabel"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="5dp"
- android:background="@drawable/rounded_input_field"
- android:contentDescription="randomize button">
+ android:padding="7dp"
+ android:background="@drawable/rounded_input_field">
<ImageView
android:id="@+id/randomizeLogo"
android:layout_width="15dp"
android:layout_height="15dp"
- android:src="@drawable/randomize_ic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="5dp"
- android:contentDescription="download logo"/>
+ android:src="@drawable/randomize_ic"
+ android:contentDescription="@string/alt_right_arrow"
+ app:tint="?attr/colorSecondary" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="Randomize transaction"
- android:textSize="16sp"
- android:layout_marginStart="15dp"
- android:fontFamily="@font/poppins_regular"
app:layout_constraintStart_toEndOf="@+id/randomizeLogo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- android:contentDescription="randomize transaction"/>
+ android:layout_marginStart="15dp"
+ android:text="@string/randomize_transaction"
+ android:textColor="?attr/colorSecondary"
+ style="@style/Body1"/>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/switchRandomize"
@@ -201,46 +197,46 @@
android:id="@+id/logoutLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:padding="7dp"
app:layout_constraintTop_toBottomOf="@id/randomizeLayout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="50dp"
- android:background="@drawable/rounded_input_field"
- android:contentDescription="logout button">
+ android:padding="7dp"
+ android:background="@drawable/rounded_input_field">
<ImageView
android:id="@+id/logoutLogo"
android:layout_width="15dp"
android:layout_height="15dp"
- android:src="@drawable/logout_ic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="5dp"
- android:contentDescription="logout logo"/>
+ android:src="@drawable/logout_ic"
+ android:contentDescription="@string/alt_logout_icon"
+ app:tint="?attr/colorError"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="Logout"
- android:textSize="16sp"
- android:layout_marginStart="15dp"
- android:textColor="@color/R3"
- android:fontFamily="@font/poppins_regular"
app:layout_constraintStart_toEndOf="@+id/logoutLogo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- android:contentDescription="logout"/>
+ android:layout_marginStart="15dp"
+ android:text="@string/logout"
+ android:textColor="?attr/colorError"
+ style="@style/Body1"/>
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
- android:src="@drawable/rightarrow_red_ic"
- android:layout_marginEnd="5dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toBottomOf="parent" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginEnd="5dp"
+ android:src="@drawable/rightarrow_red_ic"
+ android:contentDescription="@string/alt_right_arrow"
+ app:tint="?attr/colorError"/>
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 6516270bf4a5595f306d77b0358f6f2ed7b7342b..6e69fa93f801eae36054444cc33f1782e5a99db3 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -14,6 +14,7 @@
<item name="colorSecondaryFixedDim">@color/N4</item>
<item name="colorAccent">@color/G5</item>
+ <itme name="colorError">@color/R3</itme>
<item name="colorButtonNormal">@color/N1</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aa2440def4e284d606e3c19ba992b284395af302..2284eced64828670d9079c81f6bb050e02208f3d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,6 +21,7 @@
<color name="R3">#F9ADAD</color>
<color name="R4">#EE7777</color>
<color name="R5">#F06666</color>
+ <color name="R6">#C14A4A</color>
<color name="R7">#8E2E2E</color>
<!-- Blue -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7bfc9fab83294e918c04f500d57161242d97fdf7..6359cf0a53e211e5e65703f7b706dbe9d15c7f4b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,17 +5,20 @@
<string name="title_transactions">Transactions</string>
<string name="title_new_transaction">New Transaction</string>
<string name="title_transaction_detail">Transaction Detail</string>
+ <string name="title_settings">Settings</string>
- <!-- Splash Screen -->
+ <!-- Fixed -->
<string name="bondo">Bondo</string>
<string name="man">Man</string>
<string name="version_number">Ver 1.0.0</string>
<string name="footer">Developed by DGR</string>
+ <string name="save_to_local">Save to local</string>
<!-- Button -->
<string name="btn_save">Save</string>
<string name="btn_edit">Edit</string>
<string name="btn_login">Login</string>
+ <string name="btn_delete">Delete</string>
<!-- Placeholder -->
<string name="empty_amount">Rp 0</string>
@@ -36,6 +39,8 @@
<string name="label_category">Category</string>
<string name="label_amount">Amount (Rp)</string>
<string name="label_location">Location</string>
+ <string name="label_general">General</string>
+ <string name="label_preferences">Preferences</string>
<!-- Hint -->
<string name="hint_transaction_title">Transaction title</string>
@@ -50,6 +55,12 @@
<string name="alt_logo">Bondoman logo</string>
<string name="alt_fab">Add transaction</string>
<string name="alt_transaction_icon">transaction_icon</string>
- <string name="btn_delete">Delete</string>
+ <string name="alt_right_arrow">Right arrow</string>
+ <string name="alt_download_icon">Download icon</string>
+ <string name="alt_share_icon">Share icon</string>
+ <string name="share_via_email">Share via email</string>
+ <string name="randomize_transaction">Randomize transaction</string>
+ <string name="alt_logout_icon">Logout icon</string>
+ <string name="logout">Logout</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 303473757aaacdeef9e1ee4533eb3d56a9e79e8c..6e6b8e52541692f87c3ee0146b8ad10432470145 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,6 +13,7 @@
<item name="colorSecondaryFixedDim">@color/N4</item>
<item name="colorAccent">@color/G5</item>
+ <itme name="colorError">@color/R6</itme>
<item name="colorButtonNormal">@color/N1</item>