diff --git a/app/src/main/res/drawable/baseline_add_24.xml b/app/src/main/res/drawable/baseline_add_24.xml
index 622c544ab8b7359d1e3e2a955239cf3eb0eb9fef..067a32546e29187c14e397455c7f5f1772238b2f 100644
--- a/app/src/main/res/drawable/baseline_add_24.xml
+++ b/app/src/main/res/drawable/baseline_add_24.xml
@@ -1,5 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="20dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="20dp">
- <path android:fillColor="@android:color/black" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index bb24e754c314385258772648f15159cab3fa595a..7d82186c5b7687ac6907370521f94a960ff42da3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -32,6 +32,7 @@
app:layout_constraintTop_toBottomOf="@+id/appName"
app:layout_constraintVertical_bias="0.5"
app:layout_constraintVertical_chainStyle="packed"
+ app:boxStrokeColor="@color/black"
>
<com.google.android.material.textfield.TextInputEditText
@@ -40,7 +41,9 @@
android:layout_height="wrap_content"
android:ems="10"
android:maxLength="255"
- android:hint="Email"
+ android:hint="@string/email"
+ app:boxStrokeColor="@color/black"
+ android:textColorHint="@color/black"
android:inputType="textEmailAddress"
android:outlineAmbientShadowColor="#000000"
android:outlineProvider="background" />
@@ -61,6 +64,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/formEmailContainer"
app:layout_constraintVertical_bias="0.5"
+ app:boxStrokeColor="@color/black"
>
<com.google.android.material.textfield.TextInputEditText
@@ -69,7 +73,9 @@
android:layout_height="wrap_content"
android:maxLength="255"
android:ems="10"
- android:hint="Password"
+ android:hint="@string/password"
+ app:boxStrokeColor="@color/black"
+ android:textColorHint="@color/black"
android:inputType="textPassword"
/>
@@ -82,7 +88,7 @@
android:layout_marginHorizontal="20dp"
android:layout_height="match_parent"
android:layout_marginTop="36dp"
- android:text="Sign in"
+ android:text="@string/sign_in"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -97,7 +103,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="@font/roboto_medium"
- android:text="Welcome back to"
+ android:text="@string/greeting"
android:textColor="#000000"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/appName"
@@ -115,7 +121,7 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="64dp"
android:fontFamily="@font/carter_one"
- android:text="Bondoman"
+ android:text="@string/bondoman"
android:textColor="#9759C4"
android:textSize="24sp"
android:textStyle="bold"
diff --git a/app/src/main/res/layout/fragment_form_transaction.xml b/app/src/main/res/layout/fragment_form_transaction.xml
index 5728f18d2cccff73365964db6ff6b8fe7c7e9866..a4a38caeb207bf6901300ab4f97058dc317c93b0 100644
--- a/app/src/main/res/layout/fragment_form_transaction.xml
+++ b/app/src/main/res/layout/fragment_form_transaction.xml
@@ -17,6 +17,7 @@
android:id="@+id/formTitleContainer"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
+ app:boxStrokeColor="@color/black"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="15dp"
@@ -30,6 +31,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:maxLength="255"
+ app:boxStrokeColor="@color/black"
+ android:textColorHint="@color/black"
android:hint="@string/title"
android:text="@={viewModel.title}"
android:inputType="text"
@@ -43,6 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
+ app:boxStrokeColor="@color/black"
android:layout_marginTop="5dp"
app:helperTextTextColor="@color/destructive"
app:layout_constraintEnd_toEndOf="parent"
@@ -54,6 +58,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:maxLength="10"
+ app:boxStrokeColor="@color/black"
+ android:textColorHint="@color/black"
android:hint="@string/amount"
android:text="@={viewModel.amount}"
android:inputType="number"
@@ -64,18 +70,29 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/formCategoryContainer"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+ android:hint="@string/category"
+ android:textColorHint="@color/black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="5dp"
- android:hint="@string/category"
app:helperTextTextColor="@color/destructive"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/formAmountContainer">
+ app:layout_constraintTop_toBottomOf="@id/formAmountContainer"
+ app:boxStrokeColor="@color/black"
+ >
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:labelFor="@+id/categoryAutocomplete"
+ android:text="@string/category"
+ />
<AutoCompleteTextView
android:id="@+id/categoryAutocomplete"
+ app:boxStrokeColor="@color/black"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="none"
@@ -90,7 +107,7 @@
android:minWidth="0dp"
android:minHeight="0dp"
android:layout_width="wrap_content"
- android:layout_height="0dp"
+ android:layout_height="48dp"
android:paddingTop="1dp"
android:paddingBottom="1dp"
android:layout_marginTop="8dp"
@@ -107,6 +124,7 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ app:boxStrokeColor="@color/black"
android:layout_marginHorizontal="20dp"
app:helperTextTextColor="@color/destructive"
app:layout_constraintEnd_toEndOf="parent"
@@ -117,6 +135,8 @@
android:id="@+id/formLocationEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ app:boxStrokeColor="@color/black"
+ android:textColorHint="@color/black"
android:hint="@string/location"
android:inputType="none"
android:text="@={viewModel.location}"
diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml
index c8e3171137f388fab023b820a73fa127cbd147cb..1d2f132569bc8d77f52b9dc35bb487f0dd95e4e8 100644
--- a/app/src/main/res/layout/fragment_scan.xml
+++ b/app/src/main/res/layout/fragment_scan.xml
@@ -40,6 +40,7 @@
<Button
android:id="@+id/captureButton"
+ android:contentDescription="@string/capture_photo"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginTop="16dp"
@@ -57,7 +58,7 @@
android:layout_height="52dp"
android:adjustViewBounds="true"
android:background="?attr/selectableItemBackgroundBorderless"
- android:contentDescription="Get Photo from Gallery"
+ android:contentDescription="@string/get_photo_from_gallery"
android:padding="10dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_gallery"
diff --git a/app/src/main/res/layout/fragment_transactions.xml b/app/src/main/res/layout/fragment_transactions.xml
index ffe0477ff9ab5319191c89ff94b0195cc7d1bffe..8dc4e7672f08b8e74824d5eec0b8fdae5fc9c1ed 100644
--- a/app/src/main/res/layout/fragment_transactions.xml
+++ b/app/src/main/res/layout/fragment_transactions.xml
@@ -25,9 +25,10 @@
android:layout_margin="16dp"
android:contentDescription="@string/add_transaction"
android:src="@drawable/baseline_add_24"
- android:backgroundTint="@color/primary"
- android:tint="@color/white"
+ app:backgroundTint="@color/primaryActive"
+ app:tint="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index 58927cd8ee50852868f44146fbb513194849ba1b..8f9ae85695d9e5c3c51856393458b5ab6a780966 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -4,22 +4,22 @@
<item
android:id="@+id/navigation_transactions"
android:icon="@drawable/ic_transactions"
- android:title="Transaction" />
+ android:title="@string/transaction" />
<item
android:id="@+id/navigation_scan"
android:icon="@drawable/ic_scan"
- android:title="Scan" />
+ android:title="@string/scan" />
<item
android:id="@+id/navigation_graph"
android:icon="@drawable/ic_graph"
- android:title="Graph" />
+ android:title="@string/graph" />
<item
android:id="@+id/navigation_settings"
android:icon="@drawable/ic_settings"
- android:title="Settings"
+ android:title="@string/settings"
/>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index db6d987e9ce1229fcf6758fbb7477e47c86d59bd..73076dc2852be4ecf20540e7b04b98d2bb56190f 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -29,7 +29,7 @@
<fragment
android:id="@+id/navigation_scan"
android:name="com.example.abe.ui.scanner.ScannerFragment"
- android:label="Scan"
+ android:label="Transaction Scan"
tools:layout="@layout/fragment_scan">
<action
@@ -42,7 +42,7 @@
<fragment
android:id="@+id/navigation_graph"
- android:label="Graph"
+ android:label="Transaction Graph"
android:name="com.example.abe.ui.graph.GraphFragment"
tools:layout="@layout/fragment_graph"
/>
@@ -50,7 +50,7 @@
<fragment
android:id="@+id/navigation_settings"
android:name="com.example.abe.ui.settings.SettingsFragment"
- android:label="Settings"
+ android:label="Other Settings"
tools:layout="@layout/fragment_settings" >
<action
android:id="@+id/action_navigation_settings_to_navigation_transactions"
diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c336720562d5a4420af32d4ac838140eb6f61d2e
--- /dev/null
+++ b/app/src/main/res/values-night/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="capture_photo">Capture Button</string>
+ <string name="email">Email</string>
+ <string name="sign_in">Sign in</string>
+ <string name="greeting">Welcome back to</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 591d7143599a65ddec3ce4fd908251d8ecc8dd77..b2a041cbeecd8f3ab4751e5b3f4006b4f5c51e1a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="primary">#9759C4</color>
- <color name="primaryActive">#8346AA</color>
- <color name="secondary">#F7D047</color>
- <color name="secondaryActive">#EEA035</color>
- <color name="success">#59921B</color>
+ <color name="primary">#461767</color>
+ <color name="primaryActive">#5c3078</color>
+ <color name="secondary">#C17A30</color>
+ <color name="secondaryActive">#F6BE00</color>
+ <color name="success">#4B7D17</color>
<color name="destructive">#C81823</color>
- <color name="grayDark">#A9A9A9</color>
+ <color name="grayDark">#212121</color>
<color name="grayLight">#F5F5F8</color>
<color name="black">#090909</color>
<color name="white">#FFFFFFFF</color>
- <color name="purple_700">#8346AA</color>
- <color name="purple_200">#9759C4</color>
+ <color name="purple_700">#461767</color>
+ <color name="purple_200">#5c3078</color>
<color name="teal_200">#80CBC4</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 a0b2dda42295ac3fb60c37e2c07142703bc0faf6..1f2ba06c6c06e63b342a2171d519053856eb686b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,6 +14,17 @@
<string name="location">Location</string>
<string name="open_in_map">Open in Map</string>
<string name="category">Category</string>
+ <string name="capture_photo">Capture Photo</string>
+ <string name="password">Password</string>
+ <string name="email">Email</string>
+ <string name="sign_in">Sign in</string>
+ <string name="greeting">Welcome back to</string>
+ <string name="bondoman">Bondoman</string>
+ <string name="get_photo_from_gallery">Get Photo from Gallery</string>
+ <string name="scan">Scan</string>
+ <string name="graph">Graph</string>
+ <string name="settings">Settings</string>
+ <string name="transaction">Transaction</string>
<string-array name="Categories">
<item>Income</item>