Some more strings extracted

Author: cvzi

app/src/main/java/com/burhanrashid52/photoediting/EditImageActivity.kt

@@ -413,9 +413,9 @@ class EditImageActivity : BaseActivity(), OnPhotoEditorListener, View.OnClickLis
     private fun showSaveDialog() {
         val builder = AlertDialog.Builder(this)
         builder.setMessage(getString(R.string.msg_save_image))
-        builder.setPositiveButton("Save") { _: DialogInterface?, _: Int -> saveImage() }
-        builder.setNegativeButton("Cancel") { dialog: DialogInterface, _: Int -> dialog.dismiss() }
-        builder.setNeutralButton("Discard") { _: DialogInterface?, _: Int -> finish() }
+        builder.setPositiveButton(R.string.label_save) { _: DialogInterface?, _: Int -> saveImage() }
+        builder.setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int -> dialog.dismiss() }
+        builder.setNeutralButton(R.string.label_discard) { _: DialogInterface?, _: Int -> finish() }
         builder.create().show()
     }
 

app/src/main/java/com/burhanrashid52/photoediting/tools/EditingToolsAdapter.kt

@@ -22,7 +22,7 @@ class EditingToolsAdapter(private val mOnItemSelected: OnItemSelected) :
     }
 
     internal inner class ToolModel(
-        val mToolName: String,
+        val mToolName: Int,
         val mToolIcon: Int,
         val mToolType: ToolType
     )
@@ -35,7 +35,7 @@ class EditingToolsAdapter(private val mOnItemSelected: OnItemSelected) :
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val item = mToolList[position]
-        holder.txtTool.text = item.mToolName
+        holder.txtTool.setText(item.mToolName)
         holder.imgToolIcon.setImageResource(item.mToolIcon)
     }
 
@@ -57,10 +57,11 @@ class EditingToolsAdapter(private val mOnItemSelected: OnItemSelected) :
     }
 
     init {
-        mToolList.add(ToolModel("Shape", R.drawable.ic_oval, ToolType.SHAPE))
-        mToolList.add(ToolModel("Text", R.drawable.ic_text, ToolType.TEXT))
-        mToolList.add(ToolModel("Eraser", R.drawable.ic_eraser, ToolType.ERASER))
-        mToolList.add(ToolModel("Filter", R.drawable.ic_photo_filter, ToolType.FILTER))
-        mToolList.add(ToolModel("Emoji", R.drawable.ic_insert_emoticon, ToolType.EMOJI))
+        mToolList.add(ToolModel(R.string.label_oval, R.drawable.ic_oval, ToolType.SHAPE))
+        mToolList.add(ToolModel(R.string.label_shape, R.drawable.ic_oval, ToolType.SHAPE))
+        mToolList.add(ToolModel(R.string.label_text, R.drawable.ic_text, ToolType.TEXT))
+        mToolList.add(ToolModel(R.string.label_eraser, R.drawable.ic_eraser, ToolType.ERASER))
+        mToolList.add(ToolModel(R.string.label_filter, R.drawable.ic_photo_filter, ToolType.FILTER))
+        mToolList.add(ToolModel(R.string.label_emoji, R.drawable.ic_insert_emoticon, ToolType.EMOJI))
     }
 }

app/src/main/res/values/strings.xml

@@ -189,6 +189,8 @@
     <string name="label_opacity">Opacity</string>
     <string name="label_done">Done</string>
     <string name="label_close">Close</string>
+    <string name="label_save">Save</string>
+    <string name="label_discard">Discard</string>
     <string name="msg_save_image">Do you want to exit without saving the image?</string>
     <string name="app_intent_name">PhotoEditor</string>
     <string name="msg_save_image_to_share">Please save image to share</string>