feat(148): alineacion del loading de llamatracker

benvalencia · Nov 26, 2024 · 8a901b3 · 8a901b3
1 parent 76e3b02
commit 8a901b3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/app/screens/home/home.tsx b/app/screens/home/home.tsx
@@ -55,6 +55,7 @@ export default function HomeScreen() {
       (res: IUserProfileBase) => {
         setIsLoadingSearch(!isLoadingSearch)
         storeRecentSearch(fortniteUsername, res.account.id).then()
+
         // GO TO STATS VIEW
         navigation.dispatch(
           CommonActions.navigate({

diff --git a/app/screens/news/news.tsx b/app/screens/news/news.tsx
@@ -58,7 +58,7 @@ export default function NewsScreen() {
     }}>
 
       {newsList[0] === undefined ?
-        <View style={{position: 'absolute', top: '40%', width: '100%'}}>
+        <View style={{position: 'absolute', top: '45%', width: '100%'}}>
           <Loader></Loader>
         </View>
         : null}

diff --git a/app/screens/profile/stats.tsx b/app/screens/profile/stats.tsx
@@ -55,7 +55,9 @@ export default function StatsScreen({route}: any) {
 
     }
 
+    console.log(userId)
     await fortniteService.getGlobalPlayerStats(userId).then((res: any) => {
+      console.log(res)
       profile.user.name = res.name;
       profile.account = res.account;
       profile.accountHistory = res.accountLevelHistory;
@@ -123,15 +125,29 @@ export default function StatsScreen({route}: any) {
     <ScrollView
       refreshControl={
         <RefreshControl refreshing={refreshing} onRefresh={onRefresh}/>}>
-      <View style={{minHeight: '100%', paddingBottom: bottom}}>
+      <View style={{
+        paddingBottom: bottom,
+        minHeight: '100%',
+      }}>
 
         {profileInfo === null ?
-          <View style={{position: 'absolute', top: '40%', width: '100%'}}>
-            <Loader></Loader>
+          <View style={{
+            paddingTop: top,
+            paddingBottom: bottom + 13,
+            marginBottom: bottom + 50,
+            height: '100%'
+          }}>
+            <View style={{
+              position: 'absolute',
+              top: '45%',
+              width: '100%',
+            }}>
+              <Loader></Loader>
+            </View>
           </View>
           : null}
 
-        {profileInfo ?
+        {profileInfo !== null ?
           <View style={{gap: 5}}>
             {/*HEADER*/}
             <View>
@@ -186,7 +202,6 @@ export default function StatsScreen({route}: any) {
                 {/*  </View>*/}
                 {/*</Pressable>*/}
               </View>
-
               <View style={{
                 position: 'absolute',
                 bottom: 0,
@@ -231,7 +246,6 @@ export default function StatsScreen({route}: any) {
                          style={{width: 70, height: 70}}></Img>
                   </View>
                 </View>
-
                 {/*PROFILE INFO*/}
                 <View style={{alignSelf: 'center', flex: 1, zIndex: 1}}>
                   <Text style={{
@@ -241,7 +255,6 @@ export default function StatsScreen({route}: any) {
                   }}>{profileInfo?.user?.name}</Text>
                   <Text style={{color: colors.text}}>{getSeason(profileInfo?.account?.season)}</Text>
                 </View>
-
                 <View style={{
                   alignSelf: 'center',
                   borderRadius: 25,
@@ -428,7 +441,6 @@ export default function StatsScreen({route}: any) {
                   {/*  </Pressable>*/}
                   {/*</View>*/}
                 </View>
-
                 <View style={{
                   flexDirection: 'row',
                   backgroundColor: 'rgba(255,255,255,0.15)',

diff --git a/app/screens/shop/shop.tsx b/app/screens/shop/shop.tsx
@@ -155,10 +155,14 @@ export default function ShopScreen() {
   }, [shopCache]);
 
   return (
-    <View style={{paddingTop: top, marginBottom: bottom + 40}}>
+    <View style={{
+      paddingTop: top,
+      marginBottom: bottom,
+      height: '100%',
+    }}>
 
       {shopList[0] === undefined ?
-        <View style={{position: 'absolute', top: '50%', width: '100%'}}>
+        <View style={{position: 'absolute', top: '45%', width: '100%'}}>
           <Loader></Loader>
         </View>
         : null}