From c16ed3cbbe2de42148e8ea20c725c597291c2d04 Mon Sep 17 00:00:00 2001
From: William Brawner <me@wbrawner.com>
Date: Sun, 23 Aug 2020 05:02:36 -0700
Subject: [PATCH] Add some keyboard shortcuts

---
 .../view/fragment/MainFragment.kt             | 107 ++++++++++--------
 app/src/main/res/menu/menu_edit.xml           |   9 +-
 2 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/com/wbrawner/simplemarkdown/view/fragment/MainFragment.kt b/app/src/main/java/com/wbrawner/simplemarkdown/view/fragment/MainFragment.kt
index 3de6168..944a18f 100644
--- a/app/src/main/java/com/wbrawner/simplemarkdown/view/fragment/MainFragment.kt
+++ b/app/src/main/java/com/wbrawner/simplemarkdown/view/fragment/MainFragment.kt
@@ -9,12 +9,11 @@ import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
@@ -56,6 +55,13 @@ class MainFragment : Fragment(), ActivityCompat.OnRequestPermissionsResultCallba
         setHasOptionsMenu(true)
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.menu_edit, menu)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            menu.findItem(R.id.action_save_as)?.setAlphabeticShortcut('S', KeyEvent.META_CTRL_ON or KeyEvent.META_SHIFT_ON)
+        }
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
             inflater.inflate(R.layout.fragment_main, container, false)
 
@@ -63,53 +69,7 @@ class MainFragment : Fragment(), ActivityCompat.OnRequestPermissionsResultCallba
         with(findNavController()) {
             appBarConfiguration = AppBarConfiguration(graph, drawerLayout)
             toolbar.setupWithNavController(this, appBarConfiguration!!)
-            toolbar.inflateMenu(R.menu.menu_edit)
-            toolbar.setOnMenuItemClickListener { item ->
-                return@setOnMenuItemClickListener when (item.itemId) {
-                    R.id.action_save -> {
-                        launch {
-                            if (!viewModel.save(requireContext())) {
-                                requestFileOp(REQUEST_SAVE_FILE)
-                            } else {
-                                Toast.makeText(
-                                        requireContext(),
-                                        getString(R.string.file_saved, viewModel.fileName.value),
-                                        Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        }
-                        true
-                    }
-                    R.id.action_save_as -> {
-                        requestFileOp(REQUEST_SAVE_FILE)
-                        true
-                    }
-                    R.id.action_share -> {
-                        val shareIntent = Intent(Intent.ACTION_SEND)
-                        shareIntent.putExtra(Intent.EXTRA_TEXT, viewModel.markdownUpdates.value)
-                        shareIntent.type = "text/plain"
-                        startActivity(Intent.createChooser(
-                                shareIntent,
-                                getString(R.string.share_file)
-                        ))
-                        true
-                    }
-                    R.id.action_load -> {
-                        requestFileOp(REQUEST_OPEN_FILE)
-                        true
-                    }
-                    R.id.action_new -> {
-                        promptSaveOrDiscardChanges()
-                        true
-                    }
-                    R.id.action_lock_swipe -> {
-                        item.isChecked = !item.isChecked
-                        pager!!.setSwipeLocked(item.isChecked)
-                        true
-                    }
-                    else -> item.onNavDestinationSelected(findNavController())
-                }
-            }
+            (activity as? AppCompatActivity)?.setSupportActionBar(toolbar)
             navigationView.setupWithNavController(this)
         }
         val adapter = EditPagerAdapter(childFragmentManager, view.context)
@@ -127,6 +87,53 @@ class MainFragment : Fragment(), ActivityCompat.OnRequestPermissionsResultCallba
         })
     }
 
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.action_save -> {
+                launch {
+                    if (!viewModel.save(requireContext())) {
+                        requestFileOp(REQUEST_SAVE_FILE)
+                    } else {
+                        Toast.makeText(
+                                requireContext(),
+                                getString(R.string.file_saved, viewModel.fileName.value),
+                                Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                }
+                true
+            }
+            R.id.action_save_as -> {
+                requestFileOp(REQUEST_SAVE_FILE)
+                true
+            }
+            R.id.action_share -> {
+                val shareIntent = Intent(Intent.ACTION_SEND)
+                shareIntent.putExtra(Intent.EXTRA_TEXT, viewModel.markdownUpdates.value)
+                shareIntent.type = "text/plain"
+                startActivity(Intent.createChooser(
+                        shareIntent,
+                        getString(R.string.share_file)
+                ))
+                true
+            }
+            R.id.action_load -> {
+                requestFileOp(REQUEST_OPEN_FILE)
+                true
+            }
+            R.id.action_new -> {
+                promptSaveOrDiscardChanges()
+                true
+            }
+            R.id.action_lock_swipe -> {
+                item.isChecked = !item.isChecked
+                pager!!.setSwipeLocked(item.isChecked)
+                true
+            }
+            else -> item.onNavDestinationSelected(findNavController())
+        }
+    }
+
     override fun onPause() {
         super.onPause()
         launch {
diff --git a/app/src/main/res/menu/menu_edit.xml b/app/src/main/res/menu/menu_edit.xml
index f293b24..6798380 100644
--- a/app/src/main/res/menu/menu_edit.xml
+++ b/app/src/main/res/menu/menu_edit.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_share"
@@ -9,17 +10,21 @@
     <item
         android:id="@+id/action_new"
         android:title="@string/action_new"
+        android:alphabeticShortcut="N"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_load"
         android:title="@string/action_open"
+        android:alphabeticShortcut="O"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_save"
+        android:alphabeticShortcut="S"
         android:title="@string/action_save" />
     <item
         android:id="@+id/action_save_as"
-        android:title="@string/action_save_as" />
+        android:title="@string/action_save_as"
+        tools:ignore="UnusedAttribute" />
     <item
         android:id="@+id/action_lock_swipe"
         android:checkable="true"