diff --git a/apps/mobile/android/app/proguard-rules.pro b/apps/mobile/android/app/proguard-rules.pro index 091103133..e25229466 100644 --- a/apps/mobile/android/app/proguard-rules.pro +++ b/apps/mobile/android/app/proguard-rules.pro @@ -43,4 +43,6 @@ -dontwarn java.awt.* -keep class com.sun.jna.* { *; } +-keep class net.jpountz.** { *; } +-keep class com.goterl.** { *; } -keepclassmembers class * extends com.sun.jna.* { public *; } \ No newline at end of file diff --git a/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj b/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj index 9c1232bf3..750ff6655 100644 --- a/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj +++ b/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj @@ -1118,7 +1118,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1600; + CURRENT_PROJECT_VERSION = 1601; DEVELOPMENT_TEAM = 53CWBG3QUC; ENABLE_BITCODE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1191,7 +1191,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.6.00; + MARKETING_VERSION = 1.6.01; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1219,7 +1219,7 @@ CODE_SIGN_ENTITLEMENTS = Notesnook/Notesnook.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1600; + CURRENT_PROJECT_VERSION = 1601; DEVELOPMENT_TEAM = 53CWBG3QUC; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; HEADER_SEARCH_PATHS = ( @@ -1291,7 +1291,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.6.00; + MARKETING_VERSION = 1.6.01; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", @@ -1449,7 +1449,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1600; + CURRENT_PROJECT_VERSION = 1601; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 53CWBG3QUC; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1460,7 +1460,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.6.00; + MARKETING_VERSION = 1.6.01; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget; @@ -1490,7 +1490,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1600; + CURRENT_PROJECT_VERSION = 1601; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 53CWBG3QUC; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1501,7 +1501,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.6.00; + MARKETING_VERSION = 1.6.01; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.notewidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1530,7 +1530,7 @@ CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1600; + CURRENT_PROJECT_VERSION = 1601; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 53CWBG3QUC; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1603,7 +1603,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.6.00; + MARKETING_VERSION = 1.6.01; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share; @@ -1633,7 +1633,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1600; + CURRENT_PROJECT_VERSION = 1601; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 53CWBG3QUC; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1706,7 +1706,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.6.00; + MARKETING_VERSION = 1.6.01; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/apps/mobile/share/index.js b/apps/mobile/share/index.js index 8450f3fd7..eb7736fba 100644 --- a/apps/mobile/share/index.js +++ b/apps/mobile/share/index.js @@ -16,12 +16,7 @@ import { useWindowDimensions, View } from 'react-native'; -import Animated, { - color, - Easing, - timing, - useValue -} from 'react-native-reanimated'; +import Animated, {Easing, timing, useValue} from 'react-native-reanimated'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import WebView from 'react-native-webview'; @@ -34,7 +29,6 @@ import { } from '../src/services/EventManager'; import {getElevation} from '../src/utils'; import {db} from '../src/utils/database'; -import {SIZE} from '../src/utils/SizeUtils'; import Storage from '../src/utils/storage'; import {sleep} from '../src/utils/TimeUtils'; import {Search} from './search'; @@ -254,6 +248,11 @@ const NotesnookShare = ({quicknote = false}) => { const onLoad = () => { postMessage(webviewRef, 'htmldiff', note.content?.data || ''); + setTimeout(() => { + webviewRef.current?.injectJavaScript(`document + .querySelector('.htmldiff_div') + .setAttribute('contenteditable', 'true');`); + }, 300); let theme = {...colors}; theme.factor = 1; postMessage(webviewRef, 'theme', JSON.stringify(theme)); @@ -425,7 +424,7 @@ const NotesnookShare = ({quicknote = false}) => { Quick note @@ -562,7 +561,7 @@ const NotesnookShare = ({quicknote = false}) => { style={{ width: '100%' }}> - {!quicknote && ( + {!quicknote ? (