更换网络教室白板工具栏UI

live_teaching/src/main/java/com/daya/live_teaching/ui/fragmnet/TeachingToolsFragment.java

@@ -117,7 +117,7 @@ public class TeachingToolsFragment extends BaseFragment<FragmentTeachingToolsBin
             R.drawable.fragment_top_accompaniment_selector,
             R.drawable.ic_metronome_setting,
             R.drawable.fragment_top_operate_metronome_selector,
-            R.drawable.ic_metronome_setting,
+            R.drawable.icon_teaching_courseware,
     };
 
     @Override

live_teaching/src/main/res/drawable/fragment_top_operate_courseware_selector.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_teaching_courseware" android:state_checked="false"/>
+    <item android:drawable="@drawable/icon_teaching_courseware" android:state_checked="true"/>
+    <item android:drawable="@drawable/icon_teaching_courseware"/>
+</selector>

live_teaching/src/main/res/drawable/toolbox_background2.xml

@@ -0,0 +1,11 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="26dp"/>
+            <solid android:color="@color/white"/>
+            <stroke
+                android:color="@color/color_e5e5e5"
+                android:width="1dp"/>
+        </shape>
+    </item>
+</selector>

live_teaching/src/main/res/layout/fragment_white_board.xml

@@ -25,72 +25,79 @@
             <LinearLayout
                 android:id="@+id/ll_tool_button"
                 android:layout_width="wrap_content"
-                android:layout_height="40dp"
+                android:layout_height="48dp"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
                 android:layout_marginBottom="@dimen/dp_20"
-                android:background="@drawable/toolbox_background"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
+                android:background="@drawable/toolbox_background2"
+                android:paddingStart="13dp"
+                android:paddingEnd="13dp"
                 android:visibility="visible">
 
                 <Button
                     android:id="@+id/btnPencil"
-                    style="@style/ToolButton"
+                    android:layout_width="38dp"
                     android:layout_height="match_parent"
-                    android:drawableStart="@drawable/ic_appliance_pencil"
-                    android:paddingStart="11dp"
-                    android:paddingEnd="0dp" />
+                    android:background="@color/transparent"
+                    android:drawableStart="@drawable/icon_appliance_pencil"
+                    android:paddingStart="9dp"
+                    android:paddingEnd="9dp" />
 
                 <Button
                     android:id="@+id/btnEraser"
-                    style="@style/ToolButton"
+                    android:layout_width="38dp"
                     android:layout_height="match_parent"
-                    android:drawableStart="@drawable/ic_appliance_eraser"
-                    android:paddingStart="11dp"
-                    android:paddingEnd="0dp" />
+                    android:background="@color/transparent"
+                    android:drawableStart="@drawable/icon_appliance_eraser"
+                    android:paddingStart="9dp"
+                    android:paddingEnd="9dp" />
 
                 <Button
                     android:id="@+id/btnEllipse"
-                    style="@style/ToolButton"
+                    android:layout_width="38dp"
                     android:layout_height="match_parent"
-                    android:drawableStart="@drawable/ic_appliance_ellipse"
-                    android:paddingStart="11dp"
-                    android:paddingEnd="0dp" />
+                    android:background="@color/transparent"
+                    android:drawableStart="@drawable/icon_appliance_ellipse"
+                    android:paddingStart="9dp"
+                    android:paddingEnd="9dp" />
 
                 <Button
                     android:id="@+id/btn_clean_scene"
-                    style="@style/ToolButton"
+                    android:layout_width="38dp"
                     android:layout_height="match_parent"
-                    android:drawableStart="@drawable/ic_clean_scene"
-                    android:paddingStart="11dp"
-                    android:paddingEnd="0dp" />
+                    android:background="@color/transparent"
+                    android:drawableStart="@drawable/icon_clean_scene"
+                    android:paddingStart="9dp"
+                    android:paddingEnd="9dp" />
 
 
                 <Button
                     android:id="@+id/btn_remove_scenes"
-                    style="@style/ToolButton"
+                    android:layout_width="38dp"
                     android:layout_height="match_parent"
-                    android:drawableStart="@drawable/ic_remove_scenes"
-                    android:paddingStart="11dp"
-                    android:paddingEnd="0dp" />
+                    android:background="@color/transparent"
+                    android:drawableStart="@drawable/icon_remove_scenes"
+                    android:paddingStart="9dp"
+                    android:paddingEnd="9dp" />
 
 
                 <Button
                     android:id="@+id/btn_create_scenes"
-                    style="@style/ToolButton"
+                    android:layout_width="38dp"
                     android:layout_height="match_parent"
-                    android:drawableStart="@drawable/ic_create_scenes"
-                    android:paddingStart="13dp"
-                    android:paddingEnd="0dp" />
+                    android:background="@color/transparent"
+                    android:drawableStart="@drawable/icon_create_scenes"
+                    android:paddingStart="9dp"
+                    android:paddingEnd="9dp" />
 
                 <Button
                     android:id="@+id/btn_insert_image"
-                    style="@style/ToolButton"
+                    android:layout_width="38dp"
                     android:layout_height="match_parent"
-                    android:drawableStart="@drawable/ic_insert_image"
-                    android:paddingStart="13dp"
-                    android:paddingEnd="0dp" />
+                    android:background="@color/transparent"
+                    android:drawableStart="@drawable/icon_insert_image"
+                    android:paddingStart="9dp"
+                    android:paddingEnd="9dp" />
 
                 <Button
                     android:id="@+id/btn_insert_practice"
@@ -101,13 +108,17 @@
                     android:paddingEnd="0dp"
                     android:visibility="gone" />
 
-                <ImageView
-                    android:gravity="center"
+                <Button
                     android:id="@+id/btn_courseware"
-                    style="@style/ToolButton"
+                    android:layout_width="38dp"
                     android:layout_height="match_parent"
-                    android:src="@drawable/icon_courseware_score"
+                    android:background="@color/transparent"
+                    android:drawableStart="@drawable/icon_courseware_score"
+                    android:gravity="center"
+                    android:paddingStart="9dp"
+                    android:paddingEnd="9dp"
                     android:visibility="visible" />
+
             </LinearLayout>