Browse Source

提交人:jtm
提交内容:优化显示内容

江天明 1 year ago
parent
commit
6df45e6a59

+ 7 - 1
BusinessCommon/src/main/java/com/develop/common/widget/HomeFilterSortSearchView.kt

@@ -6,6 +6,8 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.RelativeLayout
 import com.blankj.utilcode.util.KeyboardUtils
+import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.resId2Dimension
 import com.develop.common.R
 
 import com.develop.common.databinding.HomeSortFilterSearchViewBinding
@@ -24,10 +26,14 @@ class HomeFilterSortSearchView : RelativeLayout {
         defStyleAttr
     ) {
     }
-
+    var dp19 = (R.dimen.convert_12px).resId2Dimension()
     init {
         val root = View.inflate(context, R.layout.home_sort_filter_search_view, this)
         binding = HomeSortFilterSearchViewBinding.bind(root)
+        if (isNightTheme()) {
+            binding.tvOnline.textSize = dp19
+            binding.tvDownload.textSize = dp19
+        }
         binding.searchCardView.setOnClickListener {
             binding.cardLayout.visibility = View.GONE
             binding.searchLayout.visibility = View.VISIBLE

+ 6 - 2
BusinessCommon/src/main/res/layout/home_sort_filter_search_view.xml

@@ -75,7 +75,7 @@
 
         <FrameLayout
             android:id="@+id/search_card_view"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/convert_216px"
             android:layout_height="@dimen/convert_60px"
             android:layout_marginStart="@dimen/convert_24px"
             android:layout_toEndOf="@id/sort_card_view"
@@ -89,7 +89,9 @@
                 android:background="@drawable/ic_home_search" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
+                android:singleLine="true"
+                android:ellipsize="end"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|end"
                 android:layout_marginStart="@dimen/convert_79px"
@@ -115,6 +117,7 @@
                 android:background="@drawable/ic_net" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_online"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|end"
@@ -141,6 +144,7 @@
                 android:background="@drawable/ic_download" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_download"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|end"

+ 2 - 2
BusinessStep/src/main/res/layout/activity_cook_step_base.xml

@@ -31,10 +31,10 @@
 
         <TextView
             android:id="@+id/tv_title_step"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:text="Step1:Peel 3 onions(180g)and2..."
-            android:gravity="center_vertical"
+            android:gravity="center"
             android:textColor="#ffffff"
             android:textSize="@dimen/convert_30px"
             android:maxLines="1"