Merge branch 'view-adjustment'

reader/src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -202,18 +202,18 @@ abstract class ReaderActivity : AppCompatActivity() {
         AnnotationColor.values().forEach {
             if (resources.getColor(it.colorResId) == color) {
                 val drawableResId = when (it) {
-                    AnnotationColor.Color1 -> R.drawable.ic_tool_freehand_s1
-                    AnnotationColor.Color2 -> R.drawable.ic_tool_freehand_s2
-                    AnnotationColor.Color3 -> R.drawable.ic_tool_freehand_s3
-                    AnnotationColor.Color4 -> R.drawable.ic_tool_freehand_s4
-                    AnnotationColor.Color5 -> R.drawable.ic_tool_freehand_s5
-                    AnnotationColor.Color6 -> R.drawable.ic_tool_freehand_s6
-                    AnnotationColor.Color7 -> R.drawable.ic_tool_freehand_s7
-                    AnnotationColor.Color8 -> R.drawable.ic_tool_freehand_s8
-                    AnnotationColor.Color9 -> R.drawable.ic_tool_freehand_s9
-                    AnnotationColor.Color10 -> R.drawable.ic_tool_freehand_s10
+                    AnnotationColor.Color1 -> R.drawable.ic_reader_right_toolbar_ink_color1
+                    AnnotationColor.Color2 -> R.drawable.ic_reader_right_toolbar_ink_color2
+                    AnnotationColor.Color3 -> R.drawable.ic_reader_right_toolbar_ink_color3
+                    AnnotationColor.Color4 -> R.drawable.ic_reader_right_toolbar_ink_color4
+                    AnnotationColor.Color5 -> R.drawable.ic_reader_right_toolbar_ink_color5
+                    AnnotationColor.Color6 -> R.drawable.ic_reader_right_toolbar_ink_color6
+                    AnnotationColor.Color7 -> R.drawable.ic_reader_right_toolbar_ink_color7
+                    AnnotationColor.Color8 -> R.drawable.ic_reader_right_toolbar_ink_color8
+                    AnnotationColor.Color9 -> R.drawable.ic_reader_right_toolbar_ink_color9
+                    AnnotationColor.Color10 -> R.drawable.ic_reader_right_toolbar_ink_color10
                 }
-                iv_readerActivity_inkStroke.setImageResource(drawableResId)
+                iv_readerActivity_ink.setImageResource(drawableResId)
                 return
             }
         }

reader/src/main/res/drawable-hdpi/selector_tool_settings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/ic_tool_setting_h" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_tool_setting_h" android:state_enabled="true" android:state_focused="true"/>
-    <item android:drawable="@drawable/ic_tool_settings"/>
-
-</selector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color1.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#000000" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color10.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#ffffff" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color2.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#296dd2" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color3.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#57d214" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color4.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#ff7e00" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color5.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#ff7e00" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color6.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#fe866a" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color7.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#d11bff" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color8.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#ff1b89" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_ink_color9.xml

@@ -0,0 +1,6 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.75,7L14,3.25l-10,10L4,17h3.75l10,-10zM20.71,4.04c0.39,-0.39 0.39,-1.02 0,-1.41L18.37,0.29c-0.39,-0.39 -1.02,-0.39 -1.41,0L15,2.25 18.75,6l1.96,-1.96z"/>
+    <path android:fillColor="#dd0202" android:pathData="M0,20h24v4H0z"/>
+</vector>

reader/src/main/res/drawable/ic_reader_right_toolbar_text.xml

@@ -0,0 +1,5 @@
+<vector android:alpha="0.6" android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M5,4v3h5.5v12h3V7H19V4z"/>
+</vector>

reader/src/main/res/layout/activity_reader.xml

@@ -77,19 +77,16 @@
                     android:onClick="onClick"
                     style="@style/ReaderLeftRightToolbarIImageButton"
                     android:src="@drawable/ic_left_toolbar_thumbnails" />
-                <View style="@style/ReaderLeftToolbarDivider"/>
                 <ImageView
                     android:id="@+id/iv_readerActivity_bookmark"
                     android:onClick="onClick"
                     style="@style/ReaderLeftRightToolbarIImageButton"
                     android:src="@drawable/ic_left_toolbar_bookmarks" />
-                <View style="@style/ReaderLeftToolbarDivider"/>
                 <ImageView
                     android:id="@+id/iv_readerActivity_outline"
                     android:onClick="onClick"
                     style="@style/ReaderLeftRightToolbarIImageButton"
                     android:src="@drawable/ic_left_toolbar_outline" />
-                <View style="@style/ReaderLeftToolbarDivider"/>
                 <ImageView
                     android:id="@+id/iv_readerActivity_search"
                     android:onClick="onClick"
@@ -119,33 +116,13 @@
                     android:src="@drawable/selector_tool_fullscreen"
                     android:onClick="onClick"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerFullScreenCopy"
-                    style="@style/ReaderLeftRightToolbarIImageButton" />
-                <View
-                    android:id="@+id/view_readerActivity_rightToolbarDividerFullScreenCopy"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_fullScreen"
                     app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_copy"
-                    style="@style/ReaderRightToolbarDivider"/>
+                    style="@style/ReaderLeftRightToolbarIImageButton" />
                 <ImageView
                     android:id="@+id/iv_readerActivity_copy"
                     android:src="@drawable/ic_content_copy_gray_24dp"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerFullScreenCopy"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerCopyHighLight"
-                    style="@style/ReaderLeftRightToolbarIImageButton" />
-                <View
-                    android:id="@+id/view_readerActivity_rightToolbarDividerCopyHighLight"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_copy"
+                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_fullScreen"
                     app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_highLight"
-                    style="@style/ReaderRightToolbarDivider"/>
-                <ImageView
-                    android:id="@+id/iv_readerActivity_highLight"
-                    android:src="@drawable/ic_tool_text"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerCopyHighLight"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerHighLightStrike"
                     style="@style/ReaderLeftRightToolbarIImageButton" />
                 <View
                     android:id="@+id/view_readerActivity_highLightStroke"
@@ -156,19 +133,18 @@
                     android:layout_margin="12dp"
                     android:background="@color/highlight_default_color"
                     android:layout_width="0dp"
-                    android:layout_height="4dp" />
-                <View
-                    android:id="@+id/view_readerActivity_rightToolbarDividerHighLightStrike"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_highLight"
+                    android:layout_height="8dp" />
+                <ImageView
+                    android:id="@+id/iv_readerActivity_highLight"
+                    android:src="@drawable/ic_reader_right_toolbar_text"
+                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_copy"
                     app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_strike"
-                    style="@style/ReaderRightToolbarDivider"/>
+                    style="@style/ReaderLeftRightToolbarIImageButton" />
                 <ImageView
                     android:id="@+id/iv_readerActivity_strike"
-                    android:src="@drawable/ic_tool_text"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerHighLightStrike"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerStrikeUnderline"
+                    android:src="@drawable/ic_reader_right_toolbar_text"
+                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_highLight"
+                    app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_underline"
                     style="@style/ReaderLeftRightToolbarIImageButton" />
                 <View
                     android:id="@+id/view_readerActivity_strikeStroke"
@@ -179,19 +155,12 @@
                     android:layout_margin="12dp"
                     android:background="@color/strike_default_color"
                     android:layout_width="0dp"
-                    android:layout_height="1dp" />
-                <View
-                    android:id="@+id/view_readerActivity_rightToolbarDividerStrikeUnderline"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_strike"
-                    app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_underline"
-                    style="@style/ReaderRightToolbarDivider"/>
+                    android:layout_height="2dp" />
                 <ImageView
                     android:id="@+id/iv_readerActivity_underline"
-                    android:src="@drawable/ic_tool_text"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerStrikeUnderline"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerUnderlineInk"
+                    android:src="@drawable/ic_reader_right_toolbar_text"
+                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_strike"
+                    app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_ink"
                     style="@style/ReaderLeftRightToolbarIImageButton" />
                 <View
                     android:id="@+id/view_readerActivity_underlineStroke"
@@ -201,41 +170,17 @@
                     android:layout_margin="12dp"
                     android:background="@color/underline_default_color"
                     android:layout_width="0dp"
-                    android:layout_height="1dp" />
-                <View
-                    android:id="@+id/view_readerActivity_rightToolbarDividerUnderlineInk"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_underline"
-                    app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_ink"
-                    style="@style/ReaderRightToolbarDivider"/>
+                    android:layout_height="2dp" />
                 <ImageView
                     android:id="@+id/iv_readerActivity_ink"
-                    android:src="@drawable/ic_tool_ink"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerUnderlineInk"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerInkSetting"
-                    style="@style/ReaderLeftRightToolbarIImageButton" />
-                <ImageView
-                    android:id="@+id/iv_readerActivity_inkStroke"
-                    style="@style/ReaderLeftRightToolbarIImageButton"
-                    app:layout_constraintLeft_toLeftOf="@id/iv_readerActivity_ink"
-                    app:layout_constraintRight_toRightOf="@id/iv_readerActivity_ink"
-                    app:layout_constraintTop_toTopOf="@id/iv_readerActivity_ink"
-                    app:layout_constraintBottom_toBottomOf="@id/iv_readerActivity_ink"
-                    android:src="@drawable/ic_tool_freehand_s9"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp" />
-                <View
-                    android:id="@+id/view_readerActivity_rightToolbarDividerInkSetting"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_ink"
+                    android:src="@drawable/ic_reader_right_toolbar_ink_color1"
+                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_underline"
                     app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_setting"
-                    style="@style/ReaderRightToolbarDivider"/>
+                    style="@style/ReaderLeftRightToolbarIImageButton" />
                 <ImageView
                     android:id="@+id/iv_readerActivity_setting"
-                    android:src="@drawable/selector_tool_settings"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerInkSetting"
+                    android:src="@drawable/ic_reader_right_toolbar_settings"
+                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_ink"
                     app:layout_constraintBottom_toBottomOf="parent"
                     style="@style/ReaderLeftRightToolbarIImageButton" />
             </android.support.constraint.ConstraintLayout>

reader/src/main/res/values/styles.xml

@@ -8,20 +8,6 @@
         <item name="android:textColorPrimary">@color/reader_toolbar_title_color</item>
         <item name="android:textColor">@color/reader_toolbar_title_color</item>
     </style>
-    <style name="ReaderLeftToolbarDivider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:layout_marginLeft">6dp</item>
-        <item name="android:layout_marginRight">6dp</item>
-        <item name="android:background">#aaa</item>
-    </style>
-    <style name="ReaderRightToolbarDivider">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:layout_marginLeft">6dp</item>
-        <item name="android:layout_marginRight">6dp</item>
-        <item name="android:background">#aaa</item>
-    </style>
     <style name="ReaderLeftRightToolbarIImageButton">
         <item name="android:padding">12dp</item>
         <item name="android:scaleType">center</item>