Merge pull request #39 from ldirry/MOS-022

Mos 022 added deletetion confirmation
sw21-tug · May 5, 2021 · db8ea32 · db8ea32
2 parents 6c58236 + 4af0aa6
commit db8ea32
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/app/src/main/java/com/team12/myopensecret/ViewEntryActivity.kt b/app/src/main/java/com/team12/myopensecret/ViewEntryActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
@@ -35,9 +36,18 @@ class ViewEntryActivity: AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
 
         if (item.itemId == R.id.delete_entry) {
-            MainActivity.dataBase.deleteEmployee(model)
-            setResult(1)
-            finish()
+            val builder = AlertDialog.Builder(this)
+            builder.setTitle(resources.getString(R.string.title_delete))
+            builder.setMessage(resources.getString(R.string.description_delete))
+            builder.setPositiveButton(android.R.string.yes) { dialog, which ->
+                MainActivity.dataBase.deleteEmployee(model)
+                setResult(1)
+                finish()
+            }
+            builder.setNegativeButton(android.R.string.no) { dialog, which ->
+            }
+
+            builder.show()
         }
 
         return super.onOptionsItemSelected(item)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
@@ -14,6 +14,8 @@
     <string name="toomany200">Слишком много символов (макс. 200)</string>
     <string name="choosecategory">выберите категорию!</string>
     <string name="language_support">Language2</string>
+    <string name="title_delete">Удалить подтверждение</string>
+    <string name="description_delete">Вы действительно хотите удалить эту запись?</string>
     <string name="settings">настройки</string>
     <string-array name="languages_array">
         <item>English</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,6 +12,8 @@
     <string name="toomany50">Too many Characters (max. 50)</string>
     <string name="toomany200">Too many Characters (max. 200)</string>
     <string name="choosecategory">Please choose a category!</string>
+    <string name="title_delete">Delete Confirmation</string>
+    <string name="description_delete">Do you really want to delete this entry?</string>
     <string name="language_support">Language</string>
     <string name="settings">Settings</string>
     <string-array name="languages_array">