Merge branch 'fix-reader-toolbar'

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

@@ -155,7 +155,7 @@ abstract class ReaderActivity : AppCompatActivity() {
         viewModel = ViewModelProviders.of(this, factory).get(ReaderViewModel::class.java)
         ReaderModel.onViewModelCreate(viewModel)
         viewModel.isOpenedFileLiveData.observe(this, Observer(this::onIsOpenedFileUpdate))
-        viewModel.fileNameLiveData.observe(this, Observer { tv_readerActivity_title.text = it })
+        viewModel.fileNameLiveData.observe(this, Observer { supportActionBar?.title = it })
         viewModel.annotationModeLiveData.observe(this, Observer(this::onAnnotationModeUpdate))
         viewModel.annotationEitModeLiveData.observe(this, Observer(this::onAnnotationEditModeUpdate))
         viewModel.isCopyModeLiveData.observe(this, Observer (this::onIsCopyModeUpdate))

src/main/res/layout/activity_reader.xml

@@ -28,19 +28,6 @@
         app:layout_constraintRight_toRightOf="parent"
         android:layout_width="0dp"
         android:layout_height="wrap_content">
-        <TextView
-            tools:text="This is title"
-            android:id="@+id/tv_readerActivity_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="middle"
-            android:gravity="center_vertical"
-            android:paddingBottom="4dp"
-            android:paddingTop="4dp"
-            android:singleLine="true"
-            android:textColor="@color/black_87"
-            android:textSize="16sp"
-            android:textStyle="bold"/>
     </android.support.v7.widget.Toolbar>
     <com.kdanmobile.reader.view.HorizontalView
         android:id="@+id/viewGroup_readerActivity_leftToolbar"