Browse Source

修改在BaseActivity里面调用StyleConfig,处理其他测试问题

Pq 8 months ago
parent
commit
fcda98fb86

+ 2 - 0
BaseLibrary/src/main/java/com/cooleshow/base/ui/activity/BaseActivity.java

@@ -12,6 +12,7 @@ import androidx.viewbinding.ViewBinding;
 
 import com.cooleshow.base.R;
 import com.cooleshow.base.common.AppManager;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.base.utils.ErrorParse;
@@ -29,6 +30,7 @@ public abstract class BaseActivity<V extends ViewBinding> extends RxAppCompatAct
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         viewBinding = getLayoutView();
         setContentView(viewBinding.getRoot());

+ 44 - 38
student/src/main/res/layout/activity_appointment_course.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -13,43 +13,49 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/common_toolbar_layout" />
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tablayout"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@+id/toolbar_include"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_44"
-        android:scrollbars="none"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar_include"
-        app:tabBackground="@null"
-        app:tabGravity="fill"
-        app:tabPaddingStart="0dp"
-        app:tabPaddingEnd="0dp"
-        app:tabIndicator="@drawable/appoint_course_tab_indicator"
-        app:tabIndicatorColor="@color/color_2dc7aa"
-        app:tabIndicatorFullWidth="false"
-        app:tabIndicatorHeight="4dp"
-        app:tabMode="scrollable"
-        app:tabRippleColor="@null"
-        app:tabSelectedTextColor="@color/color_131415"
-        app:tabTextAppearance="@style/tab_layout_style"
-        app:tabTextColor="@color/color_80000000" />
+        <include
+            android:id="@+id/toolbar_include"
+            layout="@layout/common_toolbar_layout" />
 
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tablayout"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_44"
+            android:layout_below="@+id/toolbar_include"
+            android:layout_centerHorizontal="true"
+            android:scrollbars="none"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_include"
+            app:tabBackground="@null"
+            app:tabGravity="fill"
+            app:tabIndicator="@drawable/appoint_course_tab_indicator"
+            app:tabIndicatorColor="@color/color_2dc7aa"
+            app:tabIndicatorFullWidth="false"
+            app:tabIndicatorHeight="4dp"
+            app:tabMode="scrollable"
+            app:tabPaddingEnd="0dp"
+            app:tabPaddingStart="0dp"
+            app:tabRippleColor="@null"
+            app:tabSelectedTextColor="@color/color_131415"
+            app:tabTextAppearance="@style/tab_layout_style"
+            app:tabTextColor="@color/color_80000000" />
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:layout_below="@+id/tablayout"
-        android:id="@+id/viewPager"
-        android:descendantFocusability="blocksDescendants"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:overScrollMode="never"
-        android:scrollbars="none"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar_include" />
-</RelativeLayout>
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/tablayout"
+            android:overScrollMode="never"
+            android:scrollbars="none"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_include" />
+
+    </LinearLayout>
+</FrameLayout>

+ 1 - 1
student/src/main/res/layout/fg_interest_correction_course_list_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
student/src/main/res/layout/fg_live_course_appoint_list_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
student/src/main/res/layout/fg_video_course_appoint_list_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"

+ 1 - 1
student/src/main/res/layout/fg_vip_custom_course_list_layout.xml

@@ -48,7 +48,7 @@
     <com.cooleshow.base.widgets.ClearEditText
         android:id="@+id/et_target_name"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"