feat: Adds in-note search for plain text notes

packages/mobile/fastlane/Fastfile

@@ -115,6 +115,10 @@ platform :ios do
 end
 
 platform :android do
+  def android_package_name(variant)
+    variant == 'dev' ? 'com.standardnotes.dev' : 'com.standardnotes'
+  end
+
   def build_android(variant, versionCode)
     gradle(
       task: 'bundle',
@@ -132,6 +136,7 @@ platform :android do
     sh('yarn run android:bundle')
     build_android(variant, versionCode)
     upload_to_play_store(
+      package_name: android_package_name(variant),
       track: track,
       json_key_data: (ENV['GOOGLE_PLAY_JSON_KEY_DATA']).to_s,
       skip_upload_metadata: true,

packages/snjs/lib/Services/Features/UseCase/GetFeatureStatus.spec.ts

@@ -159,7 +159,6 @@ describe('GetFeatureStatusUseCase', () => {
       ).toEqual(FeatureStatus.InCurrentPlanButExpired)
     })
   })
-
   describe('third party features', () => {
     it('should return Entitled for third-party features', () => {
       const mockComponent = {

packages/ui-services/src/Keyboard/KeyboardCommands.ts

@@ -32,6 +32,12 @@ export const SUPER_SEARCH_TOGGLE_CASE_SENSITIVE = createKeyboardCommand('SUPER_S
 export const SUPER_SEARCH_TOGGLE_REPLACE_MODE = createKeyboardCommand('SUPER_SEARCH_TOGGLE_REPLACE_MODE')
 export const SUPER_SEARCH_NEXT_RESULT = createKeyboardCommand('SUPER_SEARCH_NEXT_RESULT')
 export const SUPER_SEARCH_PREVIOUS_RESULT = createKeyboardCommand('SUPER_SEARCH_PREVIOUS_RESULT')
+
+export const UNIVERSAL_TOGGLE_SEARCH = createKeyboardCommand('UNIVERSAL_TOGGLE_SEARCH')
+export const UNIVERSAL_SEARCH_TOGGLE_CASE_SENSITIVE = createKeyboardCommand('UNIVERSAL_SEARCH_TOGGLE_CASE_SENSITIVE')
+export const UNIVERSAL_SEARCH_TOGGLE_REPLACE_MODE = createKeyboardCommand('UNIVERSAL_SEARCH_TOGGLE_REPLACE_MODE')
+export const UNIVERSAL_SEARCH_NEXT_RESULT = createKeyboardCommand('UNIVERSAL_SEARCH_NEXT_RESULT')
+export const UNIVERSAL_SEARCH_PREVIOUS_RESULT = createKeyboardCommand('UNIVERSAL_SEARCH_PREVIOUS_RESULT')
 export const SUPER_SHOW_MARKDOWN_PREVIEW = createKeyboardCommand('SUPER_SHOW_MARKDOWN_PREVIEW')
 
 export const SUPER_EXPORT_JSON = createKeyboardCommand('SUPER_EXPORT_JSON')

packages/ui-services/src/Keyboard/KeyboardShortcut.ts

@@ -19,7 +19,13 @@ export type PlatformedKeyboardShortcut = KeyboardShortcut & {
   platform: Platform
 }
 
-export type KeyboardShortcutCategory = 'General' | 'Notes list' | 'Current note' | 'Super notes' | 'Formatting'
+export type KeyboardShortcutCategory =
+  | 'General'
+  | 'Notes list'
+  | 'Current note'
+  | 'Super notes'
+  | 'Formatting'
+  | 'Search'
 
 export interface KeyboardShortcutHelpItem extends Omit<PlatformedKeyboardShortcut, 'command'> {
   command?: KeyboardCommand

packages/ui-services/src/Keyboard/getKeyboardShortcuts.ts

@@ -28,6 +28,11 @@ import {
   SUPER_SEARCH_NEXT_RESULT,
   SUPER_SEARCH_PREVIOUS_RESULT,
   SUPER_SEARCH_TOGGLE_REPLACE_MODE,
+  UNIVERSAL_TOGGLE_SEARCH,
+  UNIVERSAL_SEARCH_TOGGLE_CASE_SENSITIVE,
+  UNIVERSAL_SEARCH_NEXT_RESULT,
+  UNIVERSAL_SEARCH_PREVIOUS_RESULT,
+  UNIVERSAL_SEARCH_TOGGLE_REPLACE_MODE,
   CHANGE_EDITOR_WIDTH_COMMAND,
   SUPER_TOGGLE_TOOLBAR,
   TOGGLE_KEYBOARD_SHORTCUTS_MODAL,
@@ -178,6 +183,31 @@ export function getKeyboardShortcuts(platform: Platform, _environment: Environme
       key: 'F3',
       modifiers: [KeyboardModifier.Shift],
     },
+    {
+      command: UNIVERSAL_TOGGLE_SEARCH,
+      key: 'f',
+      modifiers: [primaryModifier],
+    },
+    {
+      command: UNIVERSAL_SEARCH_TOGGLE_REPLACE_MODE,
+      key: isMacPlatform(platform) ? undefined : 'h',
+      code: isMacPlatform(platform) ? 'KeyF' : undefined,
+      modifiers: isMacPlatform(platform) ? [KeyboardModifier.Alt, primaryModifier] : [primaryModifier],
+    },
+    {
+      command: UNIVERSAL_SEARCH_TOGGLE_CASE_SENSITIVE,
+      key: 'c',
+      modifiers: [KeyboardModifier.Alt],
+    },
+    {
+      command: UNIVERSAL_SEARCH_NEXT_RESULT,
+      key: 'F3',
+    },
+    {
+      command: UNIVERSAL_SEARCH_PREVIOUS_RESULT,
+      key: 'F3',
+      modifiers: [KeyboardModifier.Shift],
+    },
     {
       command: SUPER_SHOW_MARKDOWN_PREVIEW,
       key: 'm',

packages/web/src/javascripts/Components/NoteView/NoteView.tsx

@@ -47,7 +47,8 @@ import {
 } from './TransactionFunctions'
 import { SuperEditorContentId } from '../SuperEditor/Constants'
 import { NoteViewController } from './Controller/NoteViewController'
-import { PlainEditor, PlainEditorInterface } from './PlainEditor/PlainEditor'
+import { PlainEditorInterface } from './PlainEditor/PlainEditor'
+import { PlainEditorSearchContainer } from './PlainEditor/search/PlainEditorSearchContainer'
 import NoteStatusIndicator, { NoteStatus } from './NoteStatusIndicator'
 import CollaborationInfoHUD from './CollaborationInfoHUD'
 import Button from '../Button/Button'
@@ -977,7 +978,7 @@ class NoteView extends AbstractComponent<NoteViewProps, State> {
           )}
 
           {editorMode === 'plain' && (
-            <PlainEditor
+            <PlainEditorSearchContainer
               application={this.application}
               spellcheck={this.state.spellcheck}
               ref={this.setPlainEditorRef}