diff --git a/README.md b/README.md index c9062df3..49abd56f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Simple Notes -Logo +Logo A simple textfield for adding quick notes. @@ -20,7 +20,7 @@ This app is just one piece of a bigger series of apps. You can find the rest of License ------- - Copyright 2016 SimpleMobileTools + Copyright 2017 SimpleMobileTools Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5b47c3f8..31204f07 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,14 +29,19 @@ + + + android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/> shareText() R.id.delete_note -> displayDeleteNotePrompt() R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java)) - R.id.about -> startActivity(Intent(applicationContext, AboutActivity::class.java)) + R.id.about -> launchAbout() else -> return super.onOptionsItemSelected(item) } return true @@ -124,6 +128,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { } } + private fun launchAbout() { + startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_AMBILWARNA or LICENSE_STETHO, BuildConfig.VERSION_NAME) + } + private fun displayDeleteNotePrompt() { val message = String.format(getString(R.string.delete_note_prompt_message), mCurrentNote.title) ConfirmationDialog(this, message) { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt index 0140219b..9cb5e18c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt @@ -1,27 +1,14 @@ package com.simplemobiletools.notes.activities import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import android.view.MenuItem - +import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.notes.Config -import com.simplemobiletools.notes.R -open class SimpleActivity : AppCompatActivity() { +open class SimpleActivity : BaseSimpleActivity() { lateinit var config: Config override fun onCreate(savedInstanceState: Bundle?) { - config = Config.newInstance(applicationContext) super.onCreate(savedInstanceState) - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - return when (item.itemId) { - android.R.id.home -> { - finish() - true - } - else -> super.onOptionsItemSelected(item) - } + config = Config.newInstance(applicationContext) } }