Update to RN 0.69.6, reorganise code.

package.json

@@ -24,7 +24,7 @@
     "events": "^3.3.0",
     "promise.allsettled": "^1.0.4",
     "react": "18.0.0",
-    "react-native": "0.69.5",
+    "react-native": "0.69.6",
     "react-native-crypto": "^2.2.0",
     "react-native-pager-view": "^5.4.9",
     "react-native-randombytes": "^3.6.1",

src/App.tsx

@@ -15,8 +15,8 @@ import {
 } from '@react-navigation/native-stack'
 import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs'
 
-import useAsyncStorage from './helpers/useAsyncStorage'
-import useJsonAsyncStorage from './helpers/useJsonAsyncStorage'
+import useAsyncStorage from './storage/useAsyncStorage'
+import useJsonAsyncStorage from './storage/useJsonAsyncStorage'
 import ConnectionContext, {
   Connection,
   DisconnectReason as Disconnect
@@ -30,8 +30,8 @@ import ServersContext, { Servers } from './context/serversContext'
 import DisconnectDialog from './components/DisconnectDialog'
 import ChatScreen from './screens/chat/ChatScreen'
 import ServerScreen from './screens/ServerScreen'
-import AccountScreen from './screens/accounts/AccountScreen'
-import SettingScreen from './screens/settings/SettingScreen'
+import AccountScreen from './screens/AccountScreen'
+import SettingScreen from './screens/SettingScreen'
 import globalStyle from './globalStyle'
 
 const Stacks = createNativeStackNavigator()

src/screens/accounts/AddAccountDialog.tsx → src/components/accounts/AddAccountDialog.tsx

@@ -3,9 +3,9 @@ import { StyleSheet, View, Pressable, Image } from 'react-native'
 
 import MicrosoftLogin from './MicrosoftLogin'
 import globalStyle from '../../globalStyle'
-import Text from '../../components/Text'
-import Dialog, { dialogStyles } from '../../components/Dialog'
-import TextField from '../../components/TextField'
+import Text from '../Text'
+import Dialog, { dialogStyles } from '../Dialog'
+import TextField from '../TextField'
 import useDarkMode from '../../context/useDarkMode'
 import UsersContext from '../../context/accountsContext'
 import { authenticate } from '../../minecraft/api/yggdrasil'

src/components/Setting.tsx → src/components/settings/Setting.tsx

@@ -1,10 +1,10 @@
 import React, { useState } from 'react'
 import { StyleSheet, View, Switch, Pressable } from 'react-native'
 
-import TextFieldDialog from './TextFieldDialog'
-import globalStyle from '../globalStyle'
-import Text from './Text'
-import useDarkMode from '../context/useDarkMode'
+import TextFieldDialog from '../TextFieldDialog'
+import globalStyle from '../../globalStyle'
+import Text from '../Text'
+import useDarkMode from '../../context/useDarkMode'
 
 const Setting = <T extends string | boolean>({
   name,

src/screens/accounts/AccountScreen.tsx → src/screens/AccountScreen.tsx

@@ -2,14 +2,14 @@ import React, { useContext, useState } from 'react'
 import { StyleSheet, View, Image, Pressable } from 'react-native'
 import Ionicons from 'react-native-vector-icons/Ionicons'
 
-import AddAccountDialog from './AddAccountDialog'
-import globalStyle from '../../globalStyle'
-import Text from '../../components/Text'
-import Dialog, { dialogStyles } from '../../components/Dialog'
-import useDarkMode from '../../context/useDarkMode'
-import UsersContext from '../../context/accountsContext'
-import ElevatedView from '../../components/ElevatedView'
-import { invalidate } from '../../minecraft/api/yggdrasil'
+import AddAccountDialog from '../components/accounts/AddAccountDialog'
+import globalStyle from '../globalStyle'
+import Text from '../components/Text'
+import Dialog, { dialogStyles } from '../components/Dialog'
+import useDarkMode from '../context/useDarkMode'
+import UsersContext from '../context/accountsContext'
+import ElevatedView from '../components/ElevatedView'
+import { invalidate } from '../minecraft/api/yggdrasil'
 
 // LOW-TODO: Reload to update account info for online mode using /refresh.
 // Also, to reload all the skin images?

src/screens/settings/SettingScreen.tsx → src/screens/SettingScreen.tsx

@@ -4,14 +4,14 @@ import { MaterialTopTabScreenProps } from '@react-navigation/material-top-tabs'
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import Ionicons from 'react-native-vector-icons/Ionicons'
 
-import { version } from '../../../package.json'
-import { RootStackParamList } from '../../App'
-import Text from '../../components/Text'
-import Setting from '../../components/Setting'
-import globalStyle from '../../globalStyle'
-import useDarkMode from '../../context/useDarkMode'
-import SettingsContext from '../../context/settingsContext'
-import DarkModeSetting from './DarkModeSetting'
+import { version } from '../../package.json'
+import { RootStackParamList } from '../App'
+import Text from '../components/Text'
+import Setting from '../components/settings/Setting'
+import DarkModeSetting from '../components/settings/DarkModeSetting'
+import globalStyle from '../globalStyle'
+import useDarkMode from '../context/useDarkMode'
+import SettingsContext from '../context/settingsContext'
 
 type StackProps = NativeStackScreenProps<RootStackParamList, 'Settings'>
 type TabProps = MaterialTopTabScreenProps<RootStackParamList, 'Settings'>

src/screens/chat/ChatScreen.tsx

@@ -355,7 +355,7 @@ const styles = StyleSheet.create({
   backButtonIcon: { marginRight: 0 },
   sendButtonIcon: { marginRight: 0, marginLeft: 4 },
   androidScaleInvert: { scaleY: Platform.OS === 'android' ? -1 : undefined },
-  chatArea: { padding: 8, flex: 1, scaleY: -1 },
+  chatArea: { padding: 8, flex: 1 },
   chatAreaScrollView: { paddingBottom: 16 },
   loadingScreen: { flex: 1, alignItems: 'center', justifyContent: 'center' },
   loadingScreenText: { paddingTop: 24, fontSize: 20 },

yarn.lock

@@ -2147,7 +2147,7 @@
     "is-string" "^1.0.5"
 
 "asap@~2.0.6":
-  "integrity" "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+  "integrity" "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
   "resolved" "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"
   "version" "2.0.6"
 
@@ -6822,10 +6822,10 @@
     "get-intrinsic" "^1.0.2"
     "iterate-value" "^1.0.2"
 
-"promise@^8.0.3":
-  "integrity" "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="
-  "resolved" "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz"
-  "version" "8.1.0"
+"promise@^8.2.0":
+  "integrity" "sha512-+CMAlLHqwRYwBMXKCP+o8ns7DN+xHDUiI+0nArsiJ9y+kJVPLFxEaSw6Ha9s9H0tftxg2Yzl25wqj9G7m5wLZg=="
+  "resolved" "https://registry.npmjs.org/promise/-/promise-8.2.0.tgz"
+  "version" "8.2.0"
   dependencies:
     "asap" "~2.0.6"
 
@@ -7033,10 +7033,10 @@
     "escape-string-regexp" "2.0.0"
     "invariant" "2.2.4"
 
-"react-native@*", "react-native@^0.0.0-0 || 0.60 - 0.69 || 1000.0.0", "react-native@>=0.57", "react-native@>=0.60.0", "react-native@0.69.5":
-  "integrity" "sha512-4Psrj1nDMLQjBXVH8n3UikzOHQc8+sa6NbxZQR0XKtpx8uC3HiJBgX+/FIum/RWxfi5J/Dt/+A2gLGmq2Hps8g=="
-  "resolved" "https://registry.npmjs.org/react-native/-/react-native-0.69.5.tgz"
-  "version" "0.69.5"
+"react-native@*", "react-native@^0.0.0-0 || 0.60 - 0.69 || 1000.0.0", "react-native@>=0.57", "react-native@>=0.60.0", "react-native@0.69.6":
+  "integrity" "sha512-wwXpqM+12kdEYdBZCJUb5SBu95CzgejrwFeYJ78RzHZV/Sj6DBRekbsHGrDDsY4R25QXALQxy4DQYQCObVvWjA=="
+  "resolved" "https://registry.npmjs.org/react-native/-/react-native-0.69.6.tgz"
+  "version" "0.69.6"
   dependencies:
     "@jest/create-cache-key-function" "^27.0.1"
     "@react-native-community/cli" "^8.0.4"
@@ -7059,7 +7059,7 @@
     "mkdirp" "^0.5.1"
     "nullthrows" "^1.1.1"
     "pretty-format" "^26.5.2"
-    "promise" "^8.0.3"
+    "promise" "^8.2.0"
     "react-devtools-core" "4.24.0"
     "react-native-codegen" "^0.69.2"
     "react-native-gradle-plugin" "^0.0.7"