A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: add quick settings tile on android
Ammar Ahmedceb5ce5cdd37
diff --git a/apps/mobile/native/android/app/src/main/AndroidManifest.xml b/apps/mobile/native/android/app/src/main/AndroidManifest.xmlindex 7cf423cad..523517fc7 100644--- a/apps/mobile/native/android/app/src/main/AndroidManifest.xml+++ b/apps/mobile/native/android/app/src/main/AndroidManifest.xml@@ -140,6 +140,17 @@<service android:name="com.streetwriters.notesnook.BootTaskService" />+ <service+ android:name=".NotesnookTileService"+ android:icon="@drawable/add_note"+ android:label="New note"+ android:exported="true"+ android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">+ <intent-filter>+ <action android:name="android.service.quicksettings.action.QS_TILE"/>+ </intent-filter>+ </service>+<providerandroid:name="androidx.core.content.FileProvider"android:authorities="${applicationId}.provider"@@ -166,6 +177,8 @@<action android:name="android.intent.action.QUICKBOOT_POWERON" /></intent-filter></receiver>++</application>diff --git a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.javaindex 68b41e878..ddb1b1b6c 100644--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/NotesnookTileService.java@@ -1,2 +1,19 @@-package com.streetwriters.notesnook;public class NotesnookTileService {+package com.streetwriters.notesnook;++import android.content.Intent;+import android.os.Build;+import android.service.quicksettings.Tile;+import android.service.quicksettings.TileService;++import androidx.annotation.RequiresApi;++@RequiresApi(api = Build.VERSION_CODES.N)+public class NotesnookTileService extends TileService {+ @Override+ public void onClick() {+ super.onClick();+ Intent intent = new Intent(this.getApplicationContext(), ShareActivity.class);+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);+ startActivityAndCollapse(intent);+ }}diff --git a/apps/mobile/share/editor.js b/apps/mobile/share/editor.jsindex ba8e4d264..f5736754e 100644--- a/apps/mobile/share/editor.js+++ b/apps/mobile/share/editor.js@@ -25,7 +25,7 @@ import React, {useRef,useState} from "react";-import { Linking, Platform, View } from "react-native";+import { Linking, Platform, TextInput, View } from "react-native";import { WebView } from "react-native-webview";import Commands from "../app/screens/editor/tiptap/commands";import {@@ -141,21 +141,48 @@ const style = {backgroundColor: "transparent"};-export const Editor = ({ onChange, onLoad }) => {+export const Editor = ({ onChange, onLoad, editorRef }) => {const { colors } = useThemeColors();const editor = useEditor();+ const inputRef = useRef();const onMessage = useEditorEvents(editor, onChange);const [loading, setLoading] = useState(true);useLayoutEffect(() => {onLoad?.();}, [onLoad]);+ if (editorRef) {+ editorRef.current = {+ focus: () => {+ setTimeout(() => {+ inputRef.current?.focus();+ editor.ref.current?.injectJavaScript(`(() => {+ const editor = document.getElementById('editor');+ if (editor) {+ editor.focus();+ }+ })();`);+ editor.ref?.current?.requestFocus();+ });+ }+ };+ }+return (<Viewstyle={{flex: 1}}>+ <TextInput+ ref={inputRef}+ style={{+ width: 1,+ height: 1,+ position: "absolute",+ zIndex: -1+ }}+ /><WebViewref={editor.ref}onLoad={() => {diff --git a/apps/mobile/share/share.js b/apps/mobile/share/share.jsindex 246e2c6c7..4bb1f09be 100644--- a/apps/mobile/share/share.js+++ b/apps/mobile/share/share.js@@ -32,17 +32,13 @@ import {Platform,SafeAreaView,ScrollView,- StatusBar,Text,TouchableOpacity,View,useWindowDimensions} from "react-native";import RNFetchBlob from "react-native-blob-util";-import {- SafeAreaProvider,- useSafeAreaInsets-} from "react-native-safe-area-context";+import { SafeAreaProvider } from "react-native-safe-area-context";import Icon from "react-native-vector-icons/MaterialCommunityIcons";import isURL from "validator/lib/isURL";import { DatabaseLogger, db } from "../app/common/database";@@ -129,11 +125,7 @@ const ShareView = () => {const keyboardHeight = useRef(0);const { width, height } = useWindowDimensions();const [loadingPage, setLoadingPage] = useState(false);- const insets =- Platform.OS === "android"- ? { top: StatusBar.currentHeight }- : // eslint-disable-next-line react-hooks/rules-of-hooks- useSafeAreaInsets();+ const editorRef = useRef();const [searchMode, setSearchMode] = useState(null);const [rawFiles, setRawFiles] = useState([]);@@ -141,7 +133,7 @@ const ShareView = () => {const [compress, setCompress] = useState(true);globalThis["IS_SHARE_EXTENSION"] = true;const onKeyboardDidShow = (event) => {- let height = Dimensions.get("window").height - event.endCoordinates.screenY;+ let height = Dimensions.get("screen").height - event.endCoordinates.screenY;keyboardHeight.current = height;setKh(height);};@@ -178,68 +170,78 @@ const ShareView = () => {return note;};- const loadData = useCallback(async () => {- try {- if (noteContent.current) {- onLoad();- return;- }- defaultNote.content.data = null;- setNote({ ...defaultNote });- const data = await ShareExtension.data();+ const loadData = useCallback(+ async (isEditor) => {+ try {+ if (noteContent.current) {+ onLoad();+ return;+ }+ defaultNote.content.data = null;+ setNote({ ...defaultNote });+ const data = await ShareExtension.data();- if (!data || data.length === 0) {- setRawData({- value: ""- });- return;- }- let note = { ...defaultNote };- for (let item of data) {- if (item.type === "text") {- setRawData(item);- if (isURL(item.value)) {- note = await showLinkPreview(note, item.value);- } else {- note.content.data = makeHtmlFromPlainText(item.value);+ if (!data || data.length === 0) {+ setRawData({+ value: ""+ });+ if (isEditor) {+ setTimeout(() => {+ editorRef.current?.focus();+ }, 300);}- noteContent.current = note.content.data;- } else if (item.type === "extras") {- for (const key in item) {- if (!key) continue;- if (key.includes("TITLE") || key.includes("SUBJECT")) {- note.title = item[key];- console.log("Note title will be", note.title);+ return;+ }+ let note = { ...defaultNote };+ for (let item of data) {+ if (item.type === "text") {+ setRawData(item);+ if (isURL(item.value)) {+ note = await showLinkPreview(note, item.value);+ } else {+ note.content.data = makeHtmlFromPlainText(item.value);}- }- } else {- const user = await db.user.getUser();- if (user && user.subscription.type !== 0) {- if (- (isImage(item.type) && item.size > IMAGE_SIZE_LIMIT) ||- (!isImage(item.type) && item.size > FILE_SIZE_LIMIT)- )- continue;-- setRawFiles((files) => {- const index = files.findIndex((file) => file.name === item.name);- if (index === -1) {- files.push(item);- return [...files];- } else {- return files;+ noteContent.current = note.content.data;+ } else if (item.type === "extras") {+ for (const key in item) {+ if (!key) continue;+ if (key.includes("TITLE") || key.includes("SUBJECT")) {+ note.title = item[key];+ console.log("Note title will be", note.title);}- });+ }+ } else {+ const user = await db.user.getUser();+ if (user && user.subscription.type !== 0) {+ if (+ (isImage(item.type) && item.size > IMAGE_SIZE_LIMIT) ||+ (!isImage(item.type) && item.size > FILE_SIZE_LIMIT)+ )+ continue;++ setRawFiles((files) => {+ const index = files.findIndex(+ (file) => file.name === item.name+ );+ if (index === -1) {+ files.push(item);+ return [...files];+ } else {+ return files;+ }+ });+ }}}- }- onLoad();+ onLoad();- setNote({ ...note });- } catch (e) {- console.error(e);- }- }, [onLoad]);+ setNote({ ...note });+ } catch (e) {+ console.error(e);+ }+ },+ [onLoad]+ );const onLoad = useCallback(() => {eSendEvent(eOnLoadNote + "shareEditor", {@@ -365,7 +367,7 @@ const ShareView = () => {const onLoadEditor = useCallback(() => {Storage.write("shareExtensionOpened", "opened");- loadData();+ loadData(true);}, [loadData]);const onRemoveFile = (item) => {@@ -388,7 +390,8 @@ const ShareView = () => {width: width > 500 ? 500 : width,height: height - kh,alignSelf: "center",- justifyContent: "flex-end"+ justifyContent: "flex-end",+ overflow: "hidden"}}>{loadingPage ? <HtmlLoadingWebViewAgent /> : null}@@ -439,320 +442,325 @@ const ShareView = () => {maxHeight: Platform.OS === "android" ? undefined : "100%"}}>- <View- style={{- maxHeight: "100%"- }}- >+ <ScrollView><Viewstyle={{- width: "100%"+ maxHeight: "100%"}}><Viewstyle={{- minHeight: 100,- backgroundColor: colors.primary.background,- overflow: "hidden"+ width: "100%"}}><Viewstyle={{- justifyContent: "space-between",- flexDirection: "row",- alignItems: "center",- borderBottomWidth: 1,- paddingBottom: 12,- borderBottomColor: colors.secondary.background,- paddingHorizontal: 12+ minHeight: 100,+ backgroundColor: colors.primary.background,+ overflow: "hidden"}}>- <Heading size={SIZE.lg}>Save to Notesnook</Heading>- <Button- title="Done"- type="accent"- loading={loading}- onPress={onPress}- />- </View>-- {rawFiles?.length > 0 ? (<Viewstyle={{- paddingHorizontal: 12,- paddingVertical: 12,- backgroundColor: colors.secondary.background+ justifyContent: "space-between",+ flexDirection: "row",+ alignItems: "center",+ borderBottomWidth: 1,+ paddingBottom: 12,+ borderBottomColor: colors.secondary.background,+ paddingHorizontal: 12}}>- <Paragraph- style={{ marginBottom: 6 }}- color={colors.primary.paragraph}+ <Heading size={SIZE.lg}>Save to Notesnook</Heading>+ <Button+ title="Done"+ type="accent"+ loading={loading}+ onPress={onPress}+ />+ </View>++ {rawFiles?.length > 0 ? (+ <View+ style={{+ paddingHorizontal: 12,+ paddingVertical: 12,+ backgroundColor: colors.secondary.background+ }}>- Attaching {rawFiles.length} file(s):- </Paragraph>- <ScrollView horizontal>- {rawFiles.map((item) =>- isImage(item.type) ? (- <TouchableOpacity- onPress={() => onRemoveFile(item)}- key={item.name}- activeOpacity={0.9}- >- <Image+ <Paragraph+ style={{ marginBottom: 6 }}+ color={colors.primary.paragraph}+ >+ Attaching {rawFiles.length} file(s):+ </Paragraph>+ <ScrollView horizontal>+ {rawFiles.map((item) =>+ isImage(item.type) ? (+ <TouchableOpacity+ onPress={() => onRemoveFile(item)}+ key={item.name}+ activeOpacity={0.9}+ >+ <Image+ source={{+ uri:+ Platform.OS === "android"+ ? `file://${item.value}`+ : item.value+ }}+ style={{+ width: 100,+ height: 100,+ borderRadius: 5,+ backgroundColor: "black",+ marginRight: 6+ }}+ resizeMode="cover"+ />+ </TouchableOpacity>+ ) : (+ <TouchableOpacity+ activeOpacity={0.9}+ key={item.name}source={{- uri:- Platform.OS === "android"- ? `file://${item.value}`- : item.value+ uri: `file://${item.value}`}}+ onPress={() => onRemoveFile(item)}style={{- width: 100,- height: 100,borderRadius: 5,- backgroundColor: "black",+ backgroundColor: colors.secondary.background,+ flexDirection: "row",+ borderWidth: 1,+ borderColor: colors.primary.border,+ alignItems: "center",+ paddingVertical: 5,+ paddingHorizontal: 8,marginRight: 6}}resizeMode="cover"- />- </TouchableOpacity>- ) : (- <TouchableOpacity- activeOpacity={0.9}- key={item.name}- source={{- uri: `file://${item.value}`- }}- onPress={() => onRemoveFile(item)}- style={{- borderRadius: 5,- backgroundColor: colors.secondary.background,- flexDirection: "row",- borderWidth: 1,- borderColor: colors.primary.border,- alignItems: "center",- paddingVertical: 5,- paddingHorizontal: 8,- marginRight: 6- }}- resizeMode="cover"- >- <Icon- color={colors.primary.icon}- size={15}- name="file"- />-- <Paragraph- size={SIZE.xs}- color={colors.primary.paragraph}- style={{- marginLeft: 4,- paddingRight: 8- }}>- {item.name} ({formatBytes(item.size)})- </Paragraph>- </TouchableOpacity>- )- )}- </ScrollView>-- <Paragraph- color={colors.secondary.paragraph}- size={SIZE.xs}- style={{- marginTop: 6- }}- >- Tap to remove an attachment.- </Paragraph>- <TouchableOpacity- activeOpacity={1}- style={{- flexDirection: "row",- alignSelf: "center",- alignItems: "center",- width: "100%",- marginTop: 6- }}- onPress={() => {- setCompress(!compress);- }}- >- <Icon- size={20}- name={- compress ? "checkbox-marked" : "checkbox-blank-outline"- }- color={- compress ? colors.primary.accent : colors.primary.icon- }- />-- <Text+ <Icon+ color={colors.primary.icon}+ size={15}+ name="file"+ />++ <Paragraph+ size={SIZE.xs}+ color={colors.primary.paragraph}+ style={{+ marginLeft: 4,+ paddingRight: 8+ }}+ >+ {item.name} ({formatBytes(item.size)})+ </Paragraph>+ </TouchableOpacity>+ )+ )}+ </ScrollView>++ <Paragraph+ color={colors.secondary.paragraph}+ size={SIZE.xs}style={{- flexShrink: 1,- marginLeft: 3,- fontSize: 12+ marginTop: 6}}>- Compress image (recommended)- </Text>- </TouchableOpacity>- </View>- ) : null}- <View- style={{- width: "100%",- height: rawFiles.length > 0 ? 100 : 200,- paddingBottom: 15,- marginBottom: 10,- borderBottomColor: colors.secondary.background,- borderBottomWidth: 1- }}- >- <SafeAreaProvider+ Tap to remove an attachment.+ </Paragraph>+ <TouchableOpacity+ activeOpacity={1}+ style={{+ flexDirection: "row",+ alignSelf: "center",+ alignItems: "center",+ width: "100%",+ marginTop: 6+ }}+ onPress={() => {+ setCompress(!compress);+ }}+ >+ <Icon+ size={20}+ name={+ compress+ ? "checkbox-marked"+ : "checkbox-blank-outline"+ }+ color={+ compress ? colors.primary.accent : colors.primary.icon+ }+ />++ <Text+ style={{+ flexShrink: 1,+ marginLeft: 3,+ fontSize: 12+ }}+ >+ Compress image (recommended)+ </Text>+ </TouchableOpacity>+ </View>+ ) : null}+ <Viewstyle={{- flex: 1,- paddingTop: 10,- justifyContent: loadingPage ? "center" : undefined,- alignItems: loadingPage ? "center" : undefined+ width: "100%",+ height: rawFiles.length > 0 ? 100 : 200,+ paddingBottom: 15,+ marginBottom: 10,+ borderBottomColor: colors.secondary.background,+ borderBottomWidth: 1}}>- {!loadingExtension && !loadingPage ? (- <Editor- onLoad={onLoadEditor}- onChange={(html) => {- noteContent.current = html;- }}- />- ) : (- <>- {loadingPage ? (- <>- <ActivityIndicator color={colors.primary.accent} />- <Paragraph>Preparing web clip...</Paragraph>- </>- ) : null}- </>- )}- </SafeAreaProvider>- </View>+ <SafeAreaProvider+ style={{+ flex: 1,+ paddingTop: 10,+ justifyContent: loadingPage ? "center" : undefined,+ alignItems: loadingPage ? "center" : undefined+ }}+ >+ {!loadingExtension && !loadingPage ? (+ <Editor+ editorRef={editorRef}+ onLoad={onLoadEditor}+ onChange={(html) => {+ noteContent.current = html;+ }}+ />+ ) : (+ <>+ {loadingPage ? (+ <>+ <ActivityIndicator color={colors.primary.accent} />+ <Paragraph>Preparing web clip...</Paragraph>+ </>+ ) : null}+ </>+ )}+ </SafeAreaProvider>+ </View>- {appendNoteId ? <AppendNote id={appendNoteId} /> : null}+ {appendNoteId ? <AppendNote id={appendNoteId} /> : null}- <View- style={{- flexDirection: "row",- paddingHorizontal: 12,- width: "100%",- alignItems: "center"- }}- >- <Paragraph+ <Viewstyle={{- marginRight: 10+ flexDirection: "row",+ paddingHorizontal: 12,+ width: "100%",+ alignItems: "center"}}>- Clip Mode:- </Paragraph>- {rawData.value && isURL(rawData.value) ? (+ <Paragraph+ style={{+ marginRight: 10+ }}+ >+ Clip Mode:+ </Paragraph>+ {rawData.value && isURL(rawData.value) ? (+ <Button+ type={mode === 2 ? "inverted" : "transparent"}+ icon={mode === 2 ? "radiobox-marked" : "radiobox-blank"}+ onPress={() => changeMode(2)}+ title={modes[2].title}+ height={30}+ style={{+ paddingHorizontal: 6+ }}+ />+ ) : null}<Button- type={mode === 2 ? "inverted" : "transparent"}- icon={mode === 2 ? "radiobox-marked" : "radiobox-blank"}+ type={mode === 1 ? "inverted" : "transparent"}+ icon={mode === 1 ? "radiobox-marked" : "radiobox-blank"}onPress={() => changeMode(2)}- title={modes[2].title}+ title={modes[1].title}height={30}style={{paddingHorizontal: 6}}/>- ) : null}- <Button- type={mode === 1 ? "inverted" : "transparent"}- icon={mode === 1 ? "radiobox-marked" : "radiobox-blank"}- onPress={() => changeMode(2)}- title={modes[1].title}- height={30}- style={{- paddingHorizontal: 6- }}- />+ </View></View></View>- </View>- <View- style={{- width: "100%",- borderRadius: 10,- flexDirection: "column",- marginTop: 10,- alignSelf: "center",- alignItems: "center",- paddingHorizontal: 12,- gap: 10- }}- >- <Button- icon="plus"- onPress={() => {- useShareStore.getState().setAppendNote(null);- }}- type={!appendNoteId ? "transparent" : "plain"}- title="New note"+ <Viewstyle={{- paddingHorizontal: 12,- height: 45,width: "100%",- marginRight: 0,- borderWidth: 1,- borderColor: colors.secondary.background,- justifyContent: "flex-start"- }}- />-- <Button- icon="text-short"- onPress={() => {- setSearchMode("appendNote");- }}- type={appendNoteId ? "transparent" : "plain"}- title={`Append to a note`}- style={{+ borderRadius: 10,+ flexDirection: "column",+ marginTop: 10,+ alignSelf: "center",+ alignItems: "center",paddingHorizontal: 12,- height: 45,- width: "100%",- marginRight: 0,- borderWidth: 1,- borderColor: colors.secondary.background,- justifyContent: "flex-start"+ gap: 10}}- />-- {!appendNoteId ? (- <AddTags+ >+ <Button+ icon="plus"onPress={() => {- setSearchMode("selectTags");+ useShareStore.getState().setAppendNote(null);+ }}+ type={!appendNoteId ? "transparent" : "plain"}+ title="New note"+ style={{+ paddingHorizontal: 12,+ height: 45,+ width: "100%",+ marginRight: 0,+ borderWidth: 1,+ borderColor: colors.secondary.background,+ justifyContent: "flex-start"}}/>- ) : null}- {!appendNoteId ? (- <AddNotebooks+ <Button+ icon="text-short"onPress={() => {- setSearchMode("selectNotebooks");+ setSearchMode("appendNote");+ }}+ type={appendNoteId ? "transparent" : "plain"}+ title={`Append to a note`}+ style={{+ paddingHorizontal: 12,+ height: 45,+ width: "100%",+ marginRight: 0,+ borderWidth: 1,+ borderColor: colors.secondary.background,+ justifyContent: "flex-start"}}/>- ) : null}- </View>- <View- style={{- height: Platform.isPad ? 150 : Platform.OS === "ios" ? 110 : 0- }}- />- </View>+ {!appendNoteId ? (+ <AddTags+ onPress={() => {+ setSearchMode("selectTags");+ }}+ />+ ) : null}++ {!appendNoteId ? (+ <AddNotebooks+ onPress={() => {+ setSearchMode("selectNotebooks");+ }}+ />+ ) : null}+ </View>++ <View+ style={{+ height: Platform.isPad ? 150 : Platform.OS === "ios" ? 110 : 0+ }}+ />+ </View>+ </ScrollView></WrapperView></SafeAreaView>);