fix: 解决冲突

This commit is contained in:
2023-08-01 16:30:08 +08:00
25 changed files with 458 additions and 63 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 950 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 763 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 798 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/baseline_add_24_press" android:state_selected="true" />
<item android:drawable="@drawable/baseline_add_24" android:state_selected="false" />
<item android:drawable="@drawable/icon_add_road_p" android:state_selected="true" />
<item android:drawable="@drawable/icon_add_road_n" android:state_selected="false" />
</selector>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_add_task_p" android:state_selected="true"></item>
<item android:drawable="@drawable/icon_add_task_n" />
</selector>

View File

@@ -154,7 +154,7 @@
android:id="@+id/main_activity_task_line"
style="@style/top_right_drawer_btns_style"
android:onClick="@{()->mainActivity.onClickTaskLink()}"
android:src="@drawable/icon_calc_disance" />
android:src="@drawable/icon_add_road" />
<ImageButton
android:id="@+id/main_activity_menu"

View File

@@ -58,6 +58,7 @@
android:layout_height="0dp"
android:layout_marginTop="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/task_search" />
app:layout_constraintTop_toBottomOf="@id/task_search"
tools:ignore="MissingClass" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -38,7 +38,7 @@
<item
android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24"
android:title="版本ONE_QE_V1.4.0_20230721_A" />
android:title="版本ONE_QE_V1.5.0_20230728_A" />
</group>
<group android:checkableBehavior="single">
<item android:title="小标题">