diff --git a/apps/mobile/App.js b/apps/mobile/App.js index a00b62c71..b7ff54557 100644 --- a/apps/mobile/App.js +++ b/apps/mobile/App.js @@ -56,6 +56,7 @@ import {sleep} from './src/utils/TimeUtils'; import EditorRoot from './src/views/Editor/EditorRoot'; import {getNote} from './src/views/Editor/Functions'; import Sentry from '@sentry/react-native'; +import Orientation from 'react-native-orientation'; let hasPurchased = false; function updateStatusBarColor() { @@ -154,6 +155,8 @@ const App = () => { useEffect(() => { SettingsService.init().then((r) => console.log); + console.log(Orientation.getInitialOrientation(),"INIT ORIENT") + DDS.checkSmallTab(Orientation.getInitialOrientation()) dispatch({ type: Actions.DEVICE_MODE, state: DDS.isLargeTablet() diff --git a/apps/mobile/initializer.root.js b/apps/mobile/initializer.root.js index 5e27f60c2..9f1541b43 100644 --- a/apps/mobile/initializer.root.js +++ b/apps/mobile/initializer.root.js @@ -185,6 +185,7 @@ const AppStack = React.memo( updatedDimensions = size; if (!size || (size.width === dimensions.width && mode !== null)) { DDS.setSize(size); + console.log(mode,"MODE__") dispatch({type: Actions.DEVICE_MODE, state: mode}); return; diff --git a/apps/mobile/src/components/Header/HeaderTitle.js b/apps/mobile/src/components/Header/HeaderTitle.js index f99815169..c0e43ff03 100644 --- a/apps/mobile/src/components/Header/HeaderTitle.js +++ b/apps/mobile/src/components/Header/HeaderTitle.js @@ -55,7 +55,7 @@ export const HeaderTitle = () => { return ( diff --git a/apps/mobile/src/services/DeviceDetection.js b/apps/mobile/src/services/DeviceDetection.js index 5c08f2a0a..6df7a5d81 100644 --- a/apps/mobile/src/services/DeviceDetection.js +++ b/apps/mobile/src/services/DeviceDetection.js @@ -30,6 +30,7 @@ export class DeviceDetectionService { this.isPhoneOrTablet(); this.isIosOrAndroid(); this.detectIphoneX(); + console.log(size.width > size.height,"CALC") this.checkSmallTab(size.width > size.height ? 'LANDSCAPE' : 'PORTRAIT'); } @@ -48,11 +49,12 @@ export class DeviceDetectionService { this.height = Dimensions.get('screen').height; let deviceSize = this.getDeviceSize(); - //console.log(deviceSize, orientation, DeviceInfo.isTablet(), 'DATA'); + console.log(deviceSize, orientation, DeviceInfo.isTablet(), 'DATA'); if ( (!DeviceInfo.isTablet() && orientation === 'LANDSCAPE') || (DeviceInfo.isTablet() && (orientation === 'PORTRAIT' || deviceSize < 9)) ) { + console.log('small tab') this.isTab = true; this.isPhone = false; this.isSmallTab = true; diff --git a/apps/mobile/src/utils/SizeUtils.js b/apps/mobile/src/utils/SizeUtils.js index e04f8d989..e9c901157 100644 --- a/apps/mobile/src/utils/SizeUtils.js +++ b/apps/mobile/src/utils/SizeUtils.js @@ -36,12 +36,13 @@ const correction = (size, multiplier) => { } else if (dSize >= 6.5 && dSize <= 7.2 && DDS.isTab) { return size * multiplier; } else if (dSize > 7.2 && dSize <= 8.5 && DDS.isTab) { - return size * 0.9; + return size * 0.85; } else if (dSize > 8.5 && dSize <= 9.2 && DDS.isTab) { - - return size * 0.78; - } else if (dSize > 9.2) { - return size * 0.8; + return size * 0.9; + } else if (dSize > 9.2 && dSize <= 10.5 && DDS.isTab) { + return size * 0.95; + } else if (dSize > 10.5) { + return size * 1; } else { return size; }