Merge branch 'dev_share'

# Conflicts:
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java

common/src/main/res/layout/custom_drawer_popup.xml

@@ -41,27 +41,6 @@
                     android:textSize="10sp" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/effects_settings_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="26dp"
-                    android:layout_height="26dp"
-                    android:src="@mipmap/live_more_icon_special_new" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:text="@string/effects_settings"
-                    android:textColor="#FF9A9A9A"
-                    android:textSize="10sp" />
-            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/slide_settings_layout"
@@ -85,6 +64,28 @@
                     android:textSize="10sp" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/share_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="26dp"
+                    android:layout_height="26dp"
+                    android:src="@mipmap/ic_custom_share" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="分享設置"
+                    android:textColor="#FF9A9A9A"
+                    android:textSize="10sp" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/float_settings_layout"
                 android:layout_width="wrap_content"

common/src/main/res/layout/view_more_menu.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="176dp"
+    android:layout_width="220dp"
     android:layout_height="62dp"
     app:cardBackgroundColor="#0F0B14"
     app:cardCornerRadius="4dp"
@@ -11,6 +11,27 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center_vertical">
+        <LinearLayout
+            android:id="@+id/effects_settings_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:src="@mipmap/live_more_icon_special_new" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@string/effects_settings"
+                android:textColor="#FF9A9A9A"
+                android:textSize="10sp" />
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/system_notice"