fix

denniske · Aug 18, 2023 · 649dede · 649dede
1 parent 257adcf
commit 649dede
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 40 deletions.
diff --git a/.yarn/cache/react-native-iphone-x-helper-npm-1.3.1-2902981b52-0243766460.zip b/.yarn/cache/react-native-iphone-x-helper-npm-1.3.1-2902981b52-0243766460.zip
diff --git a/.yarn/cache/react-native-paper-npm-4.12.5-d210d3edfd-016236b716.zip b/.yarn/cache/react-native-paper-npm-4.12.5-d210d3edfd-016236b716.zip
diff --git a/.yarn/cache/react-native-paper-npm-5.10.1-f48fc77bac-fe7e71977e.zip b/.yarn/cache/react-native-paper-npm-5.10.1-f48fc77bac-fe7e71977e.zip
diff --git a/app/App2.tsx b/app/App2.tsx
@@ -26,7 +26,7 @@ import AboutPage from './src/view/about.page';
 import store from './src/redux/store';
 import {Provider as ReduxProvider} from 'react-redux';
 import {
-    DefaultTheme as PaperDefaultTheme, DarkTheme as PaperDarkTheme, Provider as PaperProvider, Portal
+    MD2LightTheme as PaperDefaultTheme, MD2DarkTheme as PaperDarkTheme, Provider as PaperProvider, Portal
 } from 'react-native-paper';
 import {addLoadedLanguage, useMutate, useSelector} from './src/redux/reducer';
 import SearchPage from './src/view/search.page';

diff --git a/app/src/view/components/button-picker.tsx b/app/src/view/components/button-picker.tsx
@@ -17,9 +17,7 @@ export default function ButtonPicker<T>(props: IPickerProps<T>) {
     const paperTheme = usePaperTheme();
     const theme = useAppTheme();
 
-    const { value, values, onSelect, style, disabled, formatter = (x) => x} = props;
-
-    const color = disabled ? paperTheme.colors.disabled : paperTheme.colors.text;
+    const { value, values, onSelect, style, disabled, formatter = (x) => `${x}`} = props;
 
     const renderItem = (v: T, i: number) => {
         let style: ViewStyle = {};
@@ -44,7 +42,7 @@ export default function ButtonPicker<T>(props: IPickerProps<T>) {
                 compact
                 uppercase={false}
                 dark={true}
-                color={selected ? paperTheme.colors.primary : theme.lightBackgroundColor}
+                buttonColor={selected ? paperTheme.colors.primary : theme.lightBackgroundColor}
             >
                 {formatter(v)}
             </Button>

diff --git a/app/src/view/components/footer.tsx b/app/src/view/components/footer.tsx
@@ -249,27 +249,27 @@ export default function Footer() {
                                     <View><Space/></View>
                                 }
                         >
-                            <Menu.Item icon={useIcon('hands-helping')} titleStyle={iconPopupStyle('')} onPress={() => { openLink('https://discord.com/invite/gCunWKx'); setMenu(false); }} title={getTranslation('footer.help')} />
-                            {/*<Menu.Item icon={useIcon('coffee')} titleStyle={iconPopupStyle('')} onPress={() => { nav('Donation'); setMenu(false); }} title={getTranslation('footer.buymeacoffee')} />*/}
+                            <Menu.Item leadingIcon={useIcon('hands-helping')} titleStyle={iconPopupStyle('')} onPress={() => { openLink('https://discord.com/invite/gCunWKx'); setMenu(false); }} title={getTranslation('footer.help')} />
+                            {/*<Menu.Item leadingIcon={useIcon('coffee')} titleStyle={iconPopupStyle('')} onPress={() => { nav('Donation'); setMenu(false); }} title={getTranslation('footer.buymeacoffee')} />*/}
                             {
                                !(Platform.OS === 'ios' && isMajorRelease) &&
-                               <Menu.Item icon={useIcon('coffee')} titleStyle={iconPopupStyle('')} onPress={() => { openLink('https://www.buymeacoffee.com/denniskeil'); setMenu(false); }} title={getTranslation('footer.buymeacoffee')} />
+                               <Menu.Item leadingIcon={useIcon('coffee')} titleStyle={iconPopupStyle('')} onPress={() => { openLink('https://www.buymeacoffee.com/denniskeil'); setMenu(false); }} title={getTranslation('footer.buymeacoffee')} />
                             }
                             <Divider />
-                            <Menu.Item icon={useIcon('question-circle', 'About')} titleStyle={iconPopupStyle('About')} onPress={() => { nav('About'); setMenu(false); }} title={getTranslation('footer.about')} />
-                            <Menu.Item icon={useIcon('exchange-alt', 'Changelog')} titleStyle={iconPopupStyle('Changelog')} onPress={() => { nav('Changelog'); setMenu(false); }} title={getTranslation('footer.changelog')} />
+                            <Menu.Item leadingIcon={useIcon('question-circle', 'About')} titleStyle={iconPopupStyle('About')} onPress={() => { nav('About'); setMenu(false); }} title={getTranslation('footer.about')} />
+                            <Menu.Item leadingIcon={useIcon('exchange-alt', 'Changelog')} titleStyle={iconPopupStyle('Changelog')} onPress={() => { nav('Changelog'); setMenu(false); }} title={getTranslation('footer.changelog')} />
                             <Divider />
-                            <Menu.Item icon={useIcon('cog', 'Settings')} titleStyle={iconPopupStyle('Settings')} onPress={() => { nav('Settings'); setMenu(false); }} title={getTranslation('footer.settings')} />
+                            <Menu.Item leadingIcon={useIcon('cog', 'Settings')} titleStyle={iconPopupStyle('Settings')} onPress={() => { nav('Settings'); setMenu(false); }} title={getTranslation('footer.settings')} />
                             <Divider />
-                            <Menu.Item icon={useIcon('lightbulb', 'Tips')} titleStyle={iconPopupStyle('Tips')} onPress={() => { nav('Tips'); setMenu(false); }} title={getTranslation('footer.tips')} />
+                            <Menu.Item leadingIcon={useIcon('lightbulb', 'Tips')} titleStyle={iconPopupStyle('Tips')} onPress={() => { nav('Tips'); setMenu(false); }} title={getTranslation('footer.tips')} />
                             <Divider />
-                            <Menu.Item icon={useIcon('play', 'Live')} titleStyle={iconPopupStyle('Live')} onPress={() => { nav('Live'); setMenu(false); }} title={getTranslation('footer.lobbies')} />
+                            <Menu.Item leadingIcon={useIcon('play', 'Live')} titleStyle={iconPopupStyle('Live')} onPress={() => { nav('Live'); setMenu(false); }} title={getTranslation('footer.lobbies')} />
                             <Divider />
-                            <Menu.Item icon={useIcon('archway', 'Building')} titleStyle={iconPopupStyle('Building')} onPress={() => { nav('Building'); setMenu(false); }} title={getTranslation('footer.buildings')} />
-                            <Menu.Item icon={useIcon('flask', 'Tech')} titleStyle={iconPopupStyle('Tech')} onPress={() => { nav('Tech'); setMenu(false); }} title={getTranslation('footer.techs')} />
-                            <Menu.Item icon={useIcon('fist-raised', 'Unit')} titleStyle={iconPopupStyle('Unit')} onPress={() => { nav('Unit'); setMenu(false); }} title={getTranslation('footer.units')} />
+                            <Menu.Item leadingIcon={useIcon('archway', 'Building')} titleStyle={iconPopupStyle('Building')} onPress={() => { nav('Building'); setMenu(false); }} title={getTranslation('footer.buildings')} />
+                            <Menu.Item leadingIcon={useIcon('flask', 'Tech')} titleStyle={iconPopupStyle('Tech')} onPress={() => { nav('Tech'); setMenu(false); }} title={getTranslation('footer.techs')} />
+                            <Menu.Item leadingIcon={useIcon('fist-raised', 'Unit')} titleStyle={iconPopupStyle('Unit')} onPress={() => { nav('Unit'); setMenu(false); }} title={getTranslation('footer.units')} />
                             <Divider />
-                            <Menu.Item icon={useIcon('trophy', 'Winrates')} titleStyle={iconPopupStyle('Winrates')} onPress={() => { nav('Winrates'); setMenu(false); }} title={getTranslation('footer.winrates')} />
+                            <Menu.Item leadingIcon={useIcon('trophy', 'Winrates')} titleStyle={iconPopupStyle('Winrates')} onPress={() => { nav('Winrates'); setMenu(false); }} title={getTranslation('footer.winrates')} />
                         </Menu>
                     }
                     {
@@ -283,12 +283,12 @@ export default function Footer() {
                                     <View><Space/></View>
                                 }
                         >
-                            <Menu.Item icon={useIcon('hands-helping')} titleStyle={iconPopupStyle('')} onPress={() => { openLink('https://discord.com/invite/gCunWKx'); setMenu(false); }} title={getTranslation('footer.help')} />
+                            <Menu.Item leadingIcon={useIcon('hands-helping')} titleStyle={iconPopupStyle('')} onPress={() => { openLink('https://discord.com/invite/gCunWKx'); setMenu(false); }} title={getTranslation('footer.help')} />
                             <Divider />
-                            <Menu.Item icon={useIcon('question-circle', 'About')} titleStyle={iconPopupStyle('About')} onPress={() => { nav('About'); setMenu(false); }} title={getTranslation('footer.about')} />
-                            <Menu.Item icon={useIcon('exchange-alt', 'Changelog')} titleStyle={iconPopupStyle('Changelog')} onPress={() => { nav('Changelog'); setMenu(false); }} title={getTranslation('footer.changelog')} />
+                            <Menu.Item leadingIcon={useIcon('question-circle', 'About')} titleStyle={iconPopupStyle('About')} onPress={() => { nav('About'); setMenu(false); }} title={getTranslation('footer.about')} />
+                            <Menu.Item leadingIcon={useIcon('exchange-alt', 'Changelog')} titleStyle={iconPopupStyle('Changelog')} onPress={() => { nav('Changelog'); setMenu(false); }} title={getTranslation('footer.changelog')} />
                             <Divider />
-                            <Menu.Item icon={useIcon('cog', 'Settings')} titleStyle={iconPopupStyle('Settings')} onPress={() => { nav('Settings'); setMenu(false); }} title={getTranslation('footer.settings')} />
+                            <Menu.Item leadingIcon={useIcon('cog', 'Settings')} titleStyle={iconPopupStyle('Settings')} onPress={() => { nav('Settings'); setMenu(false); }} title={getTranslation('footer.settings')} />
                         </Menu>
                     }
 

diff --git a/app/src/view/components/player.tsx b/app/src/view/components/player.tsx
@@ -101,7 +101,7 @@ export function Player({match, player, highlight, freeForALl, canDownloadRec}: I
                 }
                 <MyText style={styles.playerNameCol} numberOfLines={1}>
                     <MyText style={playerNameStyle}>
-                        {player.status != 0 ? getSlotTypeName(player.status) : player.name}
+                        {player.name}
                     </MyText>
                     {
                         player.status === 0 && isVerifiedPlayer(player.profileId) &&

diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "react-native": "0.72.3",
     "react-native-gesture-handler": "~2.12.0",
     "react-native-pager-view": "6.2.0",
-    "react-native-paper": "^4.12.4",
+    "react-native-paper": "^5.10.1",
     "react-native-reanimated": "~3.3.0",
     "react-native-safe-area-context": "4.6.3",
     "react-native-screens": "~3.22.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1779,7 +1779,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@callstack/react-theme-provider@npm:^3.0.7":
+"@callstack/react-theme-provider@npm:^3.0.9":
   version: 3.0.9
   resolution: "@callstack/react-theme-provider@npm:3.0.9"
   dependencies:
@@ -5803,7 +5803,7 @@ __metadata:
     react-native-debugger-open: ^0.3.24
     react-native-gesture-handler: ~2.12.0
     react-native-pager-view: 6.2.0
-    react-native-paper: ^4.12.4
+    react-native-paper: ^5.10.1
     react-native-reanimated: ~3.3.0
     react-native-safe-area-context: 4.6.3
     react-native-screens: ~3.22.0
@@ -18242,15 +18242,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-iphone-x-helper@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "react-native-iphone-x-helper@npm:1.3.1"
-  peerDependencies:
-    react-native: ">=0.42.0"
-  checksum: 024376646009a966e33e12fc2358751830818b0fb73b1c601a64eb5e490d2dc43eec23668991b985a8c412a84d087f20eb45bb9b593567c08b66e741b7bddda5
-  languageName: node
-  linkType: hard
-
 "react-native-pager-view@npm:6.2.0":
   version: 6.2.0
   resolution: "react-native-pager-view@npm:6.2.0"
@@ -18261,18 +18252,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-paper@npm:^4.12.4":
-  version: 4.12.5
-  resolution: "react-native-paper@npm:4.12.5"
+"react-native-paper@npm:^5.10.1":
+  version: 5.10.1
+  resolution: "react-native-paper@npm:5.10.1"
   dependencies:
-    "@callstack/react-theme-provider": ^3.0.7
+    "@callstack/react-theme-provider": ^3.0.9
     color: ^3.1.2
-    react-native-iphone-x-helper: ^1.3.1
+    use-latest-callback: ^0.1.5
   peerDependencies:
     react: "*"
     react-native: "*"
+    react-native-safe-area-context: "*"
     react-native-vector-icons: "*"
-  checksum: 016236b716180025f56642185b53fcf39f795f3da4db8690d34027054ca80e20820423abd77ad4cf386fd759541dfe36a0207e48e62a46e4eb170f55556ab327
+  checksum: fe7e71977e8568963f43dbd0d33c0cd27295f59d67f6e0482a89448844c865552d4fc75c371bba977817d593a458c47303828d5624c632786a6b141d8efae1a4
   languageName: node
   linkType: hard