Remove right toolbar divider

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

@@ -118,33 +118,19 @@
                     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"/>
+                    style="@style/ReaderLeftRightToolbarIImageButton" />
                 <ImageView
                     android:id="@+id/iv_readerActivity_highLight"
                     android:src="@drawable/ic_reader_right_toolbar_text"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerCopyHighLight"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerHighLightStrike"
+                    app:layout_constraintTop_toBottomOf="@id/iv_readerActivity_copy"
+                    app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_strike"
                     style="@style/ReaderLeftRightToolbarIImageButton" />
                 <View
                     android:id="@+id/view_readerActivity_highLightStroke"
@@ -156,18 +142,11 @@
                     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"
-                    app:layout_constraintBottom_toTopOf="@id/iv_readerActivity_strike"
-                    style="@style/ReaderRightToolbarDivider"/>
                 <ImageView
                     android:id="@+id/iv_readerActivity_strike"
                     android:src="@drawable/ic_reader_right_toolbar_text"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerHighLightStrike"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerStrikeUnderline"
+                    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,18 +158,11 @@
                     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"/>
                 <ImageView
                     android:id="@+id/iv_readerActivity_underline"
                     android:src="@drawable/ic_reader_right_toolbar_text"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerStrikeUnderline"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerUnderlineInk"
+                    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,30 +173,16 @@
                     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"/>
                 <ImageView
                     android:id="@+id/iv_readerActivity_ink"
                     android:src="@drawable/ic_reader_right_toolbar_ink_color1"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerUnderlineInk"
-                    app:layout_constraintBottom_toTopOf="@id/view_readerActivity_rightToolbarDividerInkSetting"
-                    style="@style/ReaderLeftRightToolbarIImageButton" />
-                <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"
+                    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/ic_reader_right_toolbar_settings"
-                    app:layout_constraintTop_toBottomOf="@id/view_readerActivity_rightToolbarDividerInkSetting"
+                    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

@@ -15,13 +15,6 @@
         <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>