Commit 51280339 authored by wanglei's avatar wanglei

...

parent 15ac3cf7
...@@ -60,7 +60,8 @@ class WebsiteAdapter(val uiType: Int = 0, val click: (bean: WebSiteBean) -> Unit ...@@ -60,7 +60,8 @@ class WebsiteAdapter(val uiType: Int = 0, val click: (bean: WebSiteBean) -> Unit
} else { } else {
binding.ivIcon.visibility = View.VISIBLE binding.ivIcon.visibility = View.VISIBLE
binding.ivAdd.visibility = View.GONE binding.ivAdd.visibility = View.GONE
val bordIconName = arrayOf("Ebay", "Bing") val bordIconName = arrayOf("Ebay", "Bing", "Wikipedia", "Pinterest")
// LogEx.logDebug(TAG, bean.name)
if (bordIconName.contains(bean.name)) { if (bordIconName.contains(bean.name)) {
binding.ivIcon.borderColor = ContextCompat.getColor(context, R.color.color_cbcdd7) binding.ivIcon.borderColor = ContextCompat.getColor(context, R.color.color_cbcdd7)
binding.ivIcon.borderWidth = 1 binding.ivIcon.borderWidth = 1
......
<?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="#0571ED" /> <solid android:color="#0571ED" />
<corners android:radius="25dp" /> <corners android:radius="16dp" />
</shape> </shape>
\ No newline at end of file
<?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="#0571ED" /> <solid android:color="#0571ED" />
<corners android:radius="16dp" /> <corners android:radius="25dp" />
</shape> </shape>
\ No newline at end of file
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
<stroke <stroke
android:width="0.5dp" android:width="0.5dp"
android:color="#DEE9F4" /> android:color="#DEE9F4" />
<corners android:radius="16dp" /> <corners android:radius="25dp" />
</shape> </shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_0571ed_16" android:state_selected="true"/> <item android:drawable="@drawable/bg_0571ed_25" android:state_selected="true" />
<item android:drawable="@drawable/bg_f3f4f6_stroke_dee9f4" android:state_selected="false"/> <item android:drawable="@drawable/bg_f3f4f6_stroke_dee9f4" android:state_selected="false" />
</selector> </selector>
\ No newline at end of file
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
android:id="@+id/iv_icon" android:id="@+id/iv_icon"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
app:civ_circle_background_color="#FDFDFD" app:civ_border_overlay="true"
app:civ_circle_background_color="#cbcdd7"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@mipmap/amazon" /> tools:src="@mipmap/amazon" />
...@@ -29,7 +30,6 @@ ...@@ -29,7 +30,6 @@
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
android:visibility="gone" android:visibility="gone"
app:civ_circle_background_color="#FDFDFD"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@mipmap/amazon" /> tools:src="@mipmap/amazon" />
</FrameLayout> </FrameLayout>
......
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