Merge branch '139-changePasswordActivityUI' into 'master'

Resolve "PDF輸入密碼新介面"

See merge request kdanandroid/pdf/pdfreaderreadermodule!70

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

@@ -267,10 +267,7 @@ abstract class ReaderActivity :
 
     private fun requestPassword(isIncorrectPassword: Boolean = false) {
         isShowPasswordActivity = true
-        val intent = Intent(baseContext, DialogPasswordActivity::class.java)
-        val bundle = Bundle()
-        bundle.putBoolean(DialogPasswordActivity.KEY_IS_INCORRECT_PASSWORD, isIncorrectPassword)
-        intent.putExtras(bundle)
+        val intent = DialogPasswordActivity.createLaunchIntent(baseContext, file?.name ?: "", isIncorrectPassword)
         startActivityForResult(intent, REQUEST_PASSWORD)
     }
 

src/main/java/com/kdanmobile/reader/password/DialogPasswordActivity.kt

@@ -6,7 +6,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
-import androidx.core.content.ContextCompat
 import android.text.Editable
 import android.view.View
 import android.view.inputmethod.InputMethodManager
@@ -18,10 +17,21 @@ import kotlinx.android.synthetic.main.activity_reader_password_dialog.*
 class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
 
     companion object {
+        private const val KEY_FILENAME = "filename"
+        private const val KEY_IS_INCORRECT_PASSWORD = "isIncorrectPassword"
         const val KEY_USER_INPUT_PASSWORD = "password"
-        const val KEY_IS_INCORRECT_PASSWORD = "isIncorrectPassword"
+
+        fun createLaunchIntent(context: Context, filename: String, isIncorrectPassword: Boolean): Intent {
+            return Intent(context, DialogPasswordActivity::class.java).apply {
+                putExtras(Bundle().also {
+                    it.putBoolean(KEY_IS_INCORRECT_PASSWORD, isIncorrectPassword)
+                    it.putString(KEY_FILENAME, filename)
+                })
+            }
+        }
     }
 
+    private var filename = ""
     private var isIncorrectPassword = false
 
     @SuppressLint("HandlerLeak")
@@ -38,6 +48,7 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
     override fun onSaveInstanceState(outState: Bundle?) {
         super.onSaveInstanceState(outState)
         outState?.putBoolean(KEY_IS_INCORRECT_PASSWORD, isIncorrectPassword)
+        outState?.putString(KEY_FILENAME, filename)
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
@@ -47,6 +58,7 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        filename = intent.getStringExtra(KEY_FILENAME)
         setFinishOnTouchOutside(false)
         setContentView(R.layout.activity_reader_password_dialog)
         initView()
@@ -54,8 +66,8 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
     }
 
     private fun initView() {
-        tv_dialogPassword_ok.isEnabled = false
-        tv_dialogPassword_ok.setTextColor(ContextCompat.getColor(baseContext, R.color.button_gray))
+        btn_dialogPassword_ok.isEnabled = false
+        tv_dialogPassword_title.text = filename
         handler.sendEmptyMessageDelayed(10, 100)
         updateErrorMessage(intent.extras)
     }
@@ -71,20 +83,14 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
     }
 
     private fun setListener() {
-        tv_dialogPassword_cancel.setOnClickListener(this)
-        tv_dialogPassword_ok.setOnClickListener(this)
+        iv_dialogPassword_back.setOnClickListener(this)
+        btn_dialogPassword_ok.setOnClickListener(this)
 
         et_dialogPassword_name.addTextChangedListener(object : SimpleTextWatcher() {
             override fun afterTextChanged(editable: Editable) {
                 super.afterTextChanged(editable)
                 val password = editable.toString()
-                if (password.isEmpty()) {
-                    tv_dialogPassword_ok.isEnabled = false
-                    tv_dialogPassword_ok.setTextColor(ContextCompat.getColor(baseContext, R.color.button_gray))
-                } else {
-                    tv_dialogPassword_ok.isEnabled = true
-                    tv_dialogPassword_ok.setTextColor(ContextCompat.getColor(baseContext, R.color.bright_blue))
-                }
+                btn_dialogPassword_ok.isEnabled = password.isNotEmpty()
                 if (isIncorrectPassword) {
                     isIncorrectPassword = false
                     layout_dialogPassword_name.error = ""
@@ -95,11 +101,12 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
 
     override fun onClick(v: View) {
         when (v.id) {
-            R.id.tv_dialogPassword_cancel -> onBackPressed()
-            R.id.tv_dialogPassword_ok -> {
+            R.id.iv_dialogPassword_back -> onBackPressed()
+            R.id.btn_dialogPassword_ok -> {
                 val password = et_dialogPassword_name.text.toString()
-                val data = Intent()
-                data.putExtra(KEY_USER_INPUT_PASSWORD, password)
+                val data = Intent().apply {
+                    putExtra(KEY_USER_INPUT_PASSWORD, password)
+                }
                 setResult(RESULT_OK, data)
                 finish()
             }
@@ -112,8 +119,9 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
     }
 
     override fun onBackPressed() {
-        val data = Intent()
-        data.putExtra(KEY_USER_INPUT_PASSWORD, "")
+        val data = Intent().apply {
+            putExtra(KEY_USER_INPUT_PASSWORD, "")
+        }
         setResult(RESULT_OK, data)
         super.onBackPressed()
     }

src/main/res/drawable/bg_pdf_password_button_disable.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#c2c2c2" />
+    <corners android:radius="18dp" />
+</shape>
+

src/main/res/drawable/bg_pdf_password_button_enable.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#0077fd" />
+    <corners android:radius="18dp" />
+</shape>
+

src/main/res/drawable/ic_back.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,11L7.83,11 13.42,5.41 12,4 4,12 12,20 13.41,18.59 7.83,13 20,13z"
+      android:fillColor="#000"
+      android:fillAlpha=".6"
+      android:fillType="nonZero"/>
+</vector>

src/main/res/drawable/ic_pdf_password_visibility.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>

src/main/res/drawable/selector_pdf_password_button.xml

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

src/main/res/drawable/selector_pdf_password_button_text.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/white" android:state_enabled="true" />
+    <item android:color="#61000000" />
+</selector>

src/main/res/drawable/selector_pdf_password_toggle.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_pdf_password_visibility_off" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_pdf_password_visibility"/>
+</selector>

src/main/res/layout/activity_reader_password_dialog.xml

@@ -1,127 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#fff" >
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guidelineV10"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.1" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guidelineV40"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.4" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guidelineV90"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.9" />
+    android:background="#fff">
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guidelineH20"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.2" />
+        app:layout_constraintGuide_percent="0.16" />
+
+    <ImageView
+        android:id="@+id/iv_dialogPassword_back"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="12dp"
+        android:padding="12dp"
+        android:src="@drawable/ic_back"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription,RtlHardcoded,RtlSymmetry" />
 
     <TextView
         android:id="@+id/tv_dialogPassword_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
         android:gravity="center_vertical"
-        android:text="@string/reader_dialog_password_title"
         android:textColor="@color/dialog_title"
-        android:textSize="@dimen/material_title"
-        app:layout_constraintWidth_max="480dp"
-        app:layout_constraintVertical_chainStyle="packed"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/tv_dialogPassword_message"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/guidelineH20"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintWidth_max="480dp"
+        tools:text="File Name.pdf" />
+
+    <TextView
+        android:id="@+id/tv_dialogPassword_message"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:gravity="center_vertical"
+        android:text="@string/reader_dialog_password_message"
+        android:textColor="@color/dialog_second_text"
+        android:textSize="16sp"
         app:layout_constraintBottom_toTopOf="@+id/layout_dialogPassword_name"
-        app:layout_constraintLeft_toLeftOf="@+id/guidelineV10"
-        app:layout_constraintRight_toRightOf="@+id/guidelineV90" />
+        app:layout_constraintLeft_toLeftOf="@id/tv_dialogPassword_title"
+        app:layout_constraintRight_toRightOf="@id/tv_dialogPassword_title"
+        app:layout_constraintTop_toBottomOf="@id/tv_dialogPassword_title"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintWidth_max="480dp"
+        tools:text="This file is password protected. Please enter the password." />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/layout_dialogPassword_name"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/material_dialog_title_body"
         android:textColorHint="@color/bright_blue"
-        app:colorPrimary="@color/bright_blue"
-        app:colorPrimaryDark="@color/bright_blue"
+        app:backgroundTint="@color/bright_blue"
+        app:boxStrokeColor="@color/bright_blue"
         app:colorAccent="@color/bright_blue"
-        app:colorControlNormal="@color/bright_blue"
         app:colorControlActivated="@color/bright_blue"
-        app:passwordToggleEnabled="true"
-        app:backgroundTint="@color/bright_blue"
+        app:colorControlNormal="@color/bright_blue"
+        app:colorPrimary="@color/bright_blue"
+        app:colorPrimaryDark="@color/bright_blue"
         app:hintTextAppearance="@style/ReaderPasswordTextInputLayoutHint"
-        app:layout_constraintTop_toBottomOf="@+id/tv_dialogPassword_title"
-        app:layout_constraintBottom_toTopOf="@+id/tv_dialogPassword_cancel"
+        app:layout_constraintBottom_toTopOf="@+id/btn_dialogPassword_ok"
         app:layout_constraintLeft_toLeftOf="@+id/tv_dialogPassword_title"
-        app:layout_constraintRight_toRightOf="@+id/tv_dialogPassword_title" >
+        app:layout_constraintRight_toRightOf="@+id/tv_dialogPassword_title"
+        app:layout_constraintTop_toBottomOf="@+id/tv_dialogPassword_message"
+        app:passwordToggleDrawable="@drawable/selector_pdf_password_toggle"
+        app:passwordToggleEnabled="true">
 
-        <androidx.appcompat.widget.AppCompatEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/et_dialogPassword_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColorHint="@color/bright_blue"
-            android:hint="@string/reader_dialog_password_tip"
+            android:hint="@string/reader_dialog_password_hint"
             android:inputType="textPassword"
             android:singleLine="true"
-            android:textCursorDrawable="@drawable/shape_password_cursor_normal"
             android:textColor="@color/bright_blue"
-            android:textSize="@dimen/material_body"
-            app:hintTextAppearance="@style/ReaderPasswordTextInputLayoutHint"
-            app:colorPrimary="@color/bright_blue"
-            app:colorPrimaryDark="@color/bright_blue"
+            android:textColorHint="@color/bright_blue"
+            android:textCursorDrawable="@drawable/shape_password_cursor_normal"
+            android:textSize="16sp"
+            app:backgroundTint="@color/bright_blue"
             app:colorAccent="@color/bright_blue"
-            app:colorControlNormal="@color/bright_blue"
             app:colorControlActivated="@color/bright_blue"
-            app:backgroundTint="@color/bright_blue" >
+            app:colorControlNormal="@color/bright_blue"
+            app:colorPrimary="@color/bright_blue"
+            app:colorPrimaryDark="@color/bright_blue"
+            app:hintTextAppearance="@style/ReaderPasswordTextInputLayoutHint"
+            app:passwordToggleEnabled="true">
 
-            <requestFocus/>
-        </androidx.appcompat.widget.AppCompatEditText>
+            <requestFocus />
+        </com.google.android.material.textfield.TextInputEditText>
     </com.google.android.material.textfield.TextInputLayout>
 
-    <TextView
-        android:id="@+id/tv_dialogPassword_cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:layout_weight="1"
-        android:background="@drawable/selector_0000_9933b5e5"
-        android:gravity="center"
-        android:text="@string/reader_dialog_password_cancel"
-        android:textAllCaps="true"
-        android:textColor="@color/bright_blue"
-        android:textSize="@dimen/material_button"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="24dp"
-        app:layout_constraintTop_toTopOf="@+id/tv_dialogPassword_ok"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_dialogPassword_ok"
-        app:layout_constraintRight_toLeftOf="@+id/tv_dialogPassword_ok" />
-
-    <TextView
-        android:id="@+id/tv_dialogPassword_ok"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:layout_weight="1"
-        android:background="@drawable/selector_0000_9933b5e5"
+    <Button
+        android:id="@+id/btn_dialogPassword_ok"
+        android:layout_width="112dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="24dp"
+        android:background="@drawable/selector_pdf_password_button"
+        android:fontFamily="sans-serif"
         android:gravity="center"
-        android:textAllCaps="true"
-        android:text="@string/reader_dialog_password_confirm"
-        android:textColor="@color/bright_blue"
+        android:text="@string/reader_dialog_password_ok"
+        android:textColor="@drawable/selector_pdf_password_button_text"
         android:textSize="@dimen/material_button"
-        android:layout_marginTop="24dp"
+        android:textStyle="bold"
+        app:layout_constraintRight_toRightOf="@+id/tv_dialogPassword_title"
         app:layout_constraintTop_toBottomOf="@+id/layout_dialogPassword_name"
-        app:layout_constraintRight_toRightOf="@+id/tv_dialogPassword_title" />
+        tools:ignore="UnusedAttribute" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/values-de/strings.xml

@@ -79,10 +79,6 @@
     <string name="contextMenu_signature_add">HINZUFÜGEN</string>
     <string name="reader_mediaBox_signature_brushSize">Pinselgröße</string>
     <string name="contextMenu_normal_delete">Löschen</string>
-    <string name="reader_dialog_password_title">Diese Datei ist Passwort geschützt!</string>
-    <string name="reader_dialog_password_tip">Geben Sie bitte das Passwort ein.</string>
-    <string name="reader_dialog_password_cancel">Abbrechen</string>
-    <string name="reader_dialog_password_confirm">Bestätigen</string>
     <string name="reader_dialog_password_error">Falsches Passwort. Bitte versuchen Sie es erneut.</string>
     <string name="pdf_thumb_title_edit_mode">Seite bearbeiten</string>
     <string name="thumbnail">Miniaturansicht</string>
@@ -110,4 +106,7 @@
     <string name="reader_more_menu_ibon">Drucken aus iBon</string>
     <string name="reader_more_menu_encrypt">Verschlüsseln</string>
     <string name="reader_more_menu_decrypt">Passwort entfernen</string>
+    <string name="reader_dialog_password_ok">Ok</string>
+    <string name="reader_dialog_password_hint">Passwort</string>
+    <string name="reader_dialog_password_message">Diese Datei ist Passwort geschützt. Geben Sie bitte das Passwort ein.</string>
 </resources>

src/main/res/values-es/strings.xml

@@ -78,10 +78,6 @@
     <string name="contextMenu_signature_add">AGREGAR</string>
     <string name="reader_mediaBox_signature_brushSize">Tamaño del Broche</string>
     <string name="contextMenu_normal_delete">Eliminar</string>
-    <string name="reader_dialog_password_title">¡Este archivo está protegido con contraseña!</string>
-    <string name="reader_dialog_password_tip">Por favor, introduce la contraseña.</string>
-    <string name="reader_dialog_password_cancel">Cancelar</string>
-    <string name="reader_dialog_password_confirm">Confirmar</string>
     <string name="reader_dialog_password_error">Contraseña incorrecta. Por favor, intente de nuevo.</string>
     <string name="pdf_thumb_title_edit_mode">Editar página</string>
     <string name="thumbnail">Miniatura</string>
@@ -109,4 +105,7 @@
     <string name="reader_more_menu_ibon">Impresión desde ibon</string>
     <string name="reader_more_menu_encrypt">Cifrar</string>
     <string name="reader_more_menu_decrypt">Elimine contraseña</string>
+    <string name="reader_dialog_password_ok">De acuerdo</string>
+    <string name="reader_dialog_password_hint">Contraseña</string>
+    <string name="reader_dialog_password_message">Este archivo está protegido con contraseña. Por favor, introduce la contraseña.</string>
 </resources>

src/main/res/values-fr/strings.xml

@@ -78,10 +78,6 @@
     <string name="contextMenu_signature_add">AJOUTER</string>
     <string name="reader_mediaBox_signature_brushSize">Taille de Brosse</string>
     <string name="contextMenu_normal_delete">Supprimer</string>
-    <string name="reader_dialog_password_title">Ce fichier est protégé par un mot de passe.</string>
-    <string name="reader_dialog_password_tip">Veuillez insérez un mot de passe.</string>
-    <string name="reader_dialog_password_cancel">Annuler</string>
-    <string name="reader_dialog_password_confirm">Confirmer</string>
     <string name="reader_dialog_password_error">Mot de passe incorrect. Veuillez réessayer.</string>
     <string name="pdf_thumb_title_edit_mode">Modifier la page</string>
     <string name="thumbnail">Miniatures</string>
@@ -109,4 +105,7 @@
     <string name="reader_more_menu_ibon">Impression d\'ibon</string>
     <string name="reader_more_menu_encrypt">Crypter</string>
     <string name="reader_more_menu_decrypt">Supprimer Le Mot De Passe</string>
+    <string name="reader_dialog_password_ok">Ok</string>
+    <string name="reader_dialog_password_hint">Mot de passe</string>
+    <string name="reader_dialog_password_message">Ce fichier est protégé par un mot de passe. Veuillez insérez un mot de passe.</string>
 </resources>

src/main/res/values-it/strings.xml

@@ -78,10 +78,6 @@
     <string name="contextMenu_signature_add">AGGIUNGERE</string>
     <string name="reader_mediaBox_signature_brushSize">Dimensione pennello</string>
     <string name="contextMenu_normal_delete">Cancellare</string>
-    <string name="reader_dialog_password_title">Questo file è protetto da password!</string>
-    <string name="reader_dialog_password_tip">Si prega di inserire la password.</string>
-    <string name="reader_dialog_password_cancel">Cancella</string>
-    <string name="reader_dialog_password_confirm">Conferma</string>
     <string name="reader_dialog_password_error">Password non corretta. Si prega di riprovare.</string>
     <string name="pdf_thumb_title_edit_mode">Modifica pagina</string>
     <string name="thumbnail">Thumbnail</string>
@@ -109,4 +105,7 @@
     <string name="reader_more_menu_ibon">Stampa da iBon</string>
     <string name="reader_more_menu_encrypt">Encrypt</string>
     <string name="reader_more_menu_decrypt">Rimuovi password</string>
+    <string name="reader_dialog_password_ok">OK</string>
+    <string name="reader_dialog_password_hint">Password</string>
+    <string name="reader_dialog_password_message">Questo file è protetto da password. Si prega di inserire la password.</string>
 </resources>

src/main/res/values-ja/strings.xml

@@ -77,10 +77,6 @@
     <string name="contextMenu_signature_add">追加</string>
     <string name="reader_mediaBox_signature_brushSize">ブラシサイズ</string>
     <string name="contextMenu_normal_delete">削除</string>
-    <string name="reader_dialog_password_title">このファイルを開くにはパスワードが必要です</string>
-    <string name="reader_dialog_password_tip">パスワードを入力して下さい</string>
-    <string name="reader_dialog_password_cancel">キャンセル</string>
-    <string name="reader_dialog_password_confirm">確定</string>
     <string name="reader_dialog_password_error">あたらめて確認の上もう一回入力してください。</string>
     <string name="pdf_thumb_title_edit_mode">ページを編集する</string>
     <string name="thumbnail">サムネイル</string>
@@ -108,4 +104,7 @@
     <string name="reader_more_menu_ibon">ibon印刷する</string>
     <string name="reader_more_menu_encrypt">エンクリプション</string>
     <string name="reader_more_menu_decrypt">パスワードの削除</string>
+    <string name="reader_dialog_password_ok">OK</string>
+    <string name="reader_dialog_password_hint">パスワード</string>
+    <string name="reader_dialog_password_message">このファイルを開くにはパスワードが必要です。パスワードを入力して下さい。</string>
 </resources>

src/main/res/values-ko/strings.xml

@@ -78,10 +78,6 @@
     <string name="contextMenu_signature_add">추가</string>
     <string name="reader_mediaBox_signature_brushSize">브러시 크기</string>
     <string name="contextMenu_normal_delete">삭제</string>
-    <string name="reader_dialog_password_title">이 파일은 암호화되어 있습니다.</string>
-    <string name="reader_dialog_password_tip">비밀번호를 입력해 주십시오.</string>
-    <string name="reader_dialog_password_cancel">취소</string>
-    <string name="reader_dialog_password_confirm">확인</string>
     <string name="reader_dialog_password_error">잘못된 비밀번호 입니다. 다시 시도해 주십시오.</string>
     <string name="pdf_thumb_title_edit_mode">페이지 편집</string>
     <string name="thumbnail">썸네일</string>
@@ -109,4 +105,7 @@
     <string name="reader_more_menu_ibon">ibon에서 인쇄</string>
     <string name="reader_more_menu_encrypt">암호화</string>
     <string name="reader_more_menu_decrypt">비밀번호 제거</string>
+    <string name="reader_dialog_password_ok">확인</string>
+    <string name="reader_dialog_password_hint">비밀번호</string>
+    <string name="reader_dialog_password_message">이 파일은 암호화되어 있습니다. 비밀번호를 입력해 주십시오.</string>
 </resources>

src/main/res/values-pt/strings.xml

@@ -78,10 +78,6 @@
     <string name="contextMenu_signature_add">ADICIONAR</string>
     <string name="reader_mediaBox_signature_brushSize">Tamanho da Escova</string>
     <string name="contextMenu_normal_delete">Apagar</string>
-    <string name="reader_dialog_password_title">Este arquivo está protegido com senha!</string>
-    <string name="reader_dialog_password_tip">Por favor, insira a senha.</string>
-    <string name="reader_dialog_password_cancel">Cancelar</string>
-    <string name="reader_dialog_password_confirm">Confirmar</string>
     <string name="reader_dialog_password_error">Senha incorreta. Favor tentar novamente.</string>
     <string name="pdf_thumb_title_edit_mode">Editar Página</string>
     <string name="thumbnail">Miniatura</string>
@@ -109,4 +105,7 @@
     <string name="reader_more_menu_ibon">Imprimir a partir do iBon</string>
     <string name="reader_more_menu_encrypt">Criptografar</string>
     <string name="reader_more_menu_decrypt">Remover Senha</string>
+    <string name="reader_dialog_password_ok">OK</string>
+    <string name="reader_dialog_password_hint">Senha</string>
+    <string name="reader_dialog_password_message">Este arquivo está protegido com senha. Por favor, insira a senha.</string>
 </resources>

src/main/res/values-ru/strings.xml

@@ -78,10 +78,6 @@
     <string name="contextMenu_signature_add">ДОБАВИТЬ</string>
     <string name="reader_mediaBox_signature_brushSize">Размер кисти</string>
     <string name="contextMenu_normal_delete">Удалить</string>
-    <string name="reader_dialog_password_title">Данный файл защищен паролем!</string>
-    <string name="reader_dialog_password_tip">Пожалуйста введите пароль.</string>
-    <string name="reader_dialog_password_cancel">Отменить</string>
-    <string name="reader_dialog_password_confirm">Подтвердить</string>
     <string name="reader_dialog_password_error">Неверный пароль. Пожалуйста попробуйте еще раз.</string>
     <string name="pdf_thumb_title_edit_mode">Отредактировать страницу</string>
     <string name="thumbnail">Миниатюра</string>
@@ -109,4 +105,7 @@
     <string name="reader_more_menu_ibon">Печать из ibon</string>
     <string name="reader_more_menu_encrypt">Зашифровать</string>
     <string name="reader_more_menu_decrypt">Удалить пароль</string>
+    <string name="reader_dialog_password_ok">ОК</string>
+    <string name="reader_dialog_password_hint">Пароль</string>
+    <string name="reader_dialog_password_message">Данный файл защищен паролем. Пожалуйста введите пароль.</string>
 </resources>

src/main/res/values-zh-rTW/strings.xml

@@ -78,10 +78,6 @@
     <string name="contextMenu_signature_add">新增</string>
     <string name="reader_mediaBox_signature_brushSize">筆刷大小</string>
     <string name="contextMenu_normal_delete">删除</string>
-    <string name="reader_dialog_password_title">檔案受密碼保護</string>
-    <string name="reader_dialog_password_tip">請輸入密碼</string>
-    <string name="reader_dialog_password_cancel">取消</string>
-    <string name="reader_dialog_password_confirm">確定</string>
     <string name="reader_dialog_password_error">密碼錯誤，請重新輸入！</string>
     <string name="pdf_thumb_title_edit_mode">編輯頁面</string>
     <string name="thumbnail">頁面預覽</string>
@@ -109,4 +105,7 @@
     <string name="reader_more_menu_ibon">ibon雲端列印</string>
     <string name="reader_more_menu_encrypt">加密</string>
     <string name="reader_more_menu_decrypt">移除密碼</string>
+    <string name="reader_dialog_password_ok">確定</string>
+    <string name="reader_dialog_password_message">檔案受密碼保護。請輸入密碼。</string>
+    <string name="reader_dialog_password_hint">密碼</string>
 </resources>

src/main/res/values-zh/strings.xml

@@ -78,10 +78,6 @@
     <string name="contextMenu_signature_add">新增</string>
     <string name="reader_mediaBox_signature_brushSize">笔刷大小</string>
     <string name="contextMenu_normal_delete">删除</string>
-    <string name="reader_dialog_password_title">文件已加密</string>
-    <string name="reader_dialog_password_tip">请输入密码</string>
-    <string name="reader_dialog_password_cancel">取消</string>
-    <string name="reader_dialog_password_confirm">确定</string>
     <string name="reader_dialog_password_error">密码错误，请重新输入！</string>
     <string name="pdf_thumb_title_edit_mode">页面编辑</string>
     <string name="thumbnail">页面预览</string>
@@ -109,4 +105,7 @@
     <string name="reader_more_menu_ibon">ibon云端列印</string>
     <string name="reader_more_menu_encrypt">加密</string>
     <string name="reader_more_menu_decrypt">移除密码</string>
+    <string name="reader_dialog_password_message">文件已加密。请输入密码。</string>
+    <string name="reader_dialog_password_ok">確定</string>
+    <string name="reader_dialog_password_hint">密码</string>
 </resources>

src/main/res/values/strings.xml

@@ -113,11 +113,10 @@
     <string name="pdf_thumb_unlock_page_editor_title">PDF Page Editor</string>
     <string name="free_trial">Free trial</string>
 
-    <string name="reader_dialog_password_title">This file is password-protected!</string>
     <string name="reader_dialog_password_error">Incorrect password. Please try again.</string>
-    <string name="reader_dialog_password_tip">Please enter the password.</string>
-    <string name="reader_dialog_password_cancel">Cancel</string>
-    <string name="reader_dialog_password_confirm">Confirm</string>
+    <string name="reader_dialog_password_message">This file is password-protected. Please enter the password.</string>
+    <string name="reader_dialog_password_hint">Password</string>
+    <string name="reader_dialog_password_ok">OK</string>
     <string name="context_menu_copy">Copy</string>
     <string name="context_menu_highlight">Highlight</string>
     <string name="context_menu_underline">Underline</string>