解决冲突

This commit is contained in:
wds
2021-05-26 18:47:39 +08:00
33 changed files with 249 additions and 72 deletions

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="3dp" android:height="6dp"/>
<solid android:color="@color/colorBack" />
</shape>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1dp" android:color="@color/colorGrey"/>
<solid android:color="@color/colorWhite"/>
</shape>