Merge branch 'fix-thumb-activity-toolbar'

src/main/java/com/kdanmobile/reader/thumb/PdfThumbActivity.kt

@@ -10,7 +10,10 @@ import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.GridLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.helper.ItemTouchHelper
-import android.view.*
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.WindowManager
 import com.kdanmobile.reader.R
 import com.kdanmobile.reader.ReaderActivity
 import com.kdanmobile.reader.ReaderModel
@@ -20,7 +23,6 @@ import com.kdanmobile.reader.widget.drag.OnRecyclerItemClickListener
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.layout_toolbar.*
 import kotlinx.android.synthetic.main.activity_pdf_thumb.*
 import java.io.File
 
@@ -56,7 +58,7 @@ abstract class PdfThumbActivity: AppCompatActivity(), PdfThumbAdapter.PageMoveHa
         super.onCreate(savedInstanceState)
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         setContentView(R.layout.activity_pdf_thumb)
-        setSupportActionBar(toolbar)
+        setSupportActionBar(toolbar_pdfThumb)
         val factory = PdfThumbViewModelFactory()
         viewModel = ViewModelProviders.of(this, factory).get(PdfThumbViewModel::class.java)
         ReaderModel.onViewModelCreate(viewModel)
@@ -92,14 +94,14 @@ abstract class PdfThumbActivity: AppCompatActivity(), PdfThumbAdapter.PageMoveHa
     private fun initToolBar() {
         viewModel.isEdit.also {
             if (it){
-                toolbar.setNavigationIcon(R.drawable.selector_close_btn_navigation)
+                toolbar_pdfThumb.setNavigationIcon(R.drawable.selector_close_btn_navigation)
                 supportActionBar?.title = resources.getString(R.string.pdf_thumb_title_edit_mode)
             } else {
-                toolbar.setNavigationIcon(R.drawable.selector_arrowback)
+                toolbar_pdfThumb.setNavigationIcon(R.drawable.selector_arrowback)
                 supportActionBar?.title = resources.getString(R.string.thumbnail)
             }
         }
-        toolbar.setNavigationOnClickListener(this::onClickToolBarNavigation)
+        toolbar_pdfThumb.setNavigationOnClickListener(this::onClickToolBarNavigation)
     }
 
     private fun setViewSize() {
@@ -225,11 +227,11 @@ abstract class PdfThumbActivity: AppCompatActivity(), PdfThumbAdapter.PageMoveHa
         when(viewModel.isEdit) {
             true -> {
                 supportActionBar?.setTitle(R.string.pdf_thumb_title_edit_mode)
-                toolbar.setNavigationIcon(R.drawable.selector_close_btn_navigation)
+                toolbar_pdfThumb.setNavigationIcon(R.drawable.selector_close_btn_navigation)
             }
             false -> {
                 supportActionBar?.setTitle(R.string.thumbnail)
-                toolbar.setNavigationIcon(R.drawable.selector_arrowback)
+                toolbar_pdfThumb.setNavigationIcon(R.drawable.selector_arrowback)
             }
         }
     }

src/main/res/layout/activity_pdf_thumb.xml

@@ -1,38 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="#eeeeee"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:id="@+id/pdf_thumb_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:theme="@style/ThumbActivityTheme"
-        android:background="#fff">
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar_pdfThumb"
+        android:background="@color/reader_top_toolbar_bg"
+        app:navigationIcon="@drawable/selector_arrow_back_black_blue_24dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:elevation="4dp"
+        android:minHeight="?attr/actionBarSize"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content">
+    </android.support.v7.widget.Toolbar>
 
-        <include
-            android:id="@+id/id_thumb_toolbar_layout"
-            layout="@layout/layout_toolbar"
-            android:minHeight="?attr/actionBarSize"/>
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/id_recyclerview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_below="@+id/id_thumb_toolbar_layout"
-            android:layout_centerHorizontal="true"
-            android:layout_gravity="center_horizontal"
-            android:background="#eeeeee"
-            android:cacheColorHint="@null"
-            android:padding="2dp"/>
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/view_pdfThumbe_cover"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="#f00"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone"/>
-</merge>
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/id_recyclerview"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:cacheColorHint="@null"
+        android:layout_marginTop="4dp"
+        android:padding="2dp"
+        app:layout_constraintTop_toBottomOf="@id/toolbar_pdfThumb"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        />
+</android.support.constraint.ConstraintLayout>

src/main/res/values/styles.xml

@@ -50,9 +50,6 @@
     </style>
 
 
-    <style name="ThumbActivityTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorAccent">@color/bright_blue</item>
-    </style>
     <style name="MyCustomToolBarStyle" parent="@style/ThemeOverlay.AppCompat.Light">
         <item name="android:textColorPrimary">@color/normal_text</item>
         <item name="android:textColor">@color/normal_text</item>