From 8995a973f801ae1044f2f7cdbedea22ca642f602 Mon Sep 17 00:00:00 2001
From: Agnieszka C <85929121+Aga-C@users.noreply.github.com>
Date: Sat, 22 Jan 2022 14:55:07 +0100
Subject: [PATCH 1/2] Added shortcuts for new text note and checklist (#495)
---
.../notes/pro/activities/MainActivity.kt | 72 +++++++++++++++++--
.../notes/pro/helpers/Constants.kt | 4 ++
app/src/main/res/drawable/shortcut_check.xml | 9 +++
app/src/main/res/values-ar/strings.xml | 4 +-
app/src/main/res/values-az/strings.xml | 2 +
app/src/main/res/values-cs/strings.xml | 2 +
app/src/main/res/values-cy/strings.xml | 2 +
app/src/main/res/values-da/strings.xml | 2 +
app/src/main/res/values-de/strings.xml | 4 +-
app/src/main/res/values-el/strings.xml | 2 +
app/src/main/res/values-eo/strings.xml | 2 +
app/src/main/res/values-es/strings.xml | 2 +
app/src/main/res/values-et/strings.xml | 2 +
app/src/main/res/values-fa/strings.xml | 2 +
app/src/main/res/values-fi/strings.xml | 4 +-
app/src/main/res/values-fr/strings.xml | 4 +-
app/src/main/res/values-gl/strings.xml | 2 +
app/src/main/res/values-hr/strings.xml | 2 +
app/src/main/res/values-hu/strings.xml | 4 +-
app/src/main/res/values-id/strings.xml | 2 +
app/src/main/res/values-it/strings.xml | 4 +-
app/src/main/res/values-ja/strings.xml | 2 +
app/src/main/res/values-lt/strings.xml | 2 +
app/src/main/res/values-nb-rNO/strings.xml | 2 +
app/src/main/res/values-nl/strings.xml | 2 +
app/src/main/res/values-pl/strings.xml | 4 +-
app/src/main/res/values-pt-rBR/strings.xml | 2 +
app/src/main/res/values-pt/strings.xml | 2 +
app/src/main/res/values-ru/strings.xml | 4 +-
app/src/main/res/values-sk/strings.xml | 2 +
app/src/main/res/values-sv/strings.xml | 2 +
app/src/main/res/values-tr/strings.xml | 4 +-
app/src/main/res/values-uk/strings.xml | 2 +
app/src/main/res/values-zh-rCN/strings.xml | 4 +-
app/src/main/res/values-zh-rTW/strings.xml | 2 +
app/src/main/res/values/strings.xml | 2 +
36 files changed, 157 insertions(+), 14 deletions(-)
create mode 100644 app/src/main/res/drawable/shortcut_check.xml
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
index 56db0889..ad7340c1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
@@ -1,8 +1,12 @@
package com.simplemobiletools.notes.pro.activities
+import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
import android.content.Intent
+import android.content.pm.ShortcutInfo
+import android.graphics.drawable.Icon
+import android.graphics.drawable.LayerDrawable
import android.net.Uri
import android.os.Bundle
import android.print.PrintAttributes
@@ -35,14 +39,13 @@ import com.simplemobiletools.notes.pro.databases.NotesDatabase
import com.simplemobiletools.notes.pro.dialogs.*
import com.simplemobiletools.notes.pro.extensions.*
import com.simplemobiletools.notes.pro.fragments.TextFragment
-import com.simplemobiletools.notes.pro.helpers.MIME_TEXT_PLAIN
-import com.simplemobiletools.notes.pro.helpers.NoteType
-import com.simplemobiletools.notes.pro.helpers.NotesHelper
-import com.simplemobiletools.notes.pro.helpers.OPEN_NOTE_ID
+import com.simplemobiletools.notes.pro.helpers.*
import com.simplemobiletools.notes.pro.models.Note
import java.io.File
import java.nio.charset.Charset
import kotlinx.android.synthetic.main.activity_main.*
+import java.util.*
+import kotlin.collections.ArrayList
class MainActivity : SimpleActivity() {
private val EXPORT_FILE_SYNC = 1
@@ -117,6 +120,8 @@ class MainActivity : SimpleActivity() {
}
updateTextColors(view_pager)
+ checkShortcuts()
+
search_wrapper.setBackgroundColor(config.primaryColor)
val contrastColor = config.primaryColor.getContrastColor()
arrayListOf(searchPrevBtn, searchNextBtn, searchClearBtn).forEach {
@@ -268,6 +273,59 @@ class MainActivity : SimpleActivity() {
private fun isCurrentItemChecklist() = if (this::mCurrentNote.isInitialized) mCurrentNote.type == NoteType.TYPE_CHECKLIST.value else false
+ @SuppressLint("NewApi")
+ private fun checkShortcuts() {
+ val appIconColor = config.appIconColor
+ if (isNougatMR1Plus() && config.lastHandledShortcutColor != appIconColor) {
+ val newTextNote = getNewTextNoteShortcut(appIconColor)
+ val newChecklist = getNewChecklistShortcut(appIconColor)
+
+ try {
+ shortcutManager.dynamicShortcuts = Arrays.asList(newTextNote, newChecklist)
+ config.lastHandledShortcutColor = appIconColor
+ } catch (ignored: Exception) {
+ }
+ }
+ }
+
+ @SuppressLint("NewApi")
+ private fun getNewTextNoteShortcut(appIconColor: Int): ShortcutInfo {
+ val shortLabel = getString(R.string.text_note)
+ val longLabel = getString(R.string.new_text_note)
+ val drawable = resources.getDrawable(R.drawable.shortcut_plus)
+ (drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_plus_background).applyColorFilter(appIconColor)
+ val bmp = drawable.convertToBitmap()
+
+ val intent = Intent(this, MainActivity::class.java)
+ intent.action = Intent.ACTION_VIEW
+ intent.putExtra(NEW_TEXT_NOTE, true)
+ return ShortcutInfo.Builder(this, SHORTCUT_NEW_TEXT_NOTE)
+ .setShortLabel(shortLabel)
+ .setLongLabel(longLabel)
+ .setIcon(Icon.createWithBitmap(bmp))
+ .setIntent(intent)
+ .build()
+ }
+
+ @SuppressLint("NewApi")
+ private fun getNewChecklistShortcut(appIconColor: Int): ShortcutInfo {
+ val shortLabel = getString(R.string.checklist)
+ val longLabel = getString(R.string.new_checklist)
+ val drawable = resources.getDrawable(R.drawable.shortcut_check)
+ (drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_plus_background).applyColorFilter(appIconColor)
+ val bmp = drawable.convertToBitmap()
+
+ val intent = Intent(this, MainActivity::class.java)
+ intent.action = Intent.ACTION_VIEW
+ intent.putExtra(NEW_CHECKLIST, true)
+ return ShortcutInfo.Builder(this, SHORTCUT_NEW_CHECKLIST)
+ .setShortLabel(shortLabel)
+ .setLongLabel(longLabel)
+ .setIcon(Icon.createWithBitmap(bmp))
+ .setIntent(intent)
+ .build()
+ }
+
private fun checkIntents(intent: Intent) {
intent.apply {
if (action == Intent.ACTION_SEND && type == MIME_TEXT_PLAIN) {
@@ -282,6 +340,12 @@ class MainActivity : SimpleActivity() {
if (realPath != null && hasPermission(PERMISSION_READ_STORAGE)) {
val file = File(realPath)
handleUri(Uri.fromFile(file))
+ } else if (intent.getBooleanExtra(NEW_TEXT_NOTE, false)) {
+ val newTextNote = Note(null, getCurrentFormattedDateTime(), "", NoteType.TYPE_TEXT.value, "", PROTECTION_NONE, "")
+ addNewNote(newTextNote)
+ } else if (intent.getBooleanExtra(NEW_CHECKLIST, false)) {
+ val newChecklist = Note(null, getCurrentFormattedDateTime(), "", NoteType.TYPE_CHECKLIST.value, "", PROTECTION_NONE, "")
+ addNewNote(newChecklist)
} else {
handleUri(data!!)
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt
index 74bb5393..3ca91baa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt
@@ -11,6 +11,10 @@ const val CUSTOMIZED_WIDGET_NOTE_ID = "customized_widget_note_id"
const val CUSTOMIZED_WIDGET_BG_COLOR = "customized_widget_bg_color"
const val CUSTOMIZED_WIDGET_TEXT_COLOR = "customized_widget_text_color"
const val CUSTOMIZED_WIDGET_SHOW_TITLE = "customized_widget_show_title"
+const val SHORTCUT_NEW_TEXT_NOTE = "shortcut_new_text_note"
+const val SHORTCUT_NEW_CHECKLIST = "shortcut_new_checklist"
+const val NEW_TEXT_NOTE = "new_text_note"
+const val NEW_CHECKLIST = "new_checklist"
val DEFAULT_WIDGET_TEXT_COLOR = Color.parseColor("#FFF57C00")
// shared preferences
diff --git a/app/src/main/res/drawable/shortcut_check.xml b/app/src/main/res/drawable/shortcut_check.xml
new file mode 100644
index 00000000..6767562c
--- /dev/null
+++ b/app/src/main/res/drawable/shortcut_check.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+