diff --git a/app/src/main/java/com/example/bandung_bondowoso/view/graph/GraphFragment.kt b/app/src/main/java/com/example/bandung_bondowoso/view/graph/GraphFragment.kt index 5c30eaf8d4732d4b3a498e36351511cd1890d91f..01e89284af9ad9b04fcb365f95910a5d2658f08c 100644 --- a/app/src/main/java/com/example/bandung_bondowoso/view/graph/GraphFragment.kt +++ b/app/src/main/java/com/example/bandung_bondowoso/view/graph/GraphFragment.kt @@ -54,6 +54,7 @@ class GraphFragment : Fragment() { chart.animateY(1400, Easing.EaseInOutQuad) chart.setUsePercentValues(true) chart.isDrawHoleEnabled = false + chart.isDrawHoleEnabled = false val l: com.github.mikephil.charting.components.Legend? = chart.legend l?.verticalAlignment = com.github.mikephil.charting.components.Legend.LegendVerticalAlignment.TOP @@ -66,6 +67,7 @@ class GraphFragment : Fragment() { chart.setEntryLabelColor(ContextCompat.getColor(requireContext(), R.color.md_theme_surface)) chart.setEntryLabelTextSize(16f) chart.setNoDataText("") + chart.setNoDataText("") val values = ArrayList<PieEntry>() loginViewModel.getEmail().observe(viewLifecycleOwner) { email -> Log.d(tag, "User Email: $email") @@ -79,7 +81,7 @@ class GraphFragment : Fragment() { val dataSet = com.github.mikephil.charting.data.PieDataSet(values, "") dataSet.setColors( ContextCompat.getColor(requireContext(), R.color.md_theme_primary), - ContextCompat.getColor(requireContext(), R.color.md_theme_tertiary) + ContextCompat.getColor(requireContext(), R.color.md_theme_peach) ) val data = com.github.mikephil.charting.data.PieData(dataSet) chart.data = data @@ -97,6 +99,7 @@ class GraphFragment : Fragment() { } } + return root } diff --git a/app/src/main/res/drawable/bg_settings_card_email.xml b/app/src/main/res/drawable/bg_settings_card_email.xml deleted file mode 100644 index 211758aeefd78f338544978746ff5f3704ae3fcc..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/bg_settings_card_email.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/md_theme_peach" /> - <corners android:radius="10dp" /> -</shape> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_settings_card_excel.xml b/app/src/main/res/drawable/bg_settings_card_excel.xml deleted file mode 100644 index 99e0d60361eea5facc82cf339d4d19e14d91d3f0..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/bg_settings_card_excel.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/md_theme_light_green" /> - <corners android:radius="10dp" /> -</shape> \ 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 37dc550c92f9ba4b54c518f79e2df7bc8e002645..9c3ad01122706a5c29044565dc17c9725213d12f 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/title_start_margin" - android:textColor="@color/md_theme_primary" + android:textColor="@color/textColor" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -65,7 +65,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:background="@drawable/bg_settings_card_excel" + android:background="@drawable/bg_settings_card_user" android:padding="10dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -82,7 +82,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/tv_title_settings_card_excel" app:layout_constraintTop_toTopOf="parent" - app:tint="@color/md_theme_primary" /> + app:tint="@color/textColor" /> <TextView android:id="@+id/tv_title_settings_card_excel" @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_transaction" - android:textColor="@color/md_theme_primary" + android:textColor="@color/textColor" android:textStyle="bold" android:layout_marginStart="@dimen/title_start_margin" app:layout_constraintStart_toEndOf="@id/icon_settings_card_excel" @@ -102,7 +102,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/file_type" - android:textColor="@color/md_theme_primary" + android:textColor="@color/textColor" android:layout_marginStart="@dimen/title_start_margin" app:layout_constraintStart_toEndOf="@id/icon_settings_card_excel" app:layout_constraintTop_toBottomOf="@id/tv_title_settings_card_excel" @@ -125,7 +125,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:background="@drawable/bg_settings_card_email" + android:background="@drawable/bg_settings_card_user" android:padding="10dp" app:layout_constraintTop_toBottomOf="@+id/constraintLayout3" tools:layout_editor_absoluteX="-16dp"> @@ -142,7 +142,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/tv_title_settings_card_email" app:layout_constraintTop_toTopOf="parent" - app:tint="@color/md_theme_primary" /> + app:tint="@color/textColor" /> <TextView android:id="@+id/tv_title_settings_card_email" @@ -150,7 +150,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/kirim_daftar_transaksi" - android:textColor="@color/md_theme_primary" + android:textColor="@color/textColor" android:textStyle="bold" android:layout_marginStart="@dimen/title_start_margin" app:layout_constraintStart_toEndOf="@id/icon_email" @@ -164,7 +164,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/gmail" - android:textColor="@color/md_theme_primary" + android:textColor="@color/textColor" android:layout_marginStart="@dimen/title_start_margin" app:layout_constraintStart_toEndOf="@id/icon_email" app:layout_constraintTop_toBottomOf="@id/tv_title_settings_card_email" @@ -239,7 +239,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/title_start_margin" android:text="@string/random_transaksi" - android:textColor="@color/md_theme_primary" + android:textColor="@color/textColor" android:textStyle="bold" app:layout_constraintStart_toEndOf="@+id/icon_random_transaction" app:layout_constraintTop_toTopOf="parent" /> @@ -253,7 +253,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_transaction" - app:tint="@color/md_theme_primary" /> + app:tint="@color/textColor" /> <Button android:id="@+id/buttonRandom" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 11eeb49d770da6630a3fd8f99833fc3b89631cb8..993be82593165eab34c4d40d0f784b060ac47f0b 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="md_theme_primary">#DFE0FF</color> + <color name="md_theme_primary">#2E8CFF</color> <color name="md_theme_onPrimary">#242B61</color> - <color name="md_theme_primaryContainer">#3B4279</color> + <color name="md_theme_primaryContainer">#0819B6</color> <color name="md_theme_onPrimaryContainer">#DFE0FF</color> <color name="md_theme_red">#BE0707</color> <color name="md_theme_green">#44C34A</color> - <color name="md_theme_peach">#3B4279</color> + <color name="md_theme_peach">#F12BFF</color> <color name="md_theme_light_green">#3B4279</color> <color name="md_theme_blue">#ADC7FF</color> <color name="md_theme_secondary">#BCC3FF</color> @@ -23,7 +23,7 @@ <color name="md_theme_onErrorContainer">#FFDAD6</color> <color name="md_theme_background">#131318</color> <color name="md_theme_onBackground">#E4E1E9</color> - <color name="md_theme_surface">#131318</color> + <color name="md_theme_surface">#0D1931</color> <color name="md_theme_onSurface">#E4E1E9</color> <color name="md_theme_surfaceVariant">#46464F</color> <color name="md_theme_onSurfaceVariant">#C7C5D0</color> @@ -146,4 +146,5 @@ <color name="md_theme_surfaceContainer_highContrast">#1F1F25</color> <color name="md_theme_surfaceContainerHigh_highContrast">#29292F</color> <color name="md_theme_surfaceContainerHighest_highContrast">#34343A</color> + <color name="textColor">#ffffff</color> </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 3753890d8dc3b6770bfb3c94275ec9bb9b4a9f03..14cfa7e8d4d9b1d1306de6b0b3f8195fef03b594 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,7 +6,7 @@ <color name="md_theme_onPrimary">#FFFFFF</color> <color name="md_theme_red">#BE0707</color> <color name="md_theme_green">#44C34A</color> - <color name="md_theme_peach">#FFDAD6</color> + <color name="md_theme_peach">#FF639A</color> <color name="md_theme_light_green">#C7ECC1</color> <color name="md_theme_blue">#ADC7FF</color> <color name="md_theme_primaryContainer">#DFE0FF</color> @@ -150,4 +150,5 @@ <color name="md_theme_surfaceContainerHighest_highContrast">#E4E1E9</color> <color name="black">#000000</color> <color name="white">#FFFFFF</color> + <color name="textColor">#000E8E</color> </resources> \ No newline at end of file