diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000000000000000000000000000000000000..ff8a25ab6ab262d953536113a754d09086d19df6
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+PSI
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b589d56e9f285d8cfdc6c270853a5d439021a278
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <bytecodeTargetLevel target="17" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0c0c3383890637b4721df1f49d0b229e55c0f361
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="deploymentTargetDropDown">
+ <value>
+ <entry key="app">
+ <State />
+ </entry>
+ </value>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0897082f7512e48e89310db81b5455d997417505
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="GradleMigrationSettings" migrationVersion="1" />
+ <component name="GradleSettings">
+ <option name="linkedExternalProjectsSettings">
+ <GradleProjectSettings>
+ <option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+ <option name="modules">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/app" />
+ </set>
+ </option>
+ <option name="resolveExternalAnnotations" value="false" />
+ </GradleProjectSettings>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d81632f83e01c6cdfe9759af2796ebb50e9fdcf
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="KotlinJpsPluginSettings">
+ <option name="version" value="1.9.22" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f8051a6f973e69a86e6f07f1a1c87f17a31c7235
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectMigrations">
+ <option name="MigrateToGradleLocalJavaHome">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ </set>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..adb8ae0fea0131858229357ced529c35f718aa6f
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<project version="4">
+ <component name="ExternalStorageConfigurationManager" enabled="true" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/pbd/psi/MainActivity.kt b/app/src/main/java/com/pbd/psi/MainActivity.kt
index 430e22844106c28b44f17142afb3b3ba62476eba..f9f245480e5519f052b932dc3e6008044c1f40b7 100644
--- a/app/src/main/java/com/pbd/psi/MainActivity.kt
+++ b/app/src/main/java/com/pbd/psi/MainActivity.kt
@@ -15,6 +15,12 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
import com.pbd.psi.databinding.ActivityMainBinding
import com.pbd.psi.databinding.FragmentSettingsBinding
import com.pbd.psi.services.BackgroundService
+import android.content.res.ColorStateList
+
+import android.graphics.Color
+
+
+
class MainActivity : AppCompatActivity() {
diff --git a/app/src/main/res/color/icon_color.xml b/app/src/main/res/color/icon_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a5f093a83aed8764c418bcbe258c19f87cac4ae
--- /dev/null
+++ b/app/src/main/res/color/icon_color.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:color="@color/navbar_icon" android:state_checked="true"/>
+ <item android:color="@color/navbar_icon" android:state_checked="false"/>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/baseline_camera_24.xml b/app/src/main/res/drawable/baseline_camera_24.xml
deleted file mode 100644
index 4a77cd137a401d10d61fc63788985ec66386be35..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/baseline_camera_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
- android:viewportHeight="24" android:viewportWidth="24"
- android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@android:color/white" android:pathData="M9.4,10.5l4.77,-8.26C13.47,2.09 12.75,2 12,2c-2.4,0 -4.6,0.85 -6.32,2.25l3.66,6.35 0.06,-0.1zM21.54,9c-0.92,-2.92 -3.15,-5.26 -6,-6.34L11.88,9h9.66zM21.8,10h-7.49l0.29,0.5 4.76,8.25C21,16.97 22,14.61 22,12c0,-0.69 -0.07,-1.35 -0.2,-2zM8.54,12l-3.9,-6.75C3.01,7.03 2,9.39 2,12c0,0.69 0.07,1.35 0.2,2h7.49l-1.15,-2zM2.46,15c0.92,2.92 3.15,5.26 6,6.34L12.12,15L2.46,15zM13.73,15l-3.9,6.76c0.7,0.15 1.42,0.24 2.17,0.24 2.4,0 4.6,-0.85 6.32,-2.25l-3.66,-6.35 -0.93,1.6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/baseline_document_scanner_24.xml b/app/src/main/res/drawable/baseline_document_scanner_24.xml
deleted file mode 100644
index ebce0f0e7895bc366b1f4a5b60f3c1fbd6efca95..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/baseline_document_scanner_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector
- android:height="24dp"
- android:tint="#000000"
- android:viewportHeight="24"
- android:viewportWidth="24"
- android:width="24dp"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@android:color/white" android:pathData="M7,3H4v3H2V1h5V3zM22,6V1h-5v2h3v3H22zM7,21H4v-3H2v5h5V21zM20,18v3h-3v2h5v-5H20zM19,18c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2V18zM15,8H9v2h6V8zM15,11H9v2h6V11zM15,14H9v2h6V14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/baseline_pie_chart_24.xml b/app/src/main/res/drawable/baseline_pie_chart_24.xml
deleted file mode 100644
index 7f4347c12ecb9dc843a08e64ecceda4da81c3b65..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/baseline_pie_chart_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector
- android:height="24dp"
- android:tint="#000000"
- android:viewportHeight="24"
- android:viewportWidth="24"
- android:width="24dp"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@android:color/white" android:pathData="M11,2v20c-5.07,-0.5 -9,-4.79 -9,-10s3.93,-9.5 9,-10zM13.03,2v8.99L22,10.99c-0.47,-4.74 -4.24,-8.52 -8.97,-8.99zM13.03,13.01L13.03,22c4.74,-0.47 8.5,-4.25 8.97,-8.99h-8.97z"/>
-</vector>
diff --git a/app/src/main/res/drawable/baseline_receipt_24.xml b/app/src/main/res/drawable/baseline_receipt_24.xml
deleted file mode 100644
index a96aacfd1510fd3fe3018107525044aece561982..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/baseline_receipt_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector
- android:height="24dp"
- android:tint="#000000"
- android:viewportHeight="24"
- android:viewportWidth="24"
- android:width="24dp"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@android:color/white" android:pathData="M18,17L6,17v-2h12v2zM18,13L6,13v-2h12v2zM18,9L6,9L6,7h12v2zM3,22l1.5,-1.5L6,22l1.5,-1.5L9,22l1.5,-1.5L12,22l1.5,-1.5L15,22l1.5,-1.5L18,22l1.5,-1.5L21,22L21,2l-1.5,1.5L18,2l-1.5,1.5L15,2l-1.5,1.5L12,2l-1.5,1.5L9,2 7.5,3.5 6,2 4.5,3.5 3,2v20z"/>
-</vector>
diff --git a/app/src/main/res/drawable/baseline_settings_24.xml b/app/src/main/res/drawable/baseline_settings_24.xml
deleted file mode 100644
index 7a2b435a7324dd48a8cd25712850a03be1031b03..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/baseline_settings_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector
- android:height="24dp"
- android:tint="#000000"
- android:viewportHeight="24"
- android:viewportWidth="24"
- android:width="24dp"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/document_scanner_24.xml b/app/src/main/res/drawable/document_scanner_24.xml
deleted file mode 100644
index bb63e9a2c860629bbb29219be176114cefe31a42..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/document_scanner_24.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true"
- android:drawable="@drawable/document_scanner_24_pressed" /> <!-- pressed -->
- <item android:state_selected="true"
- android:drawable="@drawable/document_scanner_24_pressed" /> <!-- checked -->
- <item android:drawable="@drawable/baseline_document_scanner_24" /> <!-- default -->
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/document_scanner_24_pressed.xml b/app/src/main/res/drawable/document_scanner_24_pressed.xml
deleted file mode 100644
index 79d9d2b5b68f9f553a1ec9558fa904f65dfebb3f..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/document_scanner_24_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector
- android:height="24dp"
- android:viewportHeight="24"
- android:viewportWidth="24"
- android:width="24dp"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@color/colorPrimaryDark" android:pathData="M7,3H4v3H2V1h5V3zM22,6V1h-5v2h3v3H22zM7,21H4v-3H2v5h5V21zM20,18v3h-3v2h5v-5H20zM19,18c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2V18zM15,8H9v2h6V8zM15,11H9v2h6V11zM15,14H9v2h6V14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/income_icon.xml b/app/src/main/res/drawable/income_icon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9b6d31c29924cbc5b5f75393db970873a988c5fb
--- /dev/null
+++ b/app/src/main/res/drawable/income_icon.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="16dp"
+ android:height="21dp"
+ android:viewportWidth="16"
+ android:viewportHeight="21">
+ <path
+ android:pathData="M8.115,20.925C7.817,20.925 7.53,20.819 7.319,20.632C7.108,20.444 6.989,20.19 6.989,19.925L6.989,1.925C6.989,1.659 7.108,1.405 7.319,1.217C7.53,1.03 7.817,0.925 8.115,0.925C8.414,0.925 8.701,1.03 8.912,1.217C9.123,1.405 9.242,1.659 9.242,1.925L9.242,19.925C9.242,20.19 9.123,20.444 8.912,20.632C8.701,20.819 8.414,20.925 8.115,20.925Z"
+ android:fillColor="#12E400"
+ android:fillType="evenOdd"/>
+ <path
+ android:pathData="M8.913,20.669C8.808,20.774 8.684,20.857 8.547,20.914C8.41,20.971 8.264,21 8.115,21C7.967,21 7.821,20.971 7.684,20.914C7.547,20.857 7.423,20.774 7.318,20.669L0.561,13.912C0.35,13.701 0.231,13.414 0.231,13.115C0.231,12.816 0.35,12.529 0.561,12.318C0.773,12.106 1.06,11.987 1.359,11.987C1.658,11.987 1.944,12.106 2.156,12.318L8.115,18.279L14.075,12.318C14.287,12.106 14.573,11.987 14.872,11.987C15.172,11.987 15.458,12.106 15.67,12.318C15.881,12.529 16,12.816 16,13.115C16,13.414 15.881,13.701 15.67,13.912L8.913,20.669Z"
+ android:fillColor="#12E400"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/navbar_chart.xml b/app/src/main/res/drawable/navbar_chart.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9938f841a404c44057c8d2f710821b5a5ec70f62
--- /dev/null
+++ b/app/src/main/res/drawable/navbar_chart.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="512"
+ android:viewportHeight="512">
+ <path
+ android:pathData="M268.5,44.6c-4.7,2.6 -8.6,6.6 -10.6,10.9 -1.8,3.8 -1.9,8.5 -1.9,93 0,60.2 0.4,90.2 1.1,92.9 1.4,5 8.2,11.8 13.5,13.4 3.1,0.9 25.5,1.2 93,1.2 99.6,-0 93.3,0.4 100.1,-7.3 4.9,-5.6 5.7,-9.3 5,-24.6 -2.9,-67.7 -43.8,-130.2 -105.2,-160.8 -25.5,-12.8 -49.7,-19 -77,-19.9 -12.7,-0.4 -15.5,-0.2 -18,1.2zM310,89c29.5,7 51.3,19.2 72.6,40.4 21.2,21.3 33.4,43.1 40.4,72.6 1.1,4.7 2,9.1 2,9.7 0,1 -13.3,1.3 -63,1.3l-63,-0 0,-63c0,-49.7 0.3,-63 1.3,-63 0.6,-0 5,0.9 9.7,2z"
+ android:fillColor="#DADADA"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M175.9,58.4c-72.7,29.7 -123.1,96.3 -132,174.6 -1.5,13.4 -0.6,45.3 1.6,57.5 8.4,46.5 27.8,84 59.9,116.1 34.9,34.9 79.3,56.1 128.7,61.5 14.9,1.6 44.5,0.6 58.9,-2.1 74,-13.6 134.1,-62.7 161.5,-131.9 3.2,-8.1 3.7,-10.2 3.3,-15.6 -0.4,-7.3 -3.1,-12 -9.1,-16.2 -4.5,-3.1 -13.4,-4.2 -19,-2.4 -5.5,1.8 -11.1,8.1 -13.7,15.3 -3.5,9.9 -11.6,25.4 -18.5,35.8 -25.5,38.4 -66.2,64.9 -112.4,73.2 -16.2,2.9 -42,2.9 -58.2,-0 -62.7,-11.3 -112.7,-54.4 -132.8,-114.8 -6.1,-18.2 -8.3,-32.4 -8.3,-53.4 0,-13.5 0.4,-20.2 2.1,-29.4 9.5,-53.4 43.9,-99.4 91.8,-123 6,-2.9 13.6,-6.3 17.1,-7.6 7.2,-2.6 13.5,-8.2 15.3,-13.7 0.6,-1.9 0.9,-6.2 0.7,-9.4 -0.8,-11.1 -9.3,-18.9 -20.7,-18.9 -4.3,-0 -8.1,1 -16.2,4.4z"
+ android:fillColor="#DADADA"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/navbar_scan.xml b/app/src/main/res/drawable/navbar_scan.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f8ba65a48dc0cc470ecbd2194186f0312acd98d3
--- /dev/null
+++ b/app/src/main/res/drawable/navbar_scan.xml
@@ -0,0 +1,13 @@
+<vector android:height="24dp" android:viewportHeight="512"
+ android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#DADADA"
+ android:pathData="M59.8,33.9c-3.1,1 -7.2,2.8 -9.2,4 -5.6,3.5 -13.3,12.6 -15.8,18.9 -2.3,5.7 -2.3,5.8 -2.3,54.2l0,48.5 2.3,4.3c4.7,8.8 16.1,13.7 26.6,11.3 6.9,-1.5 12.9,-5.8 15.8,-11.3 2.3,-4.2 2.3,-4.9 2.6,-44l0.3,-39.7 39.7,-0.3c39.1,-0.3 39.8,-0.3 44,-2.6 8.8,-4.7 13.7,-16.1 11.3,-26.6 -1.5,-6.9 -5.8,-12.9 -11.3,-15.8 -4.3,-2.3 -4.5,-2.3 -51.3,-2.5 -43.2,-0.2 -47.5,-0.1 -52.7,1.6z" android:strokeColor="#00000000"/>
+ <path android:fillColor="#DADADA"
+ android:pathData="M353,32.9c-8.6,2.7 -14.1,8.7 -16.1,17.7 -2.4,10.5 2.5,21.9 11.3,26.6 4.2,2.3 4.9,2.3 44,2.6l39.7,0.3 0.3,39.7c0.3,39.1 0.3,39.8 2.6,44 2.9,5.5 8.9,9.8 15.8,11.3 10.5,2.4 21.9,-2.5 26.6,-11.3l2.3,-4.3 0,-48.5 0,-48.5 -2.4,-6c-3.3,-8.3 -13.3,-18.3 -21.6,-21.6l-6,-2.4 -47,-0.2c-25.8,-0.1 -48.1,0.2 -49.5,0.6z" android:strokeColor="#00000000"/>
+ <path android:fillColor="#DADADA"
+ android:pathData="M49,232.9c-8.6,2.6 -14.1,8.7 -16.1,17.7 -2.4,10.5 2.5,21.9 11.3,26.6l4.3,2.3 207.5,-0 207.5,-0 4.3,-2.3c8.8,-4.7 13.7,-16.1 11.3,-26.6 -1.5,-6.9 -5.8,-12.9 -11.3,-15.8l-4.3,-2.3 -206,-0.2c-113.3,-0.1 -207.1,0.2 -208.5,0.6z" android:strokeColor="#00000000"/>
+ <path android:fillColor="#DADADA"
+ android:pathData="M48.2,337.5c-5.8,1.8 -10.8,5.8 -13.5,10.8 -2.2,4.2 -2.2,4.4 -2.2,52.7l0,48.5 2.4,6c3.3,8.3 13.3,18.3 21.6,21.6l6,2.4 48.5,-0 48.5,-0 4.3,-2.3c5.5,-2.9 9.8,-8.9 11.3,-15.8 2.4,-10.5 -2.5,-21.9 -11.3,-26.6 -4.2,-2.3 -4.9,-2.3 -44,-2.6l-39.7,-0.3 -0.3,-39.7c-0.3,-38.9 -0.3,-39.8 -2.5,-43.9 -2.8,-5.2 -7.7,-9 -13.9,-10.9 -5.7,-1.7 -9.5,-1.7 -15.2,0.1z" android:strokeColor="#00000000"/>
+ <path android:fillColor="#DADADA"
+ android:pathData="M448.2,337.5c-5.8,1.8 -10.8,5.8 -13.5,10.8 -2.2,4.1 -2.2,5 -2.5,43.9l-0.3,39.7 -39.7,0.3c-39.1,0.3 -39.8,0.3 -44,2.6 -8.8,4.7 -13.7,16.1 -11.3,26.6 1.5,6.9 5.8,12.9 11.3,15.8l4.3,2.3 48.5,-0 48.5,-0 6,-2.4c4.4,-1.8 7.8,-4.2 12.6,-9 4.8,-4.8 7.2,-8.2 9,-12.6l2.4,-6 0,-48.5c0,-48.3 0,-48.5 -2.2,-52.7 -2.8,-5.2 -7.7,-9 -13.9,-10.9 -5.7,-1.7 -9.5,-1.7 -15.2,0.1z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/navbar_settings.xml b/app/src/main/res/drawable/navbar_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f0e3f96b28f97de3b827e187a7e7f9a2288cdd72
--- /dev/null
+++ b/app/src/main/res/drawable/navbar_settings.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="512"
+ android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#DADADA"
+ android:pathData="M228.5,1.6c-4,0.7 -11,3.3 -16.4,6 -7.4,3.7 -11,6.2 -17.1,12.3 -7.7,7.7 -14.6,18 -17,25.6 -1.7,5.3 -2.3,5.9 -7,7.5 -3.6,1.2 -4.4,1.1 -9.7,-1.3 -19.3,-8.6 -41.7,-7.9 -60.6,2 -10.7,5.7 -34.3,27.7 -42.9,40.1 -8,11.7 -11.8,24.1 -11.8,39.2 0,11.5 1.5,18.9 5.7,28.3 2.4,5.3 2.5,6.1 1.3,9.7 -1.6,4.7 -2.2,5.3 -7.5,7 -7.6,2.4 -17.9,9.3 -25.6,17 -9.4,9.4 -16.1,22 -18.4,34.3 -2,10.7 -2,42.7 0,53.4 2.3,12.3 9,24.9 18.4,34.3 7.7,7.7 18,14.6 25.6,17 5.3,1.7 5.9,2.3 7.5,7 1.2,3.6 1.1,4.4 -1.3,9.7 -4.2,9.4 -5.7,16.8 -5.7,28.3 0,15.1 3.8,27.5 11.8,39.2 8.6,12.4 32.2,34.4 42.9,40.1 18.9,9.9 41.3,10.6 60.6,2 5.3,-2.4 6.1,-2.5 9.7,-1.3 4.7,1.6 5.3,2.2 7,7.5 2.4,7.6 9.3,17.9 17,25.6 9.4,9.4 22,16.1 34.3,18.4 10.7,2 42.7,2 53.4,-0 12.3,-2.3 24.9,-9 34.3,-18.4 7.7,-7.7 14.6,-18 17,-25.6 1.7,-5.3 2.3,-5.9 7,-7.5 3.6,-1.2 4.4,-1.1 9.7,1.3 19.3,8.6 41.7,7.9 60.6,-2 10.7,-5.7 34.3,-27.7 42.9,-40.1 8,-11.7 11.8,-24.1 11.8,-39.2 0,-11.5 -1.5,-18.9 -5.7,-28.3 -2.4,-5.3 -2.5,-6.1 -1.3,-9.7 1.6,-4.7 2.2,-5.3 7.5,-7 7.5,-2.4 18,-9.3 25.6,-16.9 9.3,-9.3 16.1,-22 18.4,-34.4 2,-10.7 2,-42.7 0,-53.4 -2.3,-12.3 -9,-24.9 -18.4,-34.3 -7.7,-7.7 -18,-14.6 -25.6,-17 -5.3,-1.7 -5.9,-2.3 -7.5,-7 -1.2,-3.6 -1.1,-4.4 1.3,-9.7 4.2,-9.4 5.7,-16.8 5.7,-28.3 0,-15.1 -3.8,-27.5 -11.8,-39.2 -8.6,-12.4 -32.2,-34.4 -42.9,-40.1 -18.9,-9.9 -41.3,-10.6 -60.6,-2 -5.3,2.4 -6.1,2.5 -9.7,1.3 -4.7,-1.6 -5.3,-2.2 -7,-7.5 -2.4,-7.6 -9.3,-17.9 -17,-25.6 -9.4,-9.4 -22,-16.1 -34.3,-18.4 -10.2,-1.9 -44.3,-1.9 -54.2,0.1zM278.7,39.6c7,2.4 12.6,6.6 16.2,12.3 3.3,5.1 4.1,7.4 6.1,17.4 1.6,8 4.4,10.9 13.8,14.3 4.2,1.5 12.6,4.9 18.5,7.7 13.2,6 15.9,6 24.7,-0.2 8.5,-6 12.4,-7.4 20.5,-7.4 11.2,-0 16.4,2.9 31.3,17.6 15.3,15.1 18.7,21.1 18.5,32.1 -0.1,8.1 -1.7,12.5 -7.5,20.8 -6,8.6 -6,11.4 -0.1,24.5 2.8,5.9 6.2,14.3 7.7,18.5 3.4,9.4 6.3,12.2 14.3,13.8 10,2 12.3,2.8 17.4,6.1 5.7,3.6 9.9,9.2 12.3,16.2 2.3,6.9 2.3,38.5 0,45.4 -2.4,7 -6.6,12.6 -12.3,16.2 -5.1,3.3 -7.4,4.1 -17.4,6.1 -8,1.6 -10.9,4.4 -14.3,13.8 -1.5,4.2 -4.9,12.6 -7.7,18.5 -5.9,13.1 -5.9,15.9 0.1,24.5 5.8,8.3 7.4,12.7 7.5,20.7 0.2,11 -2.8,16.3 -17.6,31.3 -15.1,15.2 -20.8,18.5 -32,18.5 -8.3,-0 -12.2,-1.4 -20.7,-7.4 -8.8,-6.2 -11.5,-6.2 -24.7,-0.2 -5.9,2.8 -14.3,6.2 -18.5,7.7 -9.4,3.4 -12.2,6.3 -13.8,14.3 -2,10 -2.8,12.3 -6.1,17.4 -3.6,5.7 -9.2,9.9 -16.2,12.3 -6.8,2.3 -38.5,2.3 -45.3,-0 -11.7,-4 -19.3,-13 -21.5,-25.7 -2.1,-12.4 -3.8,-14.3 -16,-18.8 -4.6,-1.6 -12.8,-5.1 -18.2,-7.6 -12,-5.6 -15,-5.5 -23.7,0.6 -8.5,6 -12.4,7.4 -20.5,7.4 -11.2,-0 -16.4,-2.9 -31.3,-17.6 -15.3,-15.1 -18.7,-21.1 -18.5,-32.1 0.1,-8.1 1.7,-12.5 7.5,-20.8 6,-8.5 6,-11.5 0.5,-23.5 -2.5,-5.4 -6,-13.6 -7.6,-18.2 -4.5,-12.2 -6.4,-13.9 -18.8,-16 -12.7,-2.2 -21.7,-9.8 -25.7,-21.5 -2.3,-6.7 -2.3,-38.5 0,-45.2 4,-11.7 13,-19.3 25.7,-21.5 12.4,-2.1 14.3,-3.8 18.8,-16 1.6,-4.6 5.1,-12.8 7.6,-18.2 5.5,-12 5.5,-15 -0.5,-23.5 -5.8,-8.3 -7.4,-12.7 -7.5,-20.8 -0.2,-11 3.2,-17 18.5,-32.1 14.9,-14.7 20.1,-17.6 31.3,-17.6 8.1,-0 12,1.4 20.5,7.4 8.7,6.1 11.7,6.2 23.7,0.6 5.4,-2.5 13.6,-6 18.2,-7.6 12.2,-4.5 13.9,-6.4 16,-18.8 2.2,-12.5 9.7,-21.6 21.2,-25.7 6.5,-2.2 38.9,-2.2 45.6,-0z" android:strokeColor="#00000000"/>
+ <path android:fillColor="#DADADA"
+ android:pathData="M242,110.1c-33.5,3.2 -63.4,17 -87.9,40.4 -38.6,36.9 -53.8,91.3 -40.2,144 7.9,30.8 27.7,60.1 53.6,79.6 52.2,39.3 124.8,39.3 177,-0 47.2,-35.5 68.7,-96.8 54,-154.1 -9.4,-36.9 -33.9,-70 -66.2,-89.4 -19.7,-11.8 -39.7,-18.3 -63.8,-20.6 -12.1,-1.1 -14.1,-1.1 -26.5,0.1zM269,148c21.5,2.7 42.3,11.9 58.6,26.1 16.9,14.8 28.4,33.5 34.6,56.3 1.9,7 2.2,10.7 2.2,26.1 0,19.7 -1.1,26.2 -7.3,41.5 -16.4,40.2 -57.7,68 -101.1,68 -43.4,-0 -84.7,-27.8 -101.1,-68 -6.2,-15.3 -7.3,-21.8 -7.3,-41.5 0,-19.7 1.1,-26.2 7.3,-41.5 18.3,-45 65.9,-72.9 114.1,-67z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/navbar_twibbon.xml b/app/src/main/res/drawable/navbar_twibbon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d60c2c3aec1137206480e29a68788d580598661
--- /dev/null
+++ b/app/src/main/res/drawable/navbar_twibbon.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#DADADA"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M14.25,2.26l-0.08,-0.04 -0.01,0.02C13.46,2.09 12.74,2 12,2 6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10c0,-4.75 -3.31,-8.72 -7.75,-9.74zM19.41,9h-7.99l2.71,-4.7c2.4,0.66 4.35,2.42 5.28,4.7zM13.1,4.08L10.27,9l-1.15,2L6.4,6.3C7.84,4.88 9.82,4 12,4c0.37,0 0.74,0.03 1.1,0.08zM5.7,7.09L8.54,12l1.15,2L4.26,14C4.1,13.36 4,12.69 4,12c0,-1.85 0.64,-3.55 1.7,-4.91zM4.59,15h7.98l-2.71,4.7c-2.4,-0.67 -4.34,-2.42 -5.27,-4.7zM10.9,19.91L14.89,13l2.72,4.7C16.16,19.12 14.18,20 12,20c-0.38,0 -0.74,-0.04 -1.1,-0.09zM18.3,16.91l-4,-6.91h5.43c0.17,0.64 0.27,1.31 0.27,2 0,1.85 -0.64,3.55 -1.7,4.91z"/>
+</vector>
diff --git a/app/src/main/res/drawable/navbar_wallet.xml b/app/src/main/res/drawable/navbar_wallet.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f826fbf64e9e77d360ce1dc5df70f2282c5f5432
--- /dev/null
+++ b/app/src/main/res/drawable/navbar_wallet.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="512"
+ android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#DADADA"
+ android:pathData="M59.5,20.5c-23.4,4.4 -42.4,19.2 -52.4,40.6 -7.5,16.1 -7.1,3.9 -7.1,194.9 0,192 -0.5,179.1 7.5,195.5 7.7,15.9 17.5,25.9 33,33.5 16.5,8.2 -4.2,7.5 227,7.5 202.1,-0 206.1,-0 212,-2 12.7,-4.1 24.5,-15.3 29.7,-28.2l2.3,-5.8 0.3,-143c0.2,-97.2 -0.1,-144.6 -0.8,-148.1 -4.5,-21.6 -24.1,-37.4 -46.5,-37.4l-5.4,-0 -0.3,-35.8c-0.3,-34.9 -0.4,-35.8 -2.7,-41.7 -5.7,-14.3 -14.2,-22.8 -28.6,-28.6l-6,-2.4 -177.5,-0.2c-143.7,-0.1 -178.8,0.1 -184.5,1.2zM419.3,53.4c1.5,1 3.8,3.3 5,5 2.2,3 2.2,3.8 2.5,36.4l0.3,33.2 -181.8,-0.2 -181.8,-0.3 -5.3,-2.2c-10.8,-4.4 -20,-13.8 -23.8,-24.3 -7.2,-19.8 7.3,-43.6 29.6,-48.6 4.3,-1 44.8,-1.2 179,-1.1 168.1,0.2 173.6,0.3 176.3,2.1zM53.7,157.6c6.5,1.8 15.2,1.9 211.3,2.4 230.2,0.6 208.8,-0.3 212.9,8.3 2,4.1 2.1,5.8 2.1,38l0,33.6 -67.7,0.3 -67.8,0.3 -7,2.4c-25.6,8.5 -44.3,27.9 -51.1,53.1 -2.4,8.9 -2.5,28.2 -0.1,37 7,26.4 28,47.3 54.2,54 7.4,1.9 11,2 73.7,2l65.9,-0 -0.3,30.9c-0.3,29.5 -0.4,31.1 -2.4,33.7 -1.1,1.5 -3.3,3.7 -4.8,4.8l-2.7,2.1 -198.2,0.3c-123.3,0.1 -200.6,-0.1 -204.5,-0.7 -17.1,-2.6 -30.5,-15.2 -34.1,-31.9 -0.8,-3.8 -1.1,-44.7 -1.1,-142.6l0,-137.4 7.5,3.8c4.1,2.1 10.5,4.6 14.2,5.6zM480,314.5l0,42.5 -63.9,-0c-59,-0 -64.4,-0.1 -69.8,-1.8 -15.3,-4.8 -26.6,-17.9 -29.4,-34.1 -2.9,-16.3 5.4,-33.9 20.2,-42.8 10.3,-6.2 10.1,-6.2 79.7,-6.2l63.2,-0.1 0,42.5z" android:strokeColor="#00000000"/>
+ <path android:fillColor="#DADADA"
+ android:pathData="M357.2,292.9c-9.7,3.4 -15.6,11.7 -15.5,22.1 0.1,7 2.7,12.5 8.3,17.3 17.3,14.8 43.3,-2.2 37,-24.2 -3.5,-12.4 -17.6,-19.6 -29.8,-15.2z" android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/outcome_icon.xml b/app/src/main/res/drawable/outcome_icon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a8a51df2d5cbc5ad95f5ed42b1b512e7c78ca22
--- /dev/null
+++ b/app/src/main/res/drawable/outcome_icon.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M11.885,1.075C12.183,1.075 12.47,1.181 12.681,1.368C12.892,1.556 13.011,1.81 13.011,2.075V20.075C13.011,20.341 12.892,20.595 12.681,20.782C12.47,20.97 12.183,21.075 11.885,21.075C11.586,21.075 11.3,20.97 11.088,20.782C10.877,20.595 10.758,20.341 10.758,20.075V2.075C10.758,1.81 10.877,1.556 11.088,1.368C11.3,1.181 11.586,1.075 11.885,1.075Z"
+ android:fillColor="#DD0000"
+ android:fillType="evenOdd"/>
+ <path
+ android:pathData="M11.087,1.331C11.192,1.226 11.316,1.143 11.453,1.086C11.59,1.029 11.736,1 11.884,1C12.033,1 12.179,1.029 12.316,1.086C12.453,1.143 12.577,1.226 12.682,1.331L19.439,8.088C19.65,8.299 19.769,8.586 19.769,8.885C19.769,9.184 19.65,9.471 19.439,9.682C19.227,9.894 18.941,10.013 18.641,10.013C18.342,10.013 18.056,9.894 17.844,9.682L11.884,3.721L5.925,9.682C5.713,9.894 5.427,10.013 5.128,10.013C4.829,10.013 4.542,9.894 4.33,9.682C4.119,9.471 4,9.184 4,8.885C4,8.586 4.119,8.299 4.33,8.088L11.087,1.331Z"
+ android:fillColor="#DD0000"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/pie_chart_24.xml b/app/src/main/res/drawable/pie_chart_24.xml
deleted file mode 100644
index b3a6893f5da8c30a9ec70aa2490c057f4031fb37..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/pie_chart_24.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true"
- android:drawable="@drawable/pie_chart_24_pressed" /> <!-- pressed -->
- <item android:state_selected="true"
- android:drawable="@drawable/pie_chart_24_pressed" /> <!-- checked -->
- <item android:drawable="@drawable/baseline_pie_chart_24" /> <!-- default -->
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pie_chart_24_pressed.xml b/app/src/main/res/drawable/pie_chart_24_pressed.xml
deleted file mode 100644
index 740b3e7862102b8f1e115bf544dfc23ed44622e7..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/pie_chart_24_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector
- android:height="24dp"
- android:viewportHeight="24"
- android:viewportWidth="24"
- android:width="24dp"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@color/colorPrimaryDark" android:pathData="M11,2v20c-5.07,-0.5 -9,-4.79 -9,-10s3.93,-9.5 9,-10zM13.03,2v8.99L22,10.99c-0.47,-4.74 -4.24,-8.52 -8.97,-8.99zM13.03,13.01L13.03,22c4.74,-0.47 8.5,-4.25 8.97,-8.99h-8.97z"/>
-</vector>
diff --git a/app/src/main/res/drawable/receipt_24.xml b/app/src/main/res/drawable/receipt_24.xml
deleted file mode 100644
index 059cab3ddc768e5d6200ef56b3d8ec4d1de55883..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/receipt_24.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true"
- android:drawable="@drawable/receipt_24_pressed" /> <!-- pressed -->
- <item android:state_selected="true"
- android:drawable="@drawable/receipt_24_pressed" /> <!-- checked -->
- <item android:drawable="@drawable/baseline_receipt_24" /> <!-- default -->
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/receipt_24_pressed.xml b/app/src/main/res/drawable/receipt_24_pressed.xml
deleted file mode 100644
index 5ab0655149d26b3f9ed790b4ba5e32e908cfedad..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/receipt_24_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector
- android:height="24dp"
- android:viewportHeight="24"
- android:viewportWidth="24"
- android:width="24dp"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@color/colorPrimaryDark" android:pathData="M18,17L6,17v-2h12v2zM18,13L6,13v-2h12v2zM18,9L6,9L6,7h12v2zM3,22l1.5,-1.5L6,22l1.5,-1.5L9,22l1.5,-1.5L12,22l1.5,-1.5L15,22l1.5,-1.5L18,22l1.5,-1.5L21,22L21,2l-1.5,1.5L18,2l-1.5,1.5L15,2l-1.5,1.5L12,2l-1.5,1.5L9,2 7.5,3.5 6,2 4.5,3.5 3,2v20z"/>
-</vector>
diff --git a/app/src/main/res/drawable/round_corner.xml b/app/src/main/res/drawable/round_corner.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9e892c7d8c37033f4b3bf33c95dba659db77d143
--- /dev/null
+++ b/app/src/main/res/drawable/round_corner.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <solid android:color="@color/primaryDark"/>
+ <corners android:topLeftRadius="30dp" android:topRightRadius="30dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selected.xml b/app/src/main/res/drawable/selected.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b824cb0aa2c6459d87eb2445e844ba535feda566
--- /dev/null
+++ b/app/src/main/res/drawable/selected.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="@color/selected_icon"/>
+ <corners android:radius="500dp"/>
+</shape>
+
diff --git a/app/src/main/res/drawable/settings_24.xml b/app/src/main/res/drawable/settings_24.xml
deleted file mode 100644
index c06902d8ac83ffe3e5369d81c5d3147f944f9f19..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/settings_24.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true"
- android:drawable="@drawable/settings_24_pressed" /> <!-- pressed -->
- <item android:state_selected="true"
- android:drawable="@drawable/settings_24_pressed" /> <!-- checked -->
- <item android:drawable="@drawable/baseline_settings_24" /> <!-- default -->
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/settings_24_pressed.xml b/app/src/main/res/drawable/settings_24_pressed.xml
deleted file mode 100644
index e48041168313400c0df55a29d00898dc9e620d69..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/settings_24_pressed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<vector
- android:height="24dp"
- android:viewportHeight="24"
- android:viewportWidth="24"
- android:width="24dp"
- xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@color/colorPrimaryDark" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/upload.xml b/app/src/main/res/drawable/upload.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bfe89f7b68fed7a095e4582809d05e4363971eb2
--- /dev/null
+++ b/app/src/main/res/drawable/upload.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="23dp"
+ android:viewportWidth="24"
+ android:viewportHeight="23">
+ <path
+ android:pathData="M19.519,5.794C19.262,4.269 18.507,2.877 17.352,1.821C16.069,0.647 14.401,0 12.664,0C11.321,0 10.014,0.385 8.893,1.11C7.961,1.713 7.186,2.527 6.638,3.484C6.401,3.44 6.154,3.415 5.907,3.415C3.81,3.415 2.102,5.123 2.102,7.22C2.102,7.492 2.132,7.753 2.181,8.01C0.824,8.997 0,10.586 0,12.279C0,13.646 0.508,14.974 1.436,16.025C2.389,17.101 3.647,17.737 4.99,17.811C5.004,17.811 5.014,17.811 5.029,17.811H9.273C9.643,17.811 9.94,17.515 9.94,17.145C9.94,16.775 9.643,16.479 9.273,16.479H5.049C3.03,16.355 1.333,14.436 1.333,12.274C1.333,10.877 2.083,9.574 3.292,8.869C3.573,8.706 3.692,8.365 3.583,8.059C3.484,7.793 3.435,7.511 3.435,7.21C3.435,5.848 4.545,4.738 5.907,4.738C6.199,4.738 6.485,4.787 6.751,4.886C7.077,5.004 7.437,4.856 7.585,4.545C8.508,2.586 10.502,1.323 12.669,1.323C15.58,1.323 17.984,3.504 18.26,6.396C18.29,6.697 18.517,6.939 18.813,6.988C21.009,7.363 22.667,9.392 22.667,11.706C22.667,14.159 20.738,16.291 18.359,16.474H14.722C14.352,16.474 14.056,16.77 14.056,17.14C14.056,17.51 14.352,17.806 14.722,17.806H18.384C18.399,17.806 18.413,17.806 18.433,17.806C19.938,17.698 21.345,17.007 22.391,15.852C23.433,14.707 24,13.236 24,11.706C23.995,8.938 22.105,6.475 19.519,5.794Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M16,12.91C16.261,12.649 16.261,12.229 16,11.968L12.471,8.439C12.347,8.316 12.175,8.242 12.002,8.242C11.829,8.242 11.657,8.311 11.533,8.439L8.005,11.968C7.743,12.229 7.743,12.649 8.005,12.91C8.133,13.039 8.306,13.108 8.473,13.108C8.641,13.108 8.814,13.044 8.942,12.91L11.336,10.517V21.518C11.336,21.888 11.632,22.184 12.002,22.184C12.372,22.184 12.668,21.888 12.668,21.518V10.517L15.062,12.91C15.318,13.172 15.738,13.172 16,12.91Z"
+ android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0b6569b9225219824a79d09099e492a8e1291597..4be9a8248baea681a64a2950c8fcd29319fd4bc5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,28 +21,27 @@
android:id="@+id/fragmentContainerView"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="1dp"
- android:layout_marginEnd="1dp"
+ android:layout_height="wrap_content"
app:defaultNavHost="true"
- app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
+ app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="parent"
- app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/nav_graph" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation"
app:menu="@menu/bottom_nav_menu"
- app:labelVisibilityMode="labeled"
+ app:labelVisibilityMode="unlabeled"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- android:background="@color/navbar_color"
+ android:background="@drawable/round_corner"
+ app:itemIconTint="@color/icon_color"
+ app:itemTextColor="@color/navbar_icon"
+ app:itemIconSize="28dp"
/>
diff --git a/app/src/main/res/layout/fragment_graph.xml b/app/src/main/res/layout/fragment_graph.xml
index fec015fd7dee2c9a5a0f602058a63891f4dcd661..c012f9a7b8098d11519b34dfbb1255ca81887ec3 100644
--- a/app/src/main/res/layout/fragment_graph.xml
+++ b/app/src/main/res/layout/fragment_graph.xml
@@ -9,6 +9,8 @@
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+ android:textAlignment="center"
android:text="@string/graph_fragment" />
</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 8b2e590001b2fc3b55ce2c73b38cd614a1bcab7f..875457fdec9299f4a4ae4d4d02afccab27f3cf08 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,38 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:orientation="vertical"
tools:context=".ui.settings.SettingsFragment">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:orientation="vertical"
- android:padding="20dp">
- <!-- TODO: Update blank fragment layout -->
- <TextView
- android:id="@+id/text_email"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="20dp"/>
+ <!-- TODO: Update blank fragment layout -->
+ <TextView
+ android:id="@+id/text_email"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="20dp"/>
- <TextView
- android:id="@+id/text_token"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/text_token"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/settings_fragment" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/settings_fragment" />
- <Button
- android:id="@+id/btn_logout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/logout" />
+ <Button
+ android:id="@+id/btn_logout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/logout" />
- </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ 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 f39a0d2d3a24dfde0a8036e9236deb0906246da0..c0818d0b70070ec3575e7d914e9cf710ab078d75 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -3,25 +3,25 @@
<item
android:id="@+id/transactionFragment"
android:title="@string/navbar_transaction"
- android:icon="@drawable/baseline_receipt_24"/>
+ android:icon="@drawable/navbar_wallet"/>
<item
android:id="@+id/scanFragment"
android:title="@string/navbar_scan"
- android:icon="@drawable/baseline_document_scanner_24"/>
+ android:icon="@drawable/navbar_scan"/>
<item
android:id="@+id/twibbonFragment"
android:title="@string/navbar_twibbon"
- android:icon="@drawable/baseline_camera_24" />
+ android:icon="@drawable/navbar_twibbon" />
<item
android:id="@+id/graphFragment"
android:title="@string/navbar_graph"
- android:icon="@drawable/baseline_pie_chart_24"/>
+ android:icon="@drawable/navbar_chart"/>
<item
android:id="@+id/settingsFragment"
android:title="@string/navbar_settings"
- android:icon="@drawable/baseline_settings_24" />
+ android:icon="@drawable/navbar_settings" />
</menu>
\ 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 ab36d3081c60ae95070cbd3d5c07619ae7cf922a..776df6ad022814f7d2baabbf816f4497a6af53bd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,11 +5,15 @@
<color name="red">#DE7979</color>
<color name="colorPrimaryDark">#007F73</color>
<color name="colorPrimary">#4CCD99</color>
+ <color name="primaryDark">#23265A</color>
+ <color name="primaryBlack">#121433</color>
+ <color name="primaryBrown">#535353</color>
<color name="colorAccent">#FFC700</color>
<color name="colorAccentLight">#FFF455</color>
<color name="black">#FF000000</color>
<color name="grey">#8E949A</color>
<color name="white">#FFFFFFFF</color>
- <color name="navbar_color">#D9D9D9</color>
->>>>>>> Stashed changes
+ <color name="hover">#A8A8A8</color>
+ <color name="selected_icon">#2567F9</color>
+ <color name="navbar_icon">#DADADA</color>
</resources>
\ No newline at end of file