Merge remote-tracking branch 'origin/dev' into dev

2021-03-26 15:16:40 +08:00
parent 1c51b2fe41 233f91d2b9
commit eb4bbb9efa
10 changed files with 4 additions and 1 deletions
--- a/app/src/main/res/drawable-xxhdpi/ic_search_hot.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_search_hot.png
--- a/app/src/main/res/drawable-xxhdpi/ic_search_hot.webp
+++ b/app/src/main/res/drawable-xxhdpi/ic_search_hot.webp
--- a/app/src/main/res/drawable-xxhdpi/ic_search_new.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_search_new.png
--- a/app/src/main/res/drawable-xxhdpi/ic_search_new.webp
+++ b/app/src/main/res/drawable-xxhdpi/ic_search_new.webp
--- a/app/src/main/res/drawable-xxhdpi/ic_search_surge.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_search_surge.png
--- a/app/src/main/res/drawable-xxhdpi/ic_search_surge.webp
+++ b/app/src/main/res/drawable-xxhdpi/ic_search_surge.webp
--- a/app/src/main/res/drawable-xxxhdpi/ic_search_hot.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_search_hot.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_search_new.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_search_new.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_search_surge.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_search_surge.png
--- a/app/src/main/res/layout/fragment_search_default.xml
+++ b/app/src/main/res/layout/fragment_search_default.xml
@ -111,7 +111,10 @@
            android:layout_height="wrap_content"
            android:background="@android:color/white"
            android:includeFontPadding="false"
-            android:padding="16dp"
+            android:paddingLeft="16dp"
+            android:paddingBottom="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="32dp"
            android:text="@string/search_hot"
            android:textColor="@color/text_0E0E0E"
            android:textSize="14sp"