diff --git a/apps/mobile/android/app/proguard-rules.pro b/apps/mobile/android/app/proguard-rules.pro index 40a9b0a32..279ea497f 100644 --- a/apps/mobile/android/app/proguard-rules.pro +++ b/apps/mobile/android/app/proguard-rules.pro @@ -28,4 +28,13 @@ # Samsung Fingerprint -keep class com.samsung.android.sdk.** { *; } --dontwarn com.samsung.android.sdk.** \ No newline at end of file +-dontwarn com.samsung.android.sdk.** + +-keep public class com.dylanvann.fastimage.* {*;} +-keep public class com.dylanvann.fastimage.** {*;} +-keep public class * implements com.bumptech.glide.module.GlideModule +-keep public class * extends com.bumptech.glide.module.AppGlideModule +-keep public enum com.bumptech.glide.load.ImageHeaderParser$** { + **[] $VALUES; + public *; +} \ No newline at end of file diff --git a/apps/mobile/index.js b/apps/mobile/index.js index 965afc613..5a9878e62 100644 --- a/apps/mobile/index.js +++ b/apps/mobile/index.js @@ -2,7 +2,8 @@ import 'react-native-gesture-handler'; import React from 'react'; import {AppRegistry} from 'react-native'; import {name as appName} from './app.json'; - +import { enableScreens } from 'react-native-screens'; +enableScreens(true); let Provider; let App; let NotesnookShare; diff --git a/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj b/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj index 9f1bc7d10..6da9dc0d4 100644 --- a/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj +++ b/apps/mobile/ios/Notesnook.xcodeproj/project.pbxproj @@ -1147,8 +1147,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Notesnook/Notesnook.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1340; DEVELOPMENT_TEAM = 53CWBG3QUC; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1228,7 +1228,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook; PRODUCT_NAME = Notesnook; - PROVISIONING_PROFILE_SPECIFIER = "Notesnook iOS Distribution"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Notesnook-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1476,8 +1476,8 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = "Make Note/Make Note.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1340; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -1556,7 +1556,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.streetwriters.notesnook.share; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "Notesnook Extension iOS Distribution 2"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "Make Note/Make Note-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/apps/mobile/src/components/Container/ContainerTopSection.js b/apps/mobile/src/components/Container/ContainerTopSection.js index c3c2d6e8c..bbb3fc472 100644 --- a/apps/mobile/src/components/Container/ContainerTopSection.js +++ b/apps/mobile/src/components/Container/ContainerTopSection.js @@ -3,7 +3,7 @@ import { View } from 'react-native'; import { useTracked } from '../../provider'; import { Header } from '../Header'; -export const ContainerTopSection = ({root}) => { +export const ContainerTopSection = ({children}) => { const [state] = useTracked(); const {colors, selectionMode} = state; @@ -20,7 +20,7 @@ export const ContainerTopSection = ({root}) => { }, ], }}> -
+ {children} ); }; diff --git a/apps/mobile/src/components/Container/index.js b/apps/mobile/src/components/Container/index.js index cafb09194..84e2ce731 100644 --- a/apps/mobile/src/components/Container/index.js +++ b/apps/mobile/src/components/Container/index.js @@ -1,11 +1,10 @@ import React from 'react'; -import {KeyboardAvoidingView, Platform, SafeAreaView} from 'react-native'; +import { KeyboardAvoidingView, Platform, SafeAreaView } from 'react-native'; import Animated from 'react-native-reanimated'; import { useTracked } from '../../provider'; -import { getElevation } from '../../utils'; import { ContainerScale } from '../../utils/Animations'; import SelectionHeader from '../SelectionHeader'; -import {ContainerTopSection} from './ContainerTopSection'; +import { ContainerTopSection } from './ContainerTopSection'; const AnimatedView = Animated.createAnimatedComponent(SafeAreaView); export const Container = ({children, root}) => { const [state] = useTracked(); @@ -30,8 +29,7 @@ export const Container = ({children, root}) => { } ] }}> - - + {children} diff --git a/apps/mobile/src/components/DialogManager/index.js b/apps/mobile/src/components/DialogManager/index.js index 7ac642d2a..ec192db89 100644 --- a/apps/mobile/src/components/DialogManager/index.js +++ b/apps/mobile/src/components/DialogManager/index.js @@ -379,7 +379,7 @@ export class DialogManager extends Component { - + diff --git a/apps/mobile/src/components/Header/HeaderLeftMenu.js b/apps/mobile/src/components/Header/HeaderLeftMenu.js index 5e8ca0809..0d8430692 100644 --- a/apps/mobile/src/components/Header/HeaderLeftMenu.js +++ b/apps/mobile/src/components/Header/HeaderLeftMenu.js @@ -1,11 +1,10 @@ -import React, { useEffect, useState } from 'react'; -import {notesnook} from '../../../e2e/test.ids'; -import {useTracked} from '../../provider'; +import React from 'react'; +import { notesnook } from '../../../e2e/test.ids'; +import { useTracked } from '../../provider'; import { DDS } from '../../services/DeviceDetection'; -import { eSubscribeEvent, eUnSubscribeEvent } from '../../services/EventManager'; import Navigation from '../../services/Navigation'; -import {SIZE} from '../../utils/SizeUtils'; -import {ActionIcon} from '../ActionIcon'; +import { SIZE } from '../../utils/SizeUtils'; +import { ActionIcon } from '../ActionIcon'; export const HeaderLeftMenu = ({currentScreen,headerMenuState}) => { const [state] = useTracked(); diff --git a/apps/mobile/src/components/Header/HeaderRightMenu.js b/apps/mobile/src/components/Header/HeaderRightMenu.js index 7e253fcc7..66369f08f 100644 --- a/apps/mobile/src/components/Header/HeaderRightMenu.js +++ b/apps/mobile/src/components/Header/HeaderRightMenu.js @@ -1,19 +1,17 @@ -import React, {useEffect, useState} from 'react'; -import {ActivityIndicator, StyleSheet, View} from 'react-native'; -import {notesnook} from '../../../e2e/test.ids'; -import {useTracked} from '../../provider'; -import {DDS} from '../../services/DeviceDetection'; -import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager'; +import React from 'react'; +import { ActivityIndicator, StyleSheet, View } from 'react-native'; +import { notesnook } from '../../../e2e/test.ids'; +import { useTracked } from '../../provider'; +import { DDS } from '../../services/DeviceDetection'; import Navigation from '../../services/Navigation'; -import {dWidth} from '../../utils'; -import {SIZE} from '../../utils/SizeUtils'; -import {ActionIcon} from '../ActionIcon'; -import {Button} from '../Button'; +import { SIZE } from '../../utils/SizeUtils'; +import { ActionIcon } from '../ActionIcon'; +import { Button } from '../Button'; export const HeaderRightMenu = ({currentScreen}) => { const [state] = useTracked(); - const {colors, containerBottomButton, syncing} = state; - + const {colors, syncing} = state; + return ( {syncing && } @@ -33,11 +31,9 @@ export const HeaderRightMenu = ({currentScreen}) => { /> )} - {DDS.isLargeTablet() && containerBottomButton.onPress ? ( + {DDS.isLargeTablet() ? (