diff --git a/app/src/main/res/layout/activity_add_transaction.xml b/app/src/main/res/layout/activity_add_transaction.xml index 01bca96f501701eb42196add13d84d14924b128f..e1562b5b76c6aaba7721b3b4a39470eaef359ded 100644 --- a/app/src/main/res/layout/activity_add_transaction.xml +++ b/app/src/main/res/layout/activity_add_transaction.xml @@ -39,6 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text" + android:textSize="16sp" android:background="@drawable/roundstyle_xsm" android:backgroundTint="@color/gray_container" android:padding="10dp"/> @@ -73,7 +74,7 @@ android:text="@string/rp_amount" android:textColor="@color/gray_100" android:fontFamily="@font/urbanist_regular" - android:textSize="14sp" + android:textSize="16sp" android:paddingStart="0dp" android:paddingEnd="8dp" android:layout_centerVertical="true"/> @@ -85,6 +86,7 @@ android:layout_height="wrap_content" android:layout_toEndOf="@id/prefixCurrency" android:inputType="number" + android:textSize="16sp" android:background="@color/transparent" android:autofillHints="0" /> </RelativeLayout> @@ -114,6 +116,7 @@ android:background="@drawable/roundstyle_xsm" android:backgroundTint="@color/gray_container" android:padding="10dp" + android:textSize="16sp" android:popupBackground="@color/gray_container" android:popupTheme="@style/SpinnerPopupStyle"/> </LinearLayout> @@ -139,6 +142,7 @@ android:layout_height="wrap_content" android:name="com.google.android.libraries.places.widget.AutocompleteSupportFragment" app:cornerRadius="8dp" + android:textSize="16sp" tools:ignore="MissingConstraints,MissingDefaultResource" /> </LinearLayout> <Button diff --git a/app/src/main/res/layout/activity_edit_transaction.xml b/app/src/main/res/layout/activity_edit_transaction.xml index 617704ab37d4d68e334f082cb42c603486b65e41..059230b71e268f7478f23189ddbe1e1cfecc7249 100644 --- a/app/src/main/res/layout/activity_edit_transaction.xml +++ b/app/src/main/res/layout/activity_edit_transaction.xml @@ -39,6 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text" + android:textSize="16sp" android:background="@drawable/roundstyle_xsm" android:backgroundTint="@color/gray_container" android:padding="10dp" @@ -74,7 +75,7 @@ android:text="@string/rp_amount" android:textColor="@color/gray_100" android:fontFamily="@font/urbanist_regular" - android:textSize="14sp" + android:textSize="16sp" android:paddingStart="0dp" android:paddingEnd="8dp" android:layout_centerVertical="true"/> @@ -86,6 +87,7 @@ android:layout_height="wrap_content" android:layout_toEndOf="@id/prefixCurrency" android:inputType="number" + android:textSize="16sp" android:background="@color/transparent" android:autofillHints="0" /> </RelativeLayout> @@ -115,6 +117,7 @@ android:background="@drawable/roundstyle_xsm" android:backgroundTint="@color/gray_container" android:padding="10dp" + android:textSize="16sp" android:popupBackground="@color/gray_container" android:popupTheme="@style/SpinnerPopupStyle"/> </LinearLayout> @@ -138,12 +141,13 @@ android:id="@+id/autocomplete_fragment_view" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textSize="16sp" android:name="com.google.android.libraries.places.widget.AutocompleteSupportFragment" tools:ignore="MissingConstraints,MissingDefaultResource" /> </LinearLayout> <Button android:id="@+id/saveButton" - android:layout_width="72dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_btn" android:fontFamily="@font/urbanist_medium" diff --git a/app/src/main/res/layout/activity_scan.xml b/app/src/main/res/layout/activity_scan.xml index b059239ace259c26567d5cd5a8fd4f386b165731..858965e37d70703c116db7d1bf57a1882e725e9f 100644 --- a/app/src/main/res/layout/activity_scan.xml +++ b/app/src/main/res/layout/activity_scan.xml @@ -217,7 +217,7 @@ android:paddingHorizontal="16dp" app:background="@drawable/ripple_button" app:backgroundTint="@color/gray_800" - android:textColor="@color/green_700" + android:textColor="@color/green_500" app:strokeColor="#14532D" app:strokeWidth="1dp" app:cornerRadius="8dp" diff --git a/app/src/main/res/layout/activity_twibbon.xml b/app/src/main/res/layout/activity_twibbon.xml index e5ce5061cdf89dd55bb855832083abdc37974849..e6f897cf08ee61f4c0e7fc9994eef273bb479abc 100644 --- a/app/src/main/res/layout/activity_twibbon.xml +++ b/app/src/main/res/layout/activity_twibbon.xml @@ -76,13 +76,13 @@ android:paddingVertical="12dp" android:text="@string/retake_btn" android:textAllCaps="false" - android:textColor="@color/green_700" + android:textColor="@color/green_500" app:background="@drawable/ripple_button" app:backgroundTint="@color/gray_800" app:cornerRadius="8dp" app:elevation="0dp" app:pressedTranslationZ="0dp" - app:strokeColor="#14532D" + app:strokeColor="@color/green_500" app:strokeWidth="1dp" /> <View diff --git a/app/src/main/res/layout/activity_view_transaction.xml b/app/src/main/res/layout/activity_view_transaction.xml index ffb7e1d4b01febe6d0516fdee4130a50c177854c..92c2734ba82d69e034ef51c93172163a1f1b1224 100644 --- a/app/src/main/res/layout/activity_view_transaction.xml +++ b/app/src/main/res/layout/activity_view_transaction.xml @@ -213,7 +213,7 @@ android:layout_weight="1"/> <com.google.android.material.button.MaterialButton android:id="@+id/editButton" - android:layout_width="72dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/edit_btn" android:backgroundTint="@color/green_700" diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index a2126b80fed9c28685b5d91d4a3e29128dd580bb..15dfbff54f791279dea4f19530e761f1ea34ceab 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -197,7 +197,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:paddingVertical="8dp" + android:paddingVertical="8.5dp" android:paddingHorizontal="16dp" android:minHeight="0dp" android:text="@string/see_all" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c8aa2b45844dae6c8114980dedb7d87d48107399..0e4c53a41cfa4972505f8de04544406655b24208 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,33 +1,33 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <color name="transparent">#00000000</color> - <color name="purple_200">#FFBB86FC</color> - <color name="purple_500">#FF6200EE</color> - <color name="purple_700">#FF3700B3</color> - <color name="teal_200">#FF03DAC5</color> - <color name="teal_700">#FF018786</color> - <color name="black">#FF000000</color> - <color name="white">#FFFFFFFF</color> - <color name="gray_50">#FFFAFAFA</color> - <color name="gray_100">#FFF4F4F5</color> - <color name="gray_300">#FFD4D4D8</color> - <color name="gray_500">#FF71717A</color> - <color name="gray_700">#FF3F3F46</color> - <color name="gray_800">#FF27272A</color> - <color name="gray_900">#FF18181B</color> - <color name="gray_container">#FF313131</color> - <color name="gray_subtitle">#FF9E9FAD</color> - <color name="green_200">#FFBBF7D0</color> - <color name="green_500">#FF22C55E</color> - <color name="green_700">#FF15803D</color> - <color name="green_900">#FF14532D</color> - <color name="red_500">#FFEF4444</color> - <color name="orange_400">#FFF38744</color> - <color name="orange_500">#FFF3722C</color> - <color name="light_blue_600">#FF039BE5</color> - <color name="light_blue_900">#FF01579B</color> - <color name="light_blue_A200">#FF40C4FF</color> - <color name="light_blue_A400">#FF00B0FF</color> - <color name="black_overlay">#66000000</color> - <color name="foreground">#FF313131</color> +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="transparent">#00000000</color> + <color name="purple_200">#FFBB86FC</color> + <color name="purple_500">#FF6200EE</color> + <color name="purple_700">#FF3700B3</color> + <color name="teal_200">#FF03DAC5</color> + <color name="teal_700">#FF018786</color> + <color name="black">#FF000000</color> + <color name="white">#FFFFFFFF</color> + <color name="gray_50">#FFFAFAFA</color> + <color name="gray_100">#FFF4F4F5</color> + <color name="gray_300">#FFD4D4D8</color> + <color name="gray_500">#FF71717A</color> + <color name="gray_700">#FF3F3F46</color> + <color name="gray_800">#FF27272A</color> + <color name="gray_900">#FF18181B</color> + <color name="gray_container">#FF313131</color> + <color name="gray_subtitle">#FF9E9FAD</color> + <color name="green_200">#FFBBF7D0</color> + <color name="green_500">#FF22C55E</color> + <color name="green_700">#FF15803D</color> + <color name="green_900">#FF14532D</color> + <color name="red_500">#FF0606</color> + <color name="orange_400">#FFF38744</color> + <color name="orange_500">#FFF3722C</color> + <color name="light_blue_600">#FF039BE5</color> + <color name="light_blue_900">#FF01579B</color> + <color name="light_blue_A200">#FF40C4FF</color> + <color name="light_blue_A400">#FF00B0FF</color> + <color name="black_overlay">#66000000</color> + <color name="foreground">#FF313131</color> </resources> \ No newline at end of file