Merge branch 'modify-stamp-ui'

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/stamp/StampTabView.kt

@@ -24,6 +24,9 @@ import java.text.SimpleDateFormat
 import java.util.*
 
 class StampTabView : ConstraintLayout {
+    companion object {
+        private const val DEFAULT_PAGE = 1 // standard stamp
+    }
 
     private var selectedCustomStampIndex = 0
     private var selectedStandardStampIndex = 0
@@ -50,6 +53,7 @@ class StampTabView : ConstraintLayout {
         LayoutInflater.from(context).inflate(R.layout.view_media_box_tab_stamp, this)
 
         viewPager.adapter = StampViewPagerAdapter(arrayListOf(resources.getString(R.string.reader_mediaBox_stamp_tabCustom), resources.getString(R.string.reader_mediaBox_stamp_tabStandard)))
+        viewPager.currentItem = DEFAULT_PAGE
         tabLayout.setupWithViewPager(viewPager)
     }
 

src/main/java/com/kdanmobile/reader/screen/reader/mediabox/stamp/StandardStampAdapter.kt

@@ -3,11 +3,12 @@ package com.kdanmobile.reader.screen.reader.mediabox.stamp
 import android.content.Context
 import android.support.v4.content.ContextCompat
 import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import com.kdanmobile.kmpdfkit.annotation.stamp.StampConfig
 import com.kdanmobile.reader.R
-import android.widget.LinearLayout
 
 class StandardStampAdapter(private val context: Context, private val resourceIds: Array<StampConfig.STANDARD_STAMP_RES>): RecyclerView.Adapter<StandardStampViewHolder>() {
 
@@ -37,7 +38,8 @@ class StandardStampAdapter(private val context: Context, private val resourceIds
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StandardStampViewHolder {
-        val view = ImageView(context)
+        val context = parent.context
+        val view = LayoutInflater.from(context).inflate(R.layout.item_standard_stamp, null)
         return StandardStampViewHolder(view)
     }
 
@@ -46,10 +48,6 @@ class StandardStampAdapter(private val context: Context, private val resourceIds
     }
 }
 
-class StandardStampViewHolder(val imageView: ImageView): RecyclerView.ViewHolder(imageView) {
-    init {
-        val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
-        params.setMargins(8, 8, 8, 8)
-        imageView.layoutParams = params
-    }
+class StandardStampViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
+    val imageView: ImageView = itemView.findViewById(R.id.iv_mediaBoxStampStandard)
 }

src/main/res/layout/item_standard_stamp.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ImageView
+        android:id="@+id/iv_mediaBoxStampStandard"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/reader_media_box_stamp_standard_height"
+        android:padding="@dimen/reader_media_box_stamp_standard_padding"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</android.support.constraint.ConstraintLayout>

src/main/res/values/dimens.xml

@@ -10,6 +10,8 @@
 
     <dimen name="reader_media_box_width">0dp</dimen>
     <dimen name="reader_media_box_height">336dp</dimen>
+    <dimen name="reader_media_box_stamp_standard_height">56dp</dimen>
+    <dimen name="reader_media_box_stamp_standard_padding">8dp</dimen>
 
     <integer name="mediaBox_signature_columnCount">1</integer>