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!213

config.gradle

@@ -14,7 +14,7 @@ ext {
             "m-dynamic"       : "0.0.7.79",
             "m-article"       : "0.0.0.10",
             "m-muse"          : "0.0.28.81",
-            "m-tests"         : "0.0.24.20",
+            "m-tests"         : "0.0.24.21",
             "m-course"        : "0.0.43.39",
 
 
@@ -101,7 +101,7 @@ ext {
             "m-article"       : "0.0.0.10",
 
             "m-muse"          : "0.0.28.81",
-            "m-tests"         : "0.0.24.20",
+            "m-tests"         : "0.0.24.21",
             "m-course"        : "0.0.43.39",
 
 

m-tests/src/main/java/com/yidianling/tests/list/view/TestCategoryListActivity.kt

@@ -120,7 +120,7 @@ class TestCategoryListActivity : BaseMvpActivity<TestListActivityView, TestListA
         }
 
         for (i in title) {
-            val tab = tab_tabLayout.newTab().setText(i);
+            val tab = tab_tabLayout.newTab().setText(i)
             tab_tabLayout.addTab(tab)
         }
 

m-tests/src/main/res/drawable/tests_bg_indicator_search.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <item android:gravity="center">
+        <shape>
+            <size
+                android:width="@dimen/platform_dp_20"
+                android:height="@dimen/platform_dp_4" />
+
+            <corners android:radius="@dimen/platform_dp_5" />
+        </shape>
+    </item>
+</layer-list>

m-tests/src/main/res/layout/tests_activity_test_category_list.xml

@@ -11,31 +11,28 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/platform_title_bar_height"
         android:background="@color/white"
-        android:gravity="center_vertical"
-        >
+        android:gravity="center_vertical">
 
         <ImageView
             android:id="@+id/iv_test_list_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="15dp"
-            android:src="@drawable/tests_icon_test_back"
-            />
+            android:src="@drawable/tests_icon_test_back" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="32dp"
-            android:background="@drawable/tests_bg_test_search_input"
-            android:orientation="horizontal"
             android:layout_marginRight="15dp"
-            >
+            android:background="@drawable/tests_bg_test_search_input"
+            android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="13dp"
                 android:layout_height="13dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="12dp"
-                android:src="@drawable/tests_search_gray"/>
+                android:src="@drawable/tests_search_gray" />
 
             <TextView
                 android:id="@+id/tv_test_search"
@@ -48,7 +45,7 @@
                 android:textColor="#BFBFBF"
                 android:textSize="@dimen/platform_default_text_size_small"
                 android:textStyle="normal"
-                android:typeface="sans"/>
+                android:typeface="sans" />
 
         </LinearLayout>
 
@@ -66,47 +63,47 @@
             android:layout_width="72dp"
             android:layout_height="match_parent"
             android:background="#F7F7F7"
+            app:pa_indicator_color="@color/platform_main_theme"
             app:pa_tab_height="44dp"
             app:pa_tab_indicator_margin="13dp"
-            app:pa_tab_mode="scrollable"
-            app:pa_indicator_color="@color/platform_main_theme"
-            />
+            app:pa_tab_mode="scrollable" />
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:orientation="vertical"
-            >
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/ll_sort"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
-                android:orientation="horizontal"
-                >
+                android:orientation="horizontal">
 
                 <com.google.android.material.tabs.TabLayout
                     android:id="@+id/tab_tabLayout"
                     android:layout_width="0dp"
                     android:layout_height="44dp"
-                    app:tabIndicatorColor="@color/blue"
-                    app:tabIndicatorHeight="3dp"
+                    android:layout_weight="1"
+                    app:tabIndicator="@drawable/tests_bg_indicator_search"
+                    app:tabIndicatorColor="#2BB5F5"
                     app:tabIndicatorFullWidth="false"
-                    android:layout_weight="1"/>
+                    app:tabIndicatorHeight="3dp"
+                    app:tabTextAppearance="@style/tests_MyTabLayout"
+                    app:tabPaddingTop="@dimen/platform_dp_5" />
 
                 <com.ydl.ydlcommon.view.DrawableRightTextView
                     android:id="@+id/dr_sort"
                     style="@style/tests_FilterTextViewStyle"
                     android:layout_width="wrap_content"
-                    android:layout_height="44dp"
-                    android:layout_marginLeft="@dimen/platform_dp_16"
+                    android:layout_marginTop="@dimen/platform_dp_4"
+                    android:layout_height="@dimen/platform_dp_40"
+                    android:layout_marginLeft="@dimen/platform_dp_26"
                     android:drawableEnd="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
                     android:drawableRight="@drawable/platform_ic_arrow_drop_down_grey_500_18dp"
                     android:text="综合排序"
-                    android:textColor="@color/platform_color_242424"
-                    />
+                    android:textColor="@color/platform_color_242424" />
 
             </LinearLayout>
 
@@ -117,16 +114,14 @@
                 <com.ydl.ydlcommon.view.verticaltablayout.VerticalViewPager
                     android:id="@+id/vvp_test"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    />
+                    android:layout_height="match_parent" />
 
                 <View
                     android:id="@+id/view_mask"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="#3c000000"
-                    android:visibility="gone"
-                    />
+                    android:visibility="gone" />
 
             </RelativeLayout>
 

m-tests/src/main/res/layout/tests_activity_test_key_search.xml

@@ -58,11 +58,15 @@
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="44dp"
-        app:tabIndicatorColor="@color/blue"
+        app:tabIndicator="@drawable/tests_bg_indicator_search"
+        app:tabIndicatorColor="#2BB5F5"
         app:tabIndicatorFullWidth="false"
         app:tabIndicatorHeight="3dp" />
 
-    <View style="@style/platform_viewline" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="#F7F7F7" />
 
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout

m-tests/src/main/res/layout/tests_item_category_testlist_view.xml

@@ -34,7 +34,7 @@
         android:maxLines="2"
         android:minHeight="24dp"
         android:minLines="2"
-        android:textColor="#666"
+        android:textColor="#C5C5C5"
         android:textSize="12sp"
         tools:text="这里是副标题，这里是副标题，这里是副标题，这里是副标题"/>
 

m-tests/src/main/res/layout/tests_testlist_item_view.xml

@@ -30,7 +30,7 @@
         android:layout_marginRight="146dp"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textColor="#666"
+        android:textColor="#B5B5B5"
         android:textSize="12sp"
         android:lineSpacingExtra="4dp"
         android:minLines="2"

m-tests/src/main/res/values/styles.xml

@@ -30,4 +30,9 @@
         <item name="colorAccent">@color/platform_main_theme</item>
     </style>
 
+    <style name="tests_MyTabLayout" parent="TextAppearance.Design.Tab">
+        <item name="android:textStyle">bold</item>
+    </style>
+
+
 </resources>
\ No newline at end of file