Преглед изворни кода

Rename media box string name

Wayne пре 5 година
родитељ
комит
f7077f886a

+ 4 - 4
reader/src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -551,7 +551,7 @@ abstract class ReaderActivity : AppCompatActivity() {
                 override fun onClickTextBoxAddButton(textBoxTabView: TextBoxTabView) {
                     dismiss(false)
                     viewModel.setTextBoxAttribute(textBoxTabView.getTextBoxAttribute())
-                    showSnackbar(resources.getString(R.string.mediaBox_snakebar_textBox), resources.getString(R.string.mediaBox_snakebar_undo))
+                    showSnackbar(resources.getString(R.string.reader_mediaBox_snakebar_textBox), resources.getString(R.string.reader_mediaBox_snakebar_undo))
                 }
 
                 override fun onClickTextBoxStyleApplyButton(textBoxTabView: TextBoxTabView) {
@@ -562,19 +562,19 @@ abstract class ReaderActivity : AppCompatActivity() {
                 override fun onClickSignatureAddButton(signatureTabView: SignatureTabView) {
                     dismiss(false)
                     viewModel.setSignatureAttribute(signatureTabView.getSignatureAttribute())
-                    showSnackbar(resources.getString(R.string.mediaBox_snakebar_signature), resources.getString(R.string.mediaBox_snakebar_undo))
+                    showSnackbar(resources.getString(R.string.reader_mediaBox_snakebar_signature), resources.getString(R.string.reader_mediaBox_snakebar_undo))
                 }
 
                 override fun onClickStampAddButton(stampTabView: StampTabView) {
                     dismiss(false)
                     viewModel.setStampAttribute(stampTabView.getStampAttribute())
-                    showSnackbar(resources.getString(R.string.mediaBox_snakebar_stamp), resources.getString(R.string.mediaBox_snakebar_undo))
+                    showSnackbar(resources.getString(R.string.reader_mediaBox_snakebar_stamp), resources.getString(R.string.reader_mediaBox_snakebar_undo))
                 }
 
                 override fun onClickShapeAddButton(shapeTabView: ShapeTabView) {
                     dismiss(false)
                     viewModel.setShapeAttribute(shapeTabView.getShapeAttribute())
-                    showSnackbar(resources.getString(R.string.mediaBox_snakebar_shape), resources.getString(R.string.mediaBox_snakebar_undo))
+                    showSnackbar(resources.getString(R.string.reader_mediaBox_snakebar_shape), resources.getString(R.string.reader_mediaBox_snakebar_undo))
                 }
             }
         }

+ 1 - 1
reader/src/main/java/com/kdanmobile/reader/screen/reader/mediabox/shape/ShapeTabView.kt

@@ -82,7 +82,7 @@ class ShapeTabView : ConstraintLayout {
         }
         shapeType = AnnotConfig.ShapeAnnotationType.CIRCLE
 
-        viewPager.adapter = ViewPagerAdapter(context, arrayListOf(resources.getString(R.string.mediaBox_shape_tabBorder), resources.getString(R.string.mediaBox_shape_tabFill)))
+        viewPager.adapter = ViewPagerAdapter(context, arrayListOf(resources.getString(R.string.reader_mediaBox_shape_tabBorder), resources.getString(R.string.reader_mediaBox_shape_tabFill)))
         tabLayout.setupWithViewPager(viewPager)
     }
 

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

@@ -48,7 +48,7 @@ class StampTabView : ConstraintLayout {
     private fun initView() {
         LayoutInflater.from(context).inflate(R.layout.view_media_box_tab_stamp, this)
 
-        viewPager.adapter = StampViewPagerAdapter(arrayListOf(resources.getString(R.string.mediaBox_stamp_tabCustom), resources.getString(R.string.mediaBox_stamp_tabStandard)))
+        viewPager.adapter = StampViewPagerAdapter(arrayListOf(resources.getString(R.string.reader_mediaBox_stamp_tabCustom), resources.getString(R.string.reader_mediaBox_stamp_tabStandard)))
         tabLayout.setupWithViewPager(viewPager)
     }
 

+ 4 - 4
reader/src/main/res/layout/activity_view_signature_create.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="#0077fd"
-        app:title="@string/mediaBox_signature_createSignature"
+        app:title="@string/reader_mediaBox_signature_createSignature"
         app:titleTextColor="@android:color/white"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -26,7 +26,7 @@
         android:paddingEnd="16dp"
         android:textColor="@android:color/white"
         android:textSize="14sp"
-        android:text="@string/mediaBox_signature_btnSave"
+        android:text="@string/reader_mediaBox_signature_btnSave"
         android:gravity="center"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
@@ -43,7 +43,7 @@
         android:gravity="center"
         android:textColor="#61000000"
         android:textSize="16sp"
-        android:text="@string/mediaBox_signature_writeHere"
+        android:text="@string/reader_mediaBox_signature_writeHere"
         app:layout_constraintTop_toBottomOf="@id/toolbar_signature"
         app:layout_constraintBottom_toTopOf="@id/btn_clear_signature"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -121,7 +121,7 @@
         android:textColor="#0077fd"
         android:textSize="14sp"
         android:textStyle="bold"
-        android:text="@string/mediaBox_signature_btnClear"
+        android:text="@string/reader_mediaBox_signature_btnClear"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent" />
 

+ 4 - 4
reader/src/main/res/layout/view_media_box_item_shape_border.xml

@@ -20,8 +20,8 @@
         android:layout_height="wrap_content"
         android:id="@+id/seekBar_shapeBorder_opacity"
         android:layout_marginTop="8dp"
-        app:title="@string/mediaBox_shape_titleSeekBarOpacity"
-        app:unit="@string/mediaBox_shape_unitSeekBarOpacity"
+        app:title="@string/reader_mediaBox_shape_titleSeekBarOpacity"
+        app:unit="@string/reader_mediaBox_shape_unitSeekBarOpacity"
         app:maxValue="255"
         app:minValue="0"
         app:initValue="255"
@@ -34,8 +34,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/seekBar_shapeBorder_thickness"
-        app:title="@string/mediaBox_shape_titleSeekBarThickness"
-        app:unit="@string/mediaBox_shape_unitSeekBarThickness"
+        app:title="@string/reader_mediaBox_shape_titleSeekBarThickness"
+        app:unit="@string/reader_mediaBox_shape_unitSeekBarThickness"
         app:maxValue="24"
         app:minValue="0"
         app:initValue="3"

+ 2 - 2
reader/src/main/res/layout/view_media_box_item_shape_fill.xml

@@ -20,8 +20,8 @@
         android:layout_height="wrap_content"
         android:id="@+id/seekBar_shapeFill_opacity"
         android:layout_marginTop="8dp"
-        app:title="@string/mediaBox_shape_titleSeekBarOpacity"
-        app:unit="@string/mediaBox_shape_unitSeekBarOpacity"
+        app:title="@string/reader_mediaBox_shape_titleSeekBarOpacity"
+        app:unit="@string/reader_mediaBox_shape_unitSeekBarOpacity"
         app:maxValue="255"
         app:minValue="0"
         app:initValue="0"

+ 1 - 1
reader/src/main/res/layout/view_media_box_item_stamp_custom.xml

@@ -15,7 +15,7 @@
         android:maxLines="1"
         android:layout_margin="16dp"
         android:padding="8dp"
-        android:hint="@string/mediaBox_stamp_hintEditText"
+        android:hint="@string/reader_mediaBox_stamp_hintEditText"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"

+ 2 - 2
reader/src/main/res/layout/view_media_box_tab_shape.xml

@@ -11,8 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:id="@+id/titleButton_shape"
-        app:title="@string/mediaBox_shape_title"
-        app:buttonText="@string/mediaBox_shape_btnAdd"
+        app:title="@string/reader_mediaBox_shape_title"
+        app:buttonText="@string/reader_mediaBox_shape_btnAdd"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"

+ 2 - 2
reader/src/main/res/layout/view_media_box_tab_signature.xml

@@ -18,7 +18,7 @@
         android:gravity="center_vertical"
         android:textColor="#de000000"
         android:textSize="14sp"
-        android:text="@string/mediaBox_signature_title" />
+        android:text="@string/reader_mediaBox_signature_title" />
 
     <TextView
         android:id="@+id/tv_noSignature"
@@ -32,7 +32,7 @@
         android:gravity="center_vertical"
         android:textColor="#61000000"
         android:textSize="16sp"
-        android:text="@string/mediaBox_signature_noSignatureCreated"
+        android:text="@string/reader_mediaBox_signature_noSignatureCreated"
         app:layout_constraintTop_toBottomOf="@id/tv_title_signature"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />

+ 2 - 2
reader/src/main/res/layout/view_media_box_tab_stamp.xml

@@ -11,8 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:id="@+id/titleButton_stamp"
-        app:title="@string/mediaBox_stamp_title"
-        app:buttonText="@string/mediaBox_stamp_btnAdd"
+        app:title="@string/reader_mediaBox_stamp_title"
+        app:buttonText="@string/reader_mediaBox_stamp_btnAdd"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"

+ 5 - 5
reader/src/main/res/layout/view_media_box_tab_text_box.xml

@@ -11,8 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:id="@+id/titleButton_textBox"
-        app:title="@string/mediaBox_textBox_title"
-        app:buttonText="@string/mediaBox_textBox_btnAdd"
+        app:title="@string/reader_mediaBox_textBox_title"
+        app:buttonText="@string/reader_mediaBox_textBox_btnAdd"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -42,7 +42,7 @@
             android:gravity="start"
             android:textColor="#f5a623"
             android:textSize="24sp"
-            android:text="@string/mediaBox_textBox_simpleText"
+            android:text="@string/reader_mediaBox_textBox_simpleText"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent" />
     </android.support.constraint.ConstraintLayout>
@@ -73,8 +73,8 @@
         android:layout_height="wrap_content"
         android:id="@+id/seekBar_textBox_textSize"
         android:layout_marginTop="16dp"
-        app:title="@string/mediaBox_textBox_titleSeekBarSize"
-        app:unit="@string/mediaBox_textBox_unitSeekBarSize"
+        app:title="@string/reader_mediaBox_textBox_titleSeekBarSize"
+        app:unit="@string/reader_mediaBox_textBox_unitSeekBarSize"
         app:maxValue="96"
         app:minValue="8"
         app:initValue="24"

+ 5 - 5
reader/src/main/res/layout/view_media_box_tab_text_box_style.xml

@@ -11,8 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:id="@+id/titleButton_textBox"
-        app:title="@string/mediaBox_textBoxModify_title"
-        app:buttonText="@string/mediaBox_textBoxModify_btnApply"
+        app:title="@string/reader_mediaBox_textBoxModify_title"
+        app:buttonText="@string/reader_mediaBox_textBoxModify_btnApply"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -42,7 +42,7 @@
             android:gravity="start"
             android:textColor="#f5a623"
             android:textSize="24sp"
-            android:text="@string/mediaBox_textBox_simpleText"
+            android:text="@string/reader_mediaBox_textBox_simpleText"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent" />
     </android.support.constraint.ConstraintLayout>
@@ -73,8 +73,8 @@
         android:layout_height="wrap_content"
         android:id="@+id/seekBar_textBox_textSize"
         android:layout_marginTop="16dp"
-        app:title="@string/mediaBox_textBox_titleSeekBarSize"
-        app:unit="@string/mediaBox_textBox_unitSeekBarSize"
+        app:title="@string/reader_mediaBox_textBox_titleSeekBarSize"
+        app:unit="@string/reader_mediaBox_textBox_unitSeekBarSize"
         app:maxValue="96"
         app:minValue="8"
         app:initValue="24"

+ 31 - 31
reader/src/main/res/values/strings.xml

@@ -51,36 +51,36 @@
     <string name="contextMenu_textbox_style">Style</string>
 
     <!--MediaBox-->
-    <string name="mediaBox_textBox_title">Text</string>
-    <string name="mediaBox_textBox_btnAdd">ADD</string>
-    <string name="mediaBox_textBox_simpleText">Sample Text</string>
-    <string name="mediaBox_textBox_titleSeekBarSize">Size</string>
-    <string name="mediaBox_textBox_unitSeekBarSize">pt</string>
-    <string name="mediaBox_textBoxModify_title">Style</string>
-    <string name="mediaBox_textBoxModify_btnApply">APPLY</string>
-    <string name="mediaBox_signature_title">Signature Library</string>
-    <string name="mediaBox_signature_noSignatureCreated">No signature created</string>
-    <string name="mediaBox_signature_createSignature">Create signature</string>
-    <string name="mediaBox_signature_btnSave">SAVE</string>
-    <string name="mediaBox_signature_writeHere">Write here</string>
-    <string name="mediaBox_signature_btnClear">CLEAR</string>
-    <string name="mediaBox_stamp_title">Stamp</string>
-    <string name="mediaBox_stamp_btnAdd">ADD</string>
-    <string name="mediaBox_stamp_hintEditText">Enter Text</string>
-    <string name="mediaBox_stamp_tabCustom">Custom</string>
-    <string name="mediaBox_stamp_tabStandard">Standard</string>
-    <string name="mediaBox_shape_title">Shape</string>
-    <string name="mediaBox_shape_btnAdd">ADD</string>
-    <string name="mediaBox_shape_tabBorder">Border</string>
-    <string name="mediaBox_shape_tabFill">Fill</string>
-    <string name="mediaBox_shape_titleSeekBarOpacity">Opacity</string>
-    <string name="mediaBox_shape_unitSeekBarOpacity">%</string>
-    <string name="mediaBox_shape_titleSeekBarThickness">Thickness</string>
-    <string name="mediaBox_shape_unitSeekBarThickness">px</string>
+    <string name="reader_mediaBox_textBox_title">Text</string>
+    <string name="reader_mediaBox_textBox_btnAdd">ADD</string>
+    <string name="reader_mediaBox_textBox_simpleText">Sample Text</string>
+    <string name="reader_mediaBox_textBox_titleSeekBarSize">Size</string>
+    <string name="reader_mediaBox_textBox_unitSeekBarSize">pt</string>
+    <string name="reader_mediaBox_textBoxModify_title">Style</string>
+    <string name="reader_mediaBox_textBoxModify_btnApply">APPLY</string>
+    <string name="reader_mediaBox_signature_title">Signature Library</string>
+    <string name="reader_mediaBox_signature_noSignatureCreated">No signature created</string>
+    <string name="reader_mediaBox_signature_createSignature">Create signature</string>
+    <string name="reader_mediaBox_signature_btnSave">SAVE</string>
+    <string name="reader_mediaBox_signature_writeHere">Write here</string>
+    <string name="reader_mediaBox_signature_btnClear">CLEAR</string>
+    <string name="reader_mediaBox_stamp_title">Stamp</string>
+    <string name="reader_mediaBox_stamp_btnAdd">ADD</string>
+    <string name="reader_mediaBox_stamp_hintEditText">Enter Text</string>
+    <string name="reader_mediaBox_stamp_tabCustom">Custom</string>
+    <string name="reader_mediaBox_stamp_tabStandard">Standard</string>
+    <string name="reader_mediaBox_shape_title">Shape</string>
+    <string name="reader_mediaBox_shape_btnAdd">ADD</string>
+    <string name="reader_mediaBox_shape_tabBorder">Border</string>
+    <string name="reader_mediaBox_shape_tabFill">Fill</string>
+    <string name="reader_mediaBox_shape_titleSeekBarOpacity">Opacity</string>
+    <string name="reader_mediaBox_shape_unitSeekBarOpacity">%</string>
+    <string name="reader_mediaBox_shape_titleSeekBarThickness">Thickness</string>
+    <string name="reader_mediaBox_shape_unitSeekBarThickness">px</string>
 
-    <string name="mediaBox_snakebar_textBox">點擊你要新增文字的位置</string>
-    <string name="mediaBox_snakebar_signature">選擇你要新增簽名的位置</string>
-    <string name="mediaBox_snakebar_stamp">點擊你要新增圖章的位置</string>
-    <string name="mediaBox_snakebar_shape">點擊你要新增圖形的位置</string>
-    <string name="mediaBox_snakebar_undo">UNDO</string>
+    <string name="reader_mediaBox_snakebar_textBox">點擊你要新增文字的位置</string>
+    <string name="reader_mediaBox_snakebar_signature">選擇你要新增簽名的位置</string>
+    <string name="reader_mediaBox_snakebar_stamp">點擊你要新增圖章的位置</string>
+    <string name="reader_mediaBox_snakebar_shape">點擊你要新增圖形的位置</string>
+    <string name="reader_mediaBox_snakebar_undo">UNDO</string>
 </resources>