diff --git a/app/src/main/res/drawable/fade_mask.xml b/app/src/main/res/drawable/fade_mask.xml index 5f60893..6798a93 100644 --- a/app/src/main/res/drawable/fade_mask.xml +++ b/app/src/main/res/drawable/fade_mask.xml @@ -3,6 +3,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/float_fee.xml b/app/src/main/res/drawable/float_fee.xml new file mode 100644 index 0000000..912c3df --- /dev/null +++ b/app/src/main/res/drawable/float_fee.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/float_moeny.xml b/app/src/main/res/drawable/float_moeny.xml deleted file mode 100644 index e1f7c8c..0000000 --- a/app/src/main/res/drawable/float_moeny.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/float_money.xml b/app/src/main/res/drawable/float_money.xml new file mode 100644 index 0000000..928205d --- /dev/null +++ b/app/src/main/res/drawable/float_money.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/float_editor.xml b/app/src/main/res/layout/float_editor.xml index ce020e5..93a7218 100644 --- a/app/src/main/res/layout/float_editor.xml +++ b/app/src/main/res/layout/float_editor.xml @@ -33,9 +33,9 @@ android:layout_height="wrap_content" android:layout_margin="20dp" android:layout_marginBottom="@dimen/padding" - app:cardBackgroundColor="?attr/colorSurfaceContainer" + app:cardBackgroundColor="?attr/colorSurfaceContainerLow" app:cardCornerRadius="@dimen/radius" - app:strokeWidth="0dp" + app:strokeWidth="1dp" app:strokeColor="?attr/colorSurfaceContainerHighest" app:cardElevation="0dp"> @@ -78,6 +78,11 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1" /> + + + + + + - - - - - - + + + + - - - + app:iconSrc="@drawable/float_time" + app:iconTintEnabled="true" + app:text="2023年12月21日 11:11:00" + app:textColor="?attr/colorOnSurface" /> + diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..2958c74 --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,21 @@ + + + + #3B71CA + #DC4C64 + #E4A11B + #14A44D + \ 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 626cd3b..dcb6600 100755 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -18,10 +18,10 @@ #FF000000 #FFFFFFFF #CACACA - #3B71CA - #DC4C64 - #E4A11B - #14A44D + #155FDA + #E52544 + #CE7E0A + #189D4C #30000000 #45000000 \ No newline at end of file