Skip to content

Commit

Permalink
chore: refonte de la bottom nav (#137)
Browse files Browse the repository at this point in the history
Signed-off-by: fc-santos <[email protected]>
  • Loading branch information
fc-santos authored Oct 4, 2024
1 parent a7d370e commit 0798aee
Show file tree
Hide file tree
Showing 15 changed files with 636 additions and 42 deletions.
7 changes: 5 additions & 2 deletions app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
AuthProvider,
toastConfig,
initStoredLanguage,
RootStack,
NetInfo,
NetworkProvider,
ErrorModal,
Expand All @@ -22,6 +21,7 @@ import { useTranslation } from 'react-i18next'
import { StatusBar } from 'react-native'
import { isTablet } from 'react-native-device-info'
import Orientation from 'react-native-orientation-locker'
import { SafeAreaProvider } from 'react-native-safe-area-context'
import SplashScreen from 'react-native-splash-screen'
import Toast from 'react-native-toast-message'
import { container } from 'tsyringe'
Expand All @@ -32,6 +32,7 @@ import { credentialOfferTourSteps } from './src/components/tours/CredentialOffer
import { credentialsTourSteps } from './src/components/tours/CredentialsTourSteps'
import { homeTourSteps } from './src/components/tours/HomeTourSteps'
import { proofRequestTourSteps } from './src/components/tours/ProofRequestTourSteps'
import RootStack from './src/navigators/RootStack'
import { initialState, reducer } from './src/store'

const { theme, localization } = qcwallet
Expand Down Expand Up @@ -82,7 +83,9 @@ const App = () => {
overlayColor={'black'}
overlayOpacity={0.7}
>
<RootStack />
<SafeAreaProvider>
<RootStack />
</SafeAreaProvider>
</TourProvider>
<Toast topOffset={15} config={toastConfig} />
</NetworkProvider>
Expand Down
4 changes: 2 additions & 2 deletions app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ PODS:
- React-jsinspector (0.72.5)
- React-logger (0.72.5):
- glog
- "react-native-attestation (1.0.0-alpha.332+124455bc)":
- "react-native-attestation (1.0.0-alpha.333+6a2348b7)":
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-config (1.5.0):
Expand Down Expand Up @@ -775,7 +775,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a
React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
react-native-attestation: 07a69cc1d5ec930abb9e8adc7d6f7434deaeb722
react-native-attestation: 49a18524e073038a7a52dac03b2288dc74b9f182
react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7
react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
Expand Down
10 changes: 5 additions & 5 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
"@formatjs/intl-relativetimeformat": "9.3.1",
"@hyperledger/anoncreds-react-native": "0.2.3",
"@hyperledger/aries-askar-react-native": "0.2.3",
"@hyperledger/aries-bifold-core": "patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.332#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.332-2a4eb8c79c.patch",
"@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.332",
"@hyperledger/aries-bifold-verifier": "1.0.0-alpha.332",
"@hyperledger/aries-oca": "1.0.0-alpha.332",
"@hyperledger/aries-react-native-attestation": "1.0.0-alpha.332",
"@hyperledger/aries-bifold-core": "patch:@hyperledger/aries-bifold-core@npm%3A1.0.0-alpha.333#~/.yarn/patches/@hyperledger-aries-bifold-core-npm-1.0.0-alpha.333-2a4eb8c79c.patch",
"@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.333",
"@hyperledger/aries-bifold-verifier": "1.0.0-alpha.333",
"@hyperledger/aries-oca": "1.0.0-alpha.333",
"@hyperledger/aries-react-native-attestation": "1.0.0-alpha.333",
"@hyperledger/indy-vdr-react-native": "0.2.2",
"@hyperledger/indy-vdr-shared": "0.2.2",
"@react-native-async-storage/async-storage": "1.15.11",
Expand Down
9 changes: 9 additions & 0 deletions app/src/assets/img/icons/atestation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/src/assets/img/icons/home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/src/assets/img/icons/notification.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions app/src/assets/img/icons/plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion app/src/localization/en/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -686,8 +686,9 @@ const translation = {
},
TabStack: {
Home: 'Home',
Scan: 'Scan',
Activities: 'Activities',
Credentials: 'Credentials',
More: 'More',
},
RootStack: {
Contacts: 'Contacts',
Expand Down
3 changes: 2 additions & 1 deletion app/src/localization/fr/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,9 @@ const translation = {
},
TabStack: {
Home: 'Accueil',
Scan: 'Balayer',
Activities: 'Activités',
Credentials: 'Attestations',
More: 'Plus',
},
RootStack: {
Contacts: 'Contacts',
Expand Down
Loading

0 comments on commit 0798aee

Please sign in to comment.