1 files changed, 6 insertions, 7 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.kt
index 317d782b..506178ad 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.kt
@@ -1,9 +1,8 @@
 package net.lacolaco.smileessence.activity
 
-import android.app.Activity
-import android.app.AlertDialog
 import android.os.Bundle
-import android.support.v4.app.NavUtils
+import android.support.v7.app.AlertDialog
+import android.support.v7.app.AppCompatActivity
 import android.text.TextUtils
 import android.view.*
 import android.widget.AbsListView
@@ -13,10 +12,9 @@ import kotlinx.android.synthetic.main.list_item_simple_text.view.*
 import kotlinx.android.synthetic.main.part_edittext.view.*
 import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.data.ExtractionWord
-import net.lacolaco.smileessence.logging.Logger
 import net.lacolaco.smileessence.view.adapter.UnorderedCustomListAdapter
 
-class EditExtractionActivity : Activity() {
+class EditExtractionActivity : AppCompatActivity() {
     private val adapter by lazy {
         object : UnorderedCustomListAdapter<ExtractionWord>() {
             override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
@@ -28,9 +26,10 @@ class EditExtractionActivity : Activity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Logger.debug("onCreate")
         super.onCreate(savedInstanceState)
         setContentView(R.layout.layout_edit_list)
+        setSupportActionBar(toolbar)
+        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
         adapter.addAll(ExtractionWord.cached())
         adapter.update()
@@ -97,7 +96,7 @@ class EditExtractionActivity : Activity() {
                 dialog.show()
             }
             android.R.id.home -> {
-                NavUtils.navigateUpFromSameTask(this)
+                finish()
                 return true
             }
         }