Merge remote-tracking branch 'origin/master'

app/src/main/res/layout/item_search.xml

@@ -27,8 +27,8 @@
         android:scaleType="centerCrop"
         android:src="@color/md_green_600"
         android:visibility="invisible"
-        app:layout_constraintRight_toRightOf="@id/iv_cover"
-        app:layout_constraintTop_toTopOf="@id/iv_cover" />
+        app:layout_constraintLeft_toRightOf="@id/iv_cover"
+        app:layout_constraintTop_toTopOf="@id/tv_name" />
 
     <io.legado.app.ui.widget.text.BadgeView
         android:id="@+id/bv_originCount"
@@ -48,16 +48,17 @@
         android:textColor="@color/primaryText"
         android:textSize="16sp"
         app:layout_constraintEnd_toStartOf="@id/bv_originCount"
-        app:layout_constraintStart_toEndOf="@+id/iv_cover"
+        app:layout_constraintStart_toEndOf="@+id/iv_in_bookshelf"
         app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:layout_marginStart="8dp"
         android:orientation="vertical"
         android:layout_marginTop="3dp"
         app:layout_constraintBottom_toBottomOf="@id/iv_cover"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_name"
+        app:layout_constraintLeft_toRightOf="@+id/iv_cover"
         app:layout_constraintRight_toRightOf="@id/tv_name"
         app:layout_constraintTop_toBottomOf="@+id/tv_name">
 

app/src/main/res/menu/source_edit.xml

@@ -42,6 +42,11 @@
         android:title="@string/paste_source"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_set_source_variable"
+        android:title="@string/set_source_variable"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_qr_code_camera"
         android:title="@string/import_by_qr_code"

app/src/main/res/values-zh/arrays.xml

@@ -28,7 +28,8 @@
     <string-array name="double_page_title">
         <item>全局单页</item>
         <item>全局双页</item>
-        <item>横屏双页/竖屏单页</item>
+        <item>横屏双页</item>
+        <item>平板/横屏双页</item>
     </string-array>
 
     <string-array name="NavBarColors">

app/src/main/res/values/array_values.xml

@@ -38,6 +38,7 @@
         <item>0</item>
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
 
     <string-array name="progress_bar_behavior_value">

app/src/main/res/values/arrays.xml

@@ -65,7 +65,8 @@
 	<string-array name="double_page_title">
 		<item>全局单页</item>
 		<item>全局双页</item>
-		<item>横屏双页 竖屏单页</item>
+		<item>横屏双页</item>
+		<item>平板/横屏双页</item>
 	</string-array>
 
 	<string-array name="progress_bar_behavior_title">