From 5fbeecb01025cca021ce6ca973a90594546adc63 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 18 Dec 2016 19:32:43 +0100 Subject: [PATCH] some style updates --- .../notes/activities/MainActivity.kt | 13 +++++-------- .../simplemobiletools/notes/extensions/Context.kt | 3 --- app/src/main/res/layout/activity_main.xml | 1 - 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt index c38b33aa..fa5b5cd8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -18,7 +18,6 @@ import com.simplemobiletools.notes.databases.DBHelper import com.simplemobiletools.notes.dialogs.NewNoteDialog import com.simplemobiletools.notes.dialogs.OpenNoteDialog import com.simplemobiletools.notes.dialogs.RenameNoteDialog -import com.simplemobiletools.notes.extensions.dpToPx import com.simplemobiletools.notes.extensions.getTextSize import com.simplemobiletools.notes.models.Note import kotlinx.android.synthetic.main.activity_main.* @@ -87,15 +86,13 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.open_note -> displayOpenNoteDialog() - R.id.new_note -> displayNewNoteDialog() + R.id.open_note -> displayOpenNoteDialog() + R.id.new_note -> displayNewNoteDialog() R.id.rename_note -> displayRenameDialog() - R.id.share -> shareText() + R.id.share -> 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.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java)) + R.id.about -> startActivity(Intent(applicationContext, AboutActivity::class.java)) else -> return super.onOptionsItemSelected(item) } return true diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt index e3eca940..8c0d29f1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt @@ -4,7 +4,6 @@ import android.appwidget.AppWidgetManager import android.content.ComponentName import android.content.Context import android.content.Intent -import android.util.TypedValue import android.view.Gravity import com.simplemobiletools.notes.* @@ -33,5 +32,3 @@ fun Context.updateWidget() { sendBroadcast(this) } } - -fun Context.dpToPx(valueInDp: Float) = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, valueInDp, resources.displayMetrics) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 96de51fd..41a5e10e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,7 +1,6 @@