Commit 59db592b authored by yinjiacheng's avatar yinjiacheng

fix 清除按钮icon资源冲突

parent 25cdbf72
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
android:layout_marginStart="@dimen/dp10" android:layout_marginStart="@dimen/dp10"
android:layout_marginEnd="@dimen/dp12" android:layout_marginEnd="@dimen/dp12"
android:onClick="@{() -> vm.toClear()}" android:onClick="@{() -> vm.toClear()}"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
app:isShow="@{!vm.searchKeyword.empty}" app:isShow="@{!vm.searchKeyword.empty}"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
android:layout_width="@dimen/dp24" android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24" android:layout_height="@dimen/dp24"
android:layout_marginEnd="@dimen/dp10" android:layout_marginEnd="@dimen/dp10"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
android:layout_width="@dimen/dp24" android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24" android:layout_height="@dimen/dp24"
android:layout_marginEnd="@dimen/dp10" android:layout_marginEnd="@dimen/dp10"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:padding="@dimen/dp10" android:padding="@dimen/dp10"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
android:layout_height="23dp" android:layout_height="23dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
android:layout_alignEnd="@id/et_search_key" android:layout_alignEnd="@id/et_search_key"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp10" android:layout_marginEnd="@dimen/dp10"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
android:id="@+id/iv_clear" android:id="@+id/iv_clear"
android:layout_width="23dp" android:layout_width="23dp"
android:layout_height="23dp" android:layout_height="23dp"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/et_content" app:layout_constraintBottom_toBottomOf="@id/et_content"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
android:id="@+id/iv_clear" android:id="@+id/iv_clear"
android:layout_width="23dp" android:layout_width="23dp"
android:layout_height="23dp" android:layout_height="23dp"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
android:layout_height="23dp" android:layout_height="23dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/iv_content" app:layout_constraintEnd_toEndOf="@id/iv_content"
app:layout_constraintTop_toTopOf="@id/iv_content" /> app:layout_constraintTop_toTopOf="@id/iv_content" />
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/dp10" android:padding="@dimen/dp10"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
android:layout_width="@dimen/dp24" android:layout_width="@dimen/dp24"
android:layout_height="@dimen/dp24" android:layout_height="@dimen/dp24"
android:onClick="@{() -> vm.clearSearch()}" android:onClick="@{() -> vm.clearSearch()}"
android:src="@drawable/icon_clear" android:src="@drawable/bcommon_icon_clear"
android:visibility="@{etSearch.text.length() > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{etSearch.text.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment