diff --git a/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt b/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt
index e09ec1f9ad1c6eb42017da0fe494eb3e616abc74..73f7443100d0db74b380e1920423822e34ea456b 100644
--- a/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt
+++ b/app/src/main/java/com/example/bondoman/activities/LoginActivity.kt
@@ -57,8 +57,6 @@ class LoginActivity : AppCompatActivity() {
cardLogin.visibility = CardView.VISIBLE
}, 1000)
-
-
val securePreferences = SecurePreferences(this)
loginRepository = AuthRepository(securePreferences)
if(securePreferences.getToken() != null){
diff --git a/app/src/main/res/layout/activity_add_transaksi.xml b/app/src/main/res/layout/activity_add_transaksi.xml
index c609127d78578b71d585cae6904768f93cac3b4f..730a173cf2e35217c373b5e05c33e57e9cc45478 100644
--- a/app/src/main/res/layout/activity_add_transaksi.xml
+++ b/app/src/main/res/layout/activity_add_transaksi.xml
@@ -56,12 +56,13 @@
<EditText
android:id="@+id/editTextTitle"
android:layout_width="match_parent"
+ android:minHeight="50dp"
android:layout_height="wrap_content"
android:background="@drawable/edittext_enabled"
android:paddingVertical="6dp"
android:paddingHorizontal="12dp"
android:layout_marginBottom="8dp"
- android:hint="Title" />
+ android:hint="New Title" />
<TextView
android:id="@+id/textViewAmountLabel"
@@ -70,18 +71,19 @@
android:text="Amount"
android:layout_marginBottom="8dp"
android:layout_alignParentTop="true"
- android:layout_alignParentStart="true" />
+ android:layout_alignParentStart="true"
+ />
<EditText
android:id="@+id/editTextAmount"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/edittext_enabled"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content" android:background="@drawable/edittext_enabled"
android:inputType="numberDecimal"
android:paddingVertical="6dp"
android:paddingHorizontal="12dp"
android:layout_marginBottom="8dp"
- android:hint="Amount" />
+ android:hint="New Amount" />
<TextView
android:id="@+id/textViewLocationLabel"
@@ -95,12 +97,12 @@
<EditText
android:id="@+id/editTextLocation"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/edittext_enabled"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content" android:background="@drawable/edittext_enabled"
android:paddingVertical="6dp"
android:paddingHorizontal="12dp"
android:layout_marginBottom="8dp"
- android:hint="Location" />
+ android:hint="New Location" />
</LinearLayout>
diff --git a/app/src/main/res/layout/activity_edit_transaksi.xml b/app/src/main/res/layout/activity_edit_transaksi.xml
index 717af90fea4a0ebd04ecc046750dbeef1e2bbd87..c4d342ec6a48a4228f6a869fefbad2ed5b017a36 100644
--- a/app/src/main/res/layout/activity_edit_transaksi.xml
+++ b/app/src/main/res/layout/activity_edit_transaksi.xml
@@ -29,10 +29,13 @@
android:layout_height="wrap_content"
android:inputType="none"
android:background="@drawable/edittext_disabled"
- android:paddingVertical="6dp"
+ android:paddingVertical="15dp"
android:paddingHorizontal="12dp"
android:layout_marginBottom="8dp"
- android:hint="Select Date" />
+ android:hint="Select Date"
+ android:textColor="@color/black"
+ android:textColorHint="@color/black"
+ />
<TextView
android:id="@+id/textViewTypeLabel"
@@ -46,13 +49,15 @@
<TextView
android:id="@+id/editTextType"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="none"
+ android:layout_height="wrap_content" android:inputType="none"
android:background="@drawable/edittext_disabled"
- android:paddingVertical="6dp"
+ android:paddingVertical="15dp"
android:paddingHorizontal="12dp"
android:layout_marginBottom="8dp"
- android:hint="Income" />
+ android:hint="Income"
+ android:textColor="@color/black"
+ android:textColorHint="@color/black"
+ />
<TextView
android:id="@+id/textViewTitleLabel"
@@ -66,8 +71,8 @@
<EditText
android:id="@+id/editTextTitle"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/edittext_enabled"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content" android:background="@drawable/edittext_enabled"
android:paddingVertical="6dp"
android:paddingHorizontal="12dp"
android:layout_marginBottom="8dp"
@@ -85,8 +90,8 @@
<EditText
android:id="@+id/editTextAmount"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/edittext_enabled"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content" android:background="@drawable/edittext_enabled"
android:inputType="numberDecimal"
android:paddingVertical="6dp"
android:paddingHorizontal="12dp"
@@ -105,8 +110,8 @@
<EditText
android:id="@+id/editTextLocation"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/edittext_enabled"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content" android:background="@drawable/edittext_enabled"
android:paddingVertical="6dp"
android:paddingHorizontal="12dp"
android:layout_marginBottom="8dp"
@@ -121,7 +126,9 @@
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:textStyle="italic"
- android:layout_gravity="right"/>
+ android:layout_gravity="right"
+ android:paddingVertical="15dp"
+ />
</LinearLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 085884ffeff8088dcd67fb6a8931f290ab9ccdc9..4a69b134b96699cd695d8851fbe6634402504b2c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -76,12 +76,16 @@
android:textSize="14sp" />
<EditText
android:layout_width="match_parent"
- android:layout_height="40dp"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content"
android:id="@+id/email"
android:inputType="textEmailAddress"
android:background="@drawable/input_bg"
android:layout_marginTop="10dp"
android:paddingHorizontal="15dp"
+ android:hint="example@gmail.com"
+ android:labelFor="@id/email"
+ android:textColor="@color/black"
/>
</LinearLayout>
<LinearLayout
@@ -106,12 +110,13 @@
<EditText
android:layout_width="match_parent"
- android:layout_height="40dp"
- android:id="@+id/password"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content" android:id="@+id/password"
android:background="@drawable/input_bg"
android:layout_marginTop="10dp"
android:paddingHorizontal="15dp"
android:inputType="textPassword"
+ android:hint="@string/password"
/>
</com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index be2dba81140f7a73a50ec9f94977ee33dc081953..36168988eaeecfdd9cc1b43de6d5c692bd2f5e27 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,7 +31,10 @@
android:background="?android:attr/windowBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
- app:menu="@menu/menu_nav"/>
+ app:menu="@menu/menu_nav"
+ app:itemTextAppearanceActive="@style/BottomNavigationTextAppearance"
+ app:itemTextAppearanceInactive="@style/BottomNavigationTextAppearance"
+ />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
@@ -48,5 +51,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- app:menu="@menu/menu_nav"/>
+ app:menu="@menu/menu_nav"
+ app:itemTextAppearanceActive="@style/BottomNavigationTextAppearance"
+ app:itemTextAppearanceInactive="@style/BottomNavigationTextAppearance"
+ />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml
index b47b56b53d88dcf5a1a470282cad5423c71d994d..746ad69098a2e3116629f91010a3165fb718c982 100644
--- a/app/src/main/res/layout/fragment_scan.xml
+++ b/app/src/main/res/layout/fragment_scan.xml
@@ -21,20 +21,23 @@
android:background="@drawable/ellipse1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ android:contentDescription="@string/camera_button"
+ />
<Button
android:id="@+id/pick_image"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="30dp"
-
android:background="@drawable/gallery"
android:elevation="2dp"
app:layout_constraintTop_toTopOf="@+id/captureButton"
app:layout_constraintBottom_toBottomOf="@+id/captureButton"
app:layout_constraintStart_toStartOf="@id/vertical_centerline"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintVertical_bias="0.5" />
+ app:layout_constraintVertical_bias="0.5"
+ android:contentDescription="@string/gallery_button"
+ />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/vertical_centerline"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 38b1d48794ae75ba6aca6ae18494660b78b0429b..f432bdb41d72341ec714f91a8174c97efda359ae 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -15,7 +15,8 @@
<LinearLayout
android:id="@+id/settings_linear_layout"
- android:layout_width="329dp"
+ android:maxWidth="340dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/bg_color"
diff --git a/app/src/main/res/layout/fragment_transaksi.xml b/app/src/main/res/layout/fragment_transaksi.xml
index 0ea9128419aa3941976e030f41e8f864fae2febf..5e67b59cb36b57406bdaf6faff08bceaa362e385 100644
--- a/app/src/main/res/layout/fragment_transaksi.xml
+++ b/app/src/main/res/layout/fragment_transaksi.xml
@@ -19,7 +19,10 @@
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:src="@drawable/plus"
- app:backgroundTint="@color/green" />
+ app:backgroundTint="@color/green"
+ android:labelFor="@id/add_button"
+ android:contentDescription="add transaction"
+ />
</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_twibbon.xml b/app/src/main/res/layout/fragment_twibbon.xml
index 0a2e513ef3ae923ba1b7f2a939fb0607831d5f8d..611f280e9b45ee014f1ded86f03f2d14ae7f9bcc 100644
--- a/app/src/main/res/layout/fragment_twibbon.xml
+++ b/app/src/main/res/layout/fragment_twibbon.xml
@@ -76,13 +76,16 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/twibbon_1"
- android:layout_marginEnd="10dp"/>
+ android:layout_marginEnd="10dp"
+ android:contentDescription="@string/twibbon_1"
+ />
<Button
android:id="@+id/button2"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/twibbon_2"
+ android:contentDescription="@string/twibbon_2"
android:layout_marginEnd="10dp"/>
<Button
@@ -90,6 +93,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/twibbon_3"
+ android:contentDescription="@string/twibbon_3"
android:layout_marginEnd="10dp"/>
<Button
@@ -97,12 +101,16 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/twibbon_4"
- android:layout_marginEnd="10dp"/>
+ android:layout_marginEnd="10dp"
+ android:contentDescription="@string/twibbon_4"
+ />
<Button
android:id="@+id/button5"
android:layout_width="80dp"
android:layout_height="80dp"
- android:background="@drawable/twibbon_5"/>
+ android:background="@drawable/twibbon_5"
+ android:contentDescription="@string/twibbon_5"
+ />
<!-- Add more buttons as needed -->
@@ -111,8 +119,10 @@
<Button
android:id="@+id/image_capture_button"
- android:layout_width="90dp"
- android:layout_height="50dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minWidth="90dp"
+ android:minHeight="50dp"
android:layout_marginTop="20dp"
android:background="@drawable/button_green"
android:textColor="@color/white"
@@ -120,6 +130,7 @@
android:text="CAPTURE"
app:layout_constraintTop_toBottomOf="@id/viewFinder"/>
+
</LinearLayout>
</ScrollView>
diff --git a/app/src/main/res/menu/menu_nav.xml b/app/src/main/res/menu/menu_nav.xml
index cdd76e328df38e28eb21be38cc072a13187bf2fe..b198e3796d744c38b1eb36e788f49b82bd75e9f2 100644
--- a/app/src/main/res/menu/menu_nav.xml
+++ b/app/src/main/res/menu/menu_nav.xml
@@ -3,7 +3,8 @@
<item
android:id="@+id/transaksiFragment"
android:title="Transaction"
- android:icon="@drawable/menu_transaction"/>
+ android:icon="@drawable/menu_transaction"
+ />
<item
android:id="@+id/scanFragment"
android:title="Scan"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 03a2e2838115a1a2fd08d4a36fc55c9c8f5187bd..17cd4a69245fee325c218d9c56f66a365cf69320 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,9 +2,9 @@
<resources>
<color name="bg_color">#FFFFFF</color>
<color name="primary_color">#F1E4C3</color>
- <color name="secondary_color">#597E52</color>
+ <color name="secondary_color">#3b5237</color>
+ <color name="secondary_green">#3b5237</color>
<color name="text_color">#000000</color>
-<!-- <color name="white">#FFFFFF</color>-->
<color name="shadow_color">#D9D9D9</color>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
@@ -15,6 +15,6 @@
<color name="white">#FFFFFFFF</color>
<color name="gray">#D9D9D9</color>
<color name="brown_1">#F1E4C3</color>
- <color name="brown_2">#C6A969</color>
- <color name="green">#597E52</color>
+ <color name="brown_2">#473205</color>
+ <color name="green">#3b5237</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f76093b3d5e56939e774a24951dd146886cec5b6..6a7cd91bacc1dd7ded46460965bd11e3f450987f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
<resources>
<string name="app_name">BondoMan</string>
- <!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="save_button_text">Export transaction list</string>
<string name="send_button_text">Send transaction to email</string>
@@ -8,4 +7,12 @@
<string name="data_transaksi_title">Transaction Data</string>
<string name="randomize_buton_text">Randomize transaction</string>
<string name="items">Items</string>
+ <string name="camera_button">Capture photo</string>
+ <string name="gallery_button">Pick image from gallery</string>
+ <string name="password">Password</string>
+ <string name="twibbon_1">First Twibbon</string>
+ <string name="twibbon_2">Second Twibbon</string>
+ <string name="twibbon_3">Third Twibbon</string>
+ <string name="twibbon_4">Fourth Twibbon</string>
+ <string name="twibbon_5">Fifth Twibbon</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5e4c951883171ae5126754304c648e772587ed15..39fb77290eb642770f1a45666c41488c4d571239 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="BottomNavigationTheme" parent="Theme.AppCompat.Light">
- <item name="colorPrimary">@color/green</item>
+ <item name="colorPrimary">@color/secondary_green</item>
<item name="android:textColorSecondary">@color/brown_2</item>
+ <item name="android:textSize">16sp</item> <!-- Adjust the text size as needed -->
+
</style>
+ <style name="BottomNavigationTextAppearance" parent="TextAppearance.Design.Tab">
+ <item name="android:textSize">14sp</item>
+ <item name="colorPrimary">@color/secondary_green</item>
+ </style>
</resources>
\ No newline at end of file