diff options
Diffstat (limited to 'app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt')
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt index 1c71ef17..b166d1af 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt +++ b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt @@ -1,33 +1,27 @@ package net.lacolaco.smileessence.activity -import android.app.Activity import android.os.Bundle -import android.support.v4.app.NavUtils +import android.support.v7.app.AppCompatActivity import android.view.MenuItem import android.widget.TextView import kotlinx.android.synthetic.main.layout_license.* import net.lacolaco.smileessence.R import java.util.* -class LicenseActivity : Activity() { - - // --------------------- GETTER / SETTER METHODS --------------------- - +class LicenseActivity : AppCompatActivity() { private val fileNames: List<String> get() { val apacheFiles = ArrayList<String>() apacheFiles.add(getString(R.string.library_name_twitter4j)) - apacheFiles.add(getString(R.string.library_name_crouton)) apacheFiles.add(getString(R.string.library_name_volley)) apacheFiles.add(getString(R.string.library_name_twitter_text)) return apacheFiles } - // ------------------------ OVERRIDE METHODS ------------------------ - public override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.layout_license) + setSupportActionBar(toolbar) setFiles() } @@ -35,7 +29,7 @@ class LicenseActivity : Activity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { android.R.id.home -> { - NavUtils.navigateUpFromSameTask(this) + finish() return true } } |