merge code

This commit is contained in:
qiji4215 2023-05-06 16:01:51 +08:00
parent 8e4d1c7e0e
commit 1d1fe13ab4
6 changed files with 4 additions and 4 deletions

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" > <shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/black" /> <solid android:color="@color/white" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/deepskyblue" /> android:color="@color/highFontColor" />
<corners <corners
android:bottomLeftRadius="5dp" android:bottomLeftRadius="5dp"
android:bottomRightRadius="5dp" android:bottomRightRadius="5dp"

View File

@ -13,7 +13,7 @@
android:id="@+id/qs_record_index" android:id="@+id/qs_record_index"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableLeft="@mipmap/marker" android:drawableLeft="@mipmap/marker2"
android:maxLength="3" android:maxLength="3"
android:text="" android:text=""
android:layout_marginRight="@dimen/default_widget_padding" android:layout_marginRight="@dimen/default_widget_padding"

View File

@ -16,7 +16,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:background="@drawable/drawable_bg_blue_frame_black_bg_4_radius" android:background="@drawable/drawable_bg_blue_frame_white_bg_4_radius"
android:orientation="horizontal" android:orientation="horizontal"
> >
<ImageView <ImageView

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 659 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB