diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 7795b620..9d512fde 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -133,8 +133,8 @@ private_lane :build_android do task: 'clean bundle', build_type: 'release', project_dir: "./android", - print_command: false, - print_command_output: false, + print_command: true, + print_command_output: true, properties: { "expoSDK" => VERSIONS[:expo], "releaseChannel" => RELEASE_CHANNEL, @@ -173,8 +173,8 @@ private_lane :build_android do task: 'clean bundle', build_type: 'release', project_dir: "./android", - print_command: false, - print_command_output: false, + print_command: true, + print_command_output: true, properties: { "expoSDK" => VERSIONS[:expo], "releaseChannel" => RELEASE_CHANNEL, diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a262f2d7..22f42bab 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -371,9 +371,9 @@ PODS: - React-Core - react-native-cameraroll (4.1.2): - React-Core - - react-native-netinfo (7.1.9): + - react-native-netinfo (8.0.0): - React-Core - - react-native-pager-view (5.4.9): + - react-native-pager-view (5.4.11): - React-Core - react-native-safe-area-context (3.3.2): - React-Core @@ -444,7 +444,7 @@ PODS: - React-jsi (= 0.66.4) - React-logger (= 0.66.4) - React-perflogger (= 0.66.4) - - RNCAsyncStorage (1.15.17): + - RNCAsyncStorage (1.16.1): - React-Core - RNFastImage (8.5.11): - React-Core @@ -452,7 +452,7 @@ PODS: - SDWebImageWebPCoder (~> 0.8.4) - RNGestureHandler (2.2.0): - React-Core - - RNReanimated (2.4.0): + - RNReanimated (2.4.1): - DoubleConversion - FBLazyVector - FBReactNativeSpec @@ -480,7 +480,7 @@ PODS: - React-RCTText - ReactCommon/turbomodule/core - Yoga - - RNScreens (3.10.2): + - RNScreens (3.11.1): - React-Core - React-RCTImage - RNSentry (3.2.13): @@ -815,8 +815,8 @@ SPEC CHECKSUMS: react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c react-native-blurhash: b7ed7b7de81ae1f9ce52d694f43c5b5cddddcae1 react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866 - react-native-netinfo: 87e5bfaf21ea5c6c110941290aa481dd8e849f98 - react-native-pager-view: 3ee7d4c7697fb3ef788346e834a60cca97ed8540 + react-native-netinfo: ba4ea50d836c60580c59079233c400753fe5bcb6 + react-native-pager-view: 7f00d63688f7df9fad86dfb0154814419cc5eb8d react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057 react-native-segmented-control: 65df6cd0619b780b3843d574a72d4c7cec396097 React-perflogger: 93075d8931c32cd1fce8a98c15d2d5ccc4d891bd @@ -831,11 +831,11 @@ SPEC CHECKSUMS: React-RCTVibration: e3ffca672dd3772536cb844274094b0e2c31b187 React-runtimeexecutor: dec32ee6f2e2a26e13e58152271535fadff5455a ReactCommon: 57b69f6383eafcbd7da625bfa6003810332313c4 - RNCAsyncStorage: 6bd5a7ba3dde1c3facba418aa273f449bdc5437a + RNCAsyncStorage: b49b4e38a1548d03b74b30e558a1d18465b94be7 RNFastImage: cced864a4a2eac27c5c10ac16bd5e8b9d2be4504 RNGestureHandler: bf572f552ea324acd5b5464b8d30755b2d8c1de6 - RNReanimated: fb56abd99a5d7efe91ae3c7bf3cd3663cee1b21b - RNScreens: d6da2b9e29cf523832c2542f47bf1287318b1868 + RNReanimated: e8afbe2a9e08e9e778ea72ddb1a8533445812621 + RNScreens: 4d83613b50b74ed277026375dc0810893b0c347f RNSentry: 0aa1567f66c20390f3834637fc4f73380dcd0774 RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f SDWebImage: 53179a2dba77246efa8a9b85f5c5b21f8f43e38f diff --git a/package.json b/package.json index e6a6fe4f..d97fecb7 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "tooot", "versions": { - "native": "220209", + "native": "220214", "major": 3, "minor": 5, - "patch": 0, + "patch": 1, "expo": "44.0.0" }, "description": "tooot app for Mastodon", @@ -27,14 +27,14 @@ "dependencies": { "@expo/react-native-action-sheet": "3.13.0", "@neverdull-agency/expo-unlimited-secure-store": "1.0.10", - "@react-native-async-storage/async-storage": "1.15.17", + "@react-native-async-storage/async-storage": "1.16.1", "@react-native-community/blur": "3.6.0", "@react-native-community/cameraroll": "4.1.2", - "@react-native-community/netinfo": "7.1.9", + "@react-native-community/netinfo": "8.0.0", "@react-native-community/segmented-control": "2.2.2", "@react-navigation/bottom-tabs": "6.2.0", "@react-navigation/native": "6.0.8", - "@react-navigation/native-stack": "6.4.1", + "@react-navigation/native-stack": "6.5.0", "@react-navigation/stack": "6.1.1", "@reduxjs/toolkit": "1.7.2", "@sentry/react-native": "3.2.13", @@ -67,7 +67,7 @@ "lodash": "4.17.21", "react": "17.0.2", "react-dom": "17.0.2", - "react-i18next": "11.15.3", + "react-i18next": "11.15.4", "react-native": "0.66.4", "react-native-animated-spinkit": "1.5.2", "react-native-base64": "^0.2.1", @@ -77,14 +77,14 @@ "react-native-flash-message": "0.2.1", "react-native-gesture-handler": "2.2.0", "react-native-htmlview": "0.16.0", - "react-native-pager-view": "5.4.9", - "react-native-reanimated": "2.4.0", + "react-native-pager-view": "5.4.11", + "react-native-reanimated": "2.4.1", "react-native-safe-area-context": "3.3.2", - "react-native-screens": "3.10.2", + "react-native-screens": "3.11.1", "react-native-svg": "12.1.1", "react-native-swipe-list-view": "3.2.9", "react-native-tab-view": "3.1.1", - "react-query": "3.34.14", + "react-query": "3.34.15", "react-redux": "7.2.6", "react-timeago": "6.2.1", "redux-persist": "6.0.0", @@ -94,10 +94,10 @@ "valid-url": "1.0.9" }, "devDependencies": { - "@babel/core": "7.17.0", + "@babel/core": "7.17.2", "@babel/plugin-proposal-optional-chaining": "7.16.7", "@babel/preset-typescript": "7.16.7", - "@expo/config": "6.0.16", + "@expo/config": "6.0.18", "@types/lodash": "4.14.178", "@types/react": "17.0.39", "@types/react-dom": "17.0.11", diff --git a/src/Screens.tsx b/src/Screens.tsx index 718c0e29..98bd115b 100644 --- a/src/Screens.tsx +++ b/src/Screens.tsx @@ -1,3 +1,4 @@ +import analytics from '@components/analytics' import { HeaderLeft } from '@components/Header' import { displayMessage, Message } from '@components/Message' import navigationRef from '@helpers/navigationRef' @@ -21,7 +22,6 @@ import { updateFilters } from '@utils/slices/instances/updateFilters' import { getInstanceActive, getInstances } from '@utils/slices/instancesSlice' import { useTheme } from '@utils/styles/ThemeManager' import { themes } from '@utils/styles/themes' -import * as Analytics from 'expo-firebase-analytics' import * as Linking from 'expo-linking' import { addScreenshotListener } from 'expo-screen-capture' import React, { useCallback, useEffect, useRef, useState } from 'react' @@ -40,11 +40,7 @@ const Screens: React.FC = ({ localCorrupt }) => { const { t } = useTranslation('screens') const dispatch = useDispatch() const instanceActive = useSelector(getInstanceActive) - const { colors, mode, theme } = useTheme() - enum barStyle { - light = 'dark-content', - dark = 'light-content' - } + const { colors, theme } = useTheme() const routeRef = useRef<{ name?: string; params?: {} }>() @@ -118,7 +114,7 @@ const Screens: React.FC = ({ localCorrupt }) => { } if (previousRoute?.name !== currentRoute?.name) { - Analytics.logEvent('screen_view', { screen_name: currentRoute?.name }) + analytics('screen_view', { screen_name: currentRoute?.name }) Sentry.Native.setContext('page', { previous: previousRoute, current: currentRoute @@ -163,10 +159,7 @@ const Screens: React.FC = ({ localCorrupt }) => { return ( <> - + ({ }) }) .catch(error => { - if (sentry && Math.random() < 0.01) { - Sentry.Native.setExtras({ - API: 'general', - ...(error.response && { response: error.response }), - ...(error.request && { request: error.request }) - }) - Sentry.Native.captureException(error) - } + // if (sentry && Math.random() < 0.01) { + // Sentry.Native.setExtras({ + // API: 'general', + // ...(error.response && { response: error.response }), + // ...(error.request && { request: error.request }) + // }) + // Sentry.Native.captureException(error) + // } if (error.response) { // The request was made and the server responded with a status code diff --git a/src/api/instance.ts b/src/api/instance.ts index 81236aeb..7a2558b7 100644 --- a/src/api/instance.ts +++ b/src/api/instance.ts @@ -98,14 +98,14 @@ const apiInstance = async ({ }) }) .catch(error => { - if (Math.random() < 0.001) { - Sentry.Native.setExtras({ - API: 'instance', - ...(error.response && { response: error.response }), - ...(error.request && { request: error.request }) - }) - Sentry.Native.captureException(error) - } + // if (Math.random() < 0.001) { + // Sentry.Native.setExtras({ + // API: 'instance', + // ...(error.response && { response: error.response }), + // ...(error.request && { request: error.request }) + // }) + // Sentry.Native.captureException(error) + // } if (error.response) { // The request was made and the server responded with a status code diff --git a/src/components/Timeline/Shared/Attachment/Image.tsx b/src/components/Timeline/Shared/Attachment/Image.tsx index 57f136b5..6d14663b 100644 --- a/src/components/Timeline/Shared/Attachment/Image.tsx +++ b/src/components/Timeline/Shared/Attachment/Image.tsx @@ -34,8 +34,8 @@ const AttachmentImage = React.memo( !image.meta?.original?.width || !image.meta?.original?.height ? attachmentAspectRatio({ total, index }) - : image.meta.original.height / image.meta.original.width > 2 - ? 0.5 + : image.meta.original.height / image.meta.original.width > 1 + ? 1 : image.meta.original.width / image.meta.original.height }} /> diff --git a/src/components/Timeline/Shared/Filtered.tsx b/src/components/Timeline/Shared/Filtered.tsx index 6736fda2..9892632f 100644 --- a/src/components/Timeline/Shared/Filtered.tsx +++ b/src/components/Timeline/Shared/Filtered.tsx @@ -41,7 +41,7 @@ export const shouldFilter = ({ }) => { const instance = getInstance(store.getState()) const ownAccount = - getInstanceAccount(store.getState())?.id === status.account.id + getInstanceAccount(store.getState())?.id === status.account?.id let shouldFilter = false if (!ownAccount) { diff --git a/src/components/analytics.ts b/src/components/analytics.ts index b028ce21..dd205a63 100644 --- a/src/components/analytics.ts +++ b/src/components/analytics.ts @@ -1,7 +1,7 @@ import * as Analytics from 'expo-firebase-analytics' const analytics = (event: string, params?: { [key: string]: any }) => { - Analytics.logEvent(event, params) + Analytics.logEvent(event, params).catch(() => {}) } export default analytics diff --git a/src/screens/ImagesViewer.tsx b/src/screens/ImagesViewer.tsx index cd723983..405a1aaa 100644 --- a/src/screens/ImagesViewer.tsx +++ b/src/screens/ImagesViewer.tsx @@ -127,7 +127,7 @@ const ScreenImagesViewer = ({ return ( - +