Commit 2f842f05 by 刘鹏

Merge branch 'feat/fq/fq_evaluation_4.3.99' into 'd/v4.3.99'

Feat/fq/fq evaluation 4.3.99

See merge request app_android_lib/YDL-Component!215
parents ccee666b 988f163a
...@@ -14,7 +14,7 @@ ext { ...@@ -14,7 +14,7 @@ ext {
"m-dynamic" : "0.0.7.79", "m-dynamic" : "0.0.7.79",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
"m-muse" : "0.0.28.84", "m-muse" : "0.0.28.84",
"m-tests" : "0.0.24.21", "m-tests" : "0.0.24.22",
"m-course" : "0.0.43.39", "m-course" : "0.0.43.39",
...@@ -100,7 +100,7 @@ ext { ...@@ -100,7 +100,7 @@ ext {
"m-dynamic" : "0.0.7.79", "m-dynamic" : "0.0.7.79",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
"m-muse" : "0.0.28.84", "m-muse" : "0.0.28.84",
"m-tests" : "0.0.24.21", "m-tests" : "0.0.24.22",
"m-course" : "0.0.43.39", "m-course" : "0.0.43.39",
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
......
...@@ -320,7 +320,7 @@ class TestCategoryListActivity : BaseMvpActivity<TestListActivityView, TestListA ...@@ -320,7 +320,7 @@ class TestCategoryListActivity : BaseMvpActivity<TestListActivityView, TestListA
private fun updateFilterTextViewStatus(tv: TextView, text: String, isNormal: Boolean) { private fun updateFilterTextViewStatus(tv: TextView, text: String, isNormal: Boolean) {
tv.text = text tv.text = text
if (isNormal) { if (isNormal) {
tv.setTextColor(ContextCompat.getColor(this, R.color.platform_colorTextDefault)) tv.setTextColor(ContextCompat.getColor(this, R.color.platform_color_999999))
tv.setCompoundDrawablesWithIntrinsicBounds( tv.setCompoundDrawablesWithIntrinsicBounds(
0, 0,
0, 0,
......
...@@ -89,7 +89,8 @@ ...@@ -89,7 +89,8 @@
app:tabIndicator="@drawable/tests_bg_indicator_search" app:tabIndicator="@drawable/tests_bg_indicator_search"
app:tabIndicatorColor="#2BB5F5" app:tabIndicatorColor="#2BB5F5"
app:tabIndicatorFullWidth="false" app:tabIndicatorFullWidth="false"
app:tabIndicatorHeight="3dp" app:tabSelectedTextColor="@color/platform_black"
app:tabTextColor="@color/platform_color_999999"
app:tabTextAppearance="@style/tests_MyTabLayout" app:tabTextAppearance="@style/tests_MyTabLayout"
app:tabPaddingTop="@dimen/platform_dp_5" /> app:tabPaddingTop="@dimen/platform_dp_5" />
...@@ -103,7 +104,7 @@ ...@@ -103,7 +104,7 @@
android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp" android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp" android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
android:text="综合排序" android:text="综合排序"
android:textColor="@color/platform_color_242424" /> android:textColor="@color/platform_color_999999" />
</LinearLayout> </LinearLayout>
......
...@@ -60,8 +60,7 @@ ...@@ -60,8 +60,7 @@
android:layout_height="44dp" android:layout_height="44dp"
app:tabIndicator="@drawable/tests_bg_indicator_search" app:tabIndicator="@drawable/tests_bg_indicator_search"
app:tabIndicatorColor="#2BB5F5" app:tabIndicatorColor="#2BB5F5"
app:tabIndicatorFullWidth="false" app:tabIndicatorFullWidth="false"/>
app:tabIndicatorHeight="3dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_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