Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
beasy-mobile
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
G
beasy-mobile
Commits
45193e6d
Commit
45193e6d
authored
May 23, 2024
by
G
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renaming, refactoring a good bit the navigation system
parent
9d4c6ff4
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
30 deletions
+26
-30
AppBottomTabsNavigator.tsx
src/navigations/AppBottomTabsNavigator.tsx
+2
-4
AppMainStackNavigator.tsx
src/navigations/AppMainStackNavigator.tsx
+6
-6
InitialNavigationHandler.tsx
src/navigations/InitialNavigationHandler.tsx
+2
-2
PaymentStackNavigation.tsx
src/navigations/PaymentStackNavigation.tsx
+2
-2
Types.ts
src/navigations/Types.ts
+13
-15
HomeUserNotLoggedIn.tsx
src/screens/HomeUserNotLoggedIn.tsx
+1
-1
No files found.
src/navigations/
BottomTabs
.tsx
→
src/navigations/
AppBottomTabsNavigator
.tsx
View file @
45193e6d
import
{
Entypo
}
from
"@expo/vector-icons"
;
import
{
FontAwesome
}
from
"@expo/vector-icons"
;
import
{
Ionicons
}
from
"@expo/vector-icons"
;
import
{
Entypo
,
FontAwesome
,
Ionicons
}
from
"@expo/vector-icons"
;
import
{
createBottomTabNavigator
}
from
"@react-navigation/bottom-tabs"
;
import
{
useTheme
}
from
"@shopify/restyle"
;
// import palette
...
...
@@ -10,7 +8,7 @@ import Text from "../components/bases/Text";
import
PaymentStackNavigator
from
"./PaymentStackNavigation"
;
const
Tab
=
createBottomTabNavigator
();
export
const
BottomTabs
=
()
=>
{
export
const
AppBottomTabsNavigator
=
()
=>
{
const
theme
=
useTheme
<
Theme
>
();
return
(
...
...
src/navigations/
UnloggedUserStackNavigation
.tsx
→
src/navigations/
AppMainStackNavigator
.tsx
View file @
45193e6d
import
{
createNativeStackNavigator
}
from
"@react-navigation/native-stack"
;
import
HomeUserNotLoggedIn
from
"@screens/HomeUserNotLoggedIn"
;
import
UserLoginScreen
from
"@screens/UserLoginScreen"
;
import
{
BottomTabs
}
from
"./BottomTabs
"
;
import
type
{
UnloggedUserStackParamList
}
from
"./Types"
;
import
{
AppBottomTabsNavigator
}
from
"./AppBottomTabsNavigator
"
;
import
type
{
ImainStackNavigator
}
from
"./Types"
;
const
Stack
=
createNativeStackNavigator
<
UnloggedUserStackParamList
>
();
const
Stack
=
createNativeStackNavigator
<
ImainStackNavigator
>
();
const
UnloggedUserStackNavigation
=
()
=>
{
const
AppMainStackNavigator
=
()
=>
{
return
(
<
Stack
.
Navigator
initialRouteName=
"homeUserNotLoggedIn"
...
...
@@ -14,9 +14,9 @@ const UnloggedUserStackNavigation = () => {
>
<
Stack
.
Screen
name=
"homeUserNotLoggedIn"
component=
{
HomeUserNotLoggedIn
}
/>
<
Stack
.
Screen
name=
"userLoginScreen"
component=
{
UserLoginScreen
}
/>
<
Stack
.
Screen
name=
"
bottomTabs"
component=
{
BottomTabs
}
/>
<
Stack
.
Screen
name=
"
appBottomTabsNavigator"
component=
{
AppBottomTabsNavigator
}
/>
</
Stack
.
Navigator
>
);
};
export
default
UnloggedUserStackNavigation
;
export
default
AppMainStackNavigator
;
src/navigations/InitialNavigationHandler.tsx
View file @
45193e6d
import
{
useUserAuthenticationContext
}
from
"@/contexts/UserAuthenticationContext"
;
import
UnloggedUserStackNavigation
from
"./UnloggedUserStackNavigation
"
;
import
AppMainStackNavigator
from
"./AppMainStackNavigator
"
;
const
InitialNavigationHandler
=
()
=>
{
const
{
isAuthenticated
}
=
useUserAuthenticationContext
();
console
.
log
(
"isAuthenticated"
,
isAuthenticated
);
return
<
UnloggedUserStackNavigation
/>;
return
<
AppMainStackNavigator
/>;
};
export
default
InitialNavigationHandler
;
src/navigations/PaymentStackNavigation.tsx
View file @
45193e6d
...
...
@@ -3,9 +3,9 @@ import HomePageWithPaymentOptions from "@screens/HomePageWithPaymentOptions";
import
NumberAndOtpForPaymentScreen
from
"@screens/NumberAndOtpForPaymentScreen"
;
import
PaymentAmountInputScreen
from
"@screens/PaymentAmountInputScreen"
;
import
PaymentResultScreen
from
"@screens/PaymentResultScreen"
;
import
type
{
PaymentStackParamList
}
from
"./Types"
;
import
type
{
IpaymentStackNavigator
}
from
"./Types"
;
const
Stack
=
createNativeStackNavigator
<
PaymentStackParamList
>
();
const
Stack
=
createNativeStackNavigator
<
IpaymentStackNavigator
>
();
const
PaymentStackNavigator
=
()
=>
{
return
(
...
...
src/navigations/Types.ts
View file @
45193e6d
import
type
{
PaymentCode
}
from
"@/utils/requests/Types"
;
import
type
{
NativeStackScreenProps
}
from
"@react-navigation/native-stack"
;
export
type
PaymentStackParamList
=
{
export
type
IpaymentStackNavigator
=
{
homePageWithPaymentOptions
:
undefined
;
numberAndOtpForPaymentScreen
:
undefined
;
paymentAmountInputScreen
:
{
paymentType
:
PaymentCode
;
};
homeUserNotLoggedIn
:
undefined
;
userLoginScreen
:
undefined
;
//
homeUserNotLoggedIn: undefined;
//
userLoginScreen: undefined;
paymentResultScreen
:
undefined
;
};
export
type
PaymentStackScreenProps
<
T
extends
keyof
PaymentStackParamList
>
=
NativeStackScreenProps
<
PaymentStackParamList
,
T
,
"PaymentStackParamList"
>
;
export
type
PaymentStackScreenProps
<
T
extends
keyof
IpaymentStackNavigator
>
=
NativeStackScreenProps
<
IpaymentStackNavigator
,
T
,
"IpaymentStackNavigator"
>
;
export
type
PaymentStackScreenComponentProps
<
T
extends
keyof
PaymentStackParamList
>
=
React
.
FC
<
export
type
PaymentStackScreenComponentProps
<
T
extends
keyof
IpaymentStackNavigator
>
=
React
.
FC
<
PaymentStackScreenProps
<
T
>
>
;
export
type
UnloggedUserStackParamList
=
{
export
type
ImainStackNavigator
=
{
homeUserNotLoggedIn
:
undefined
;
userLoginScreen
:
undefined
;
bottomTabs
:
undefined
;
appBottomTabsNavigator
:
undefined
;
};
export
type
UnloggedUserStackScreenProps
<
T
extends
keyof
UnloggedUserStackParamList
>
=
NativeStackScreenProps
<
UnloggedUserStackParamList
,
T
,
"UnloggedUserStackParamList
"
>
;
export
type
UnloggedUserStackScreenProps
<
T
extends
keyof
ImainStackNavigator
>
=
NativeStackScreenProps
<
ImainStackNavigator
,
T
,
"ImainStackNavigator
"
>
;
export
type
UnloggedUserStackScreenComponentProps
<
T
extends
keyof
UnloggedUserStackParamList
>
=
React
.
FC
<
UnloggedUserStackScreenProps
<
T
>>
;
export
type
UnloggedUserStackScreenComponentProps
<
T
extends
keyof
ImainStackNavigator
>
=
React
.
FC
<
UnloggedUserStackScreenProps
<
T
>
>
;
src/screens/HomeUserNotLoggedIn.tsx
View file @
45193e6d
...
...
@@ -10,7 +10,7 @@ const HomeUserNotLoggedIn: UnloggedUserStackScreenComponentProps<"homeUserNotLog
const
{
isAuthenticated
}
=
useUserAuthenticationContext
();
if
(
isAuthenticated
)
{
navigation
.
replace
(
"
bottomTabs
"
);
navigation
.
replace
(
"
appBottomTabsNavigator
"
);
}
return
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment