diff --git a/common/src/main/res/layout/view_home_float_banner.xml b/common/src/main/res/layout/view_home_float_banner.xml index c3a1c764a..c05462cb9 100644 --- a/common/src/main/res/layout/view_home_float_banner.xml +++ b/common/src/main/res/layout/view_home_float_banner.xml @@ -24,16 +24,16 @@ android:layout_centerVertical="true" android:layout_marginStart="25dp" android:gravity="center" - android:padding="1.5dp" + android:padding="1dp" android:background="@drawable/bg_white_clip" android:visibility="visible"> + android:layout_height="24dp" /> @@ -62,14 +62,14 @@ android:gravity="center" android:layout_centerVertical="true" android:layout_marginStart="7dp" - android:padding="1.5dp" + android:padding="1dp" android:background="@drawable/bg_white_clip" android:visibility="visible"> diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml index bac1062b4..d535fb8cc 100644 --- a/common/src/main/res/values-en/strings.xml +++ b/common/src/main/res/values-en/strings.xml @@ -527,7 +527,7 @@ Scavenging Cache cleared search - Search by nickname or ID + Please enter the nickname or ID you want to search No content found QQ QQ Zone diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 1378ee9ef..2d19ac9ff 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -464,7 +464,7 @@ 清除中 緩存已清除 蒐索 - 搜索昵稱或ID + 請輸入您要搜索的昵稱或ID 沒有搜索到相關內容 QQ電話 QQ空間 diff --git a/main/src/main/java/com/yunbao/main/adapter/SearchRecommendBodyAdapter.java b/main/src/main/java/com/yunbao/main/adapter/SearchRecommendBodyAdapter.java index 112fba9cd..7419fb8bd 100644 --- a/main/src/main/java/com/yunbao/main/adapter/SearchRecommendBodyAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/SearchRecommendBodyAdapter.java @@ -30,7 +30,7 @@ public class SearchRecommendBodyAdapter extends RecyclerView.Adapter { @NonNull @Override public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_home_lives, parent, false); + View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_home_lives2, parent, false); return new SearchRecommendBodyItemViewHolder(herdView); } diff --git a/main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java b/main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java index 875b7ae6e..3a4b22404 100644 --- a/main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java @@ -45,7 +45,7 @@ public class SearchRecommendHeardViewHolder extends RecyclerView.ViewHolder { chip.setText(key); chip.setMaxEms(10); chip.setTextColor(Color.parseColor("#FF999999")); - chip.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); + chip.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12); chip.setSingleLine(); chip.setBackgroundResource(R.drawable.background_search_chip); chip.setLayoutParams(layoutParams); diff --git a/main/src/main/res/drawable/background_search_chip.xml b/main/src/main/res/drawable/background_search_chip.xml index 00ca63634..9983935e4 100644 --- a/main/src/main/res/drawable/background_search_chip.xml +++ b/main/src/main/res/drawable/background_search_chip.xml @@ -2,7 +2,7 @@ - + diff --git a/main/src/main/res/layout/activity_search.xml b/main/src/main/res/layout/activity_search.xml index 4b6f53428..cc9dcf407 100644 --- a/main/src/main/res/layout/activity_search.xml +++ b/main/src/main/res/layout/activity_search.xml @@ -29,8 +29,8 @@ android:orientation="horizontal"> diff --git a/main/src/main/res/layout/item_main_home_lives2.xml b/main/src/main/res/layout/item_main_home_lives2.xml new file mode 100644 index 000000000..e77be7e73 --- /dev/null +++ b/main/src/main/res/layout/item_main_home_lives2.xml @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/view_search_recommend_body.xml b/main/src/main/res/layout/view_search_recommend_body.xml index a685ae7d5..8a1a856ca 100644 --- a/main/src/main/res/layout/view_search_recommend_body.xml +++ b/main/src/main/res/layout/view_search_recommend_body.xml @@ -2,18 +2,16 @@ + android:orientation="vertical"> + android:layout_height="wrap_content" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp"> - + + android:layout_marginTop="16dp" + android:fadingEdge="none" /> \ No newline at end of file diff --git a/main/src/main/res/layout/view_search_recommend_heard.xml b/main/src/main/res/layout/view_search_recommend_heard.xml index 44b439550..db5b13e6c 100644 --- a/main/src/main/res/layout/view_search_recommend_heard.xml +++ b/main/src/main/res/layout/view_search_recommend_heard.xml @@ -28,12 +28,14 @@ android:id="@+id/search_del" android:layout_width="23dp" android:layout_height="23dp" - android:layout_gravity="end" + android:layout_marginTop="2dp" + android:layout_gravity="end|center_vertical" android:src="@mipmap/search_del" /> diff --git a/main/src/main/res/layout/view_search_results_item.xml b/main/src/main/res/layout/view_search_results_item.xml index e74388a8e..aab38cf7e 100644 --- a/main/src/main/res/layout/view_search_results_item.xml +++ b/main/src/main/res/layout/view_search_results_item.xml @@ -53,7 +53,6 @@