zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge pull request #1788 from bluesky-social/eric/app-899-remove-icons-from-startup-code 

Revise icons startup code
zio/stable
Eric Bailey 2023-11-01 10:38:37 -05:00 committed by GitHub
parent 85c26fb5a8 b42806a6e0
commit 4bf1719092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 121 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/App.native.tsx
View File

@ -1,20 +1,23 @@
import 'react-native-url-polyfill/auto' import 'react-native-url-polyfill/auto'
import 'lib/sentry' // must be near top
import React, {useState, useEffect} from 'react' import React, {useState, useEffect} from 'react'
import 'lib/sentry' // must be relatively on top
import {withSentry} from 'lib/sentry'
import {RootSiblingParent} from 'react-native-root-siblings' import {RootSiblingParent} from 'react-native-root-siblings'
import * as SplashScreen from 'expo-splash-screen' import * as SplashScreen from 'expo-splash-screen'
import {GestureHandlerRootView} from 'react-native-gesture-handler' import {GestureHandlerRootView} from 'react-native-gesture-handler'
import {observer} from 'mobx-react-lite' import {observer} from 'mobx-react-lite'
import {QueryClientProvider} from '@tanstack/react-query'
import 'view/icons'
import {withSentry} from 'lib/sentry'
import {ThemeProvider} from 'lib/ThemeContext' import {ThemeProvider} from 'lib/ThemeContext'
import {s} from 'lib/styles' import {s} from 'lib/styles'
import * as view from './view/index'
import {RootStoreModel, setupState, RootStoreProvider} from './state' import {RootStoreModel, setupState, RootStoreProvider} from './state'
import {Shell} from './view/shell' import {Shell} from 'view/shell'
import * as notifications from 'lib/notifications/notifications' import * as notifications from 'lib/notifications/notifications'
import * as analytics from 'lib/analytics/analytics' import * as analytics from 'lib/analytics/analytics'
import * as Toast from './view/com/util/Toast' import * as Toast from 'view/com/util/Toast'
import {QueryClientProvider} from '@tanstack/react-query'
import {queryClient} from 'lib/react-query' import {queryClient} from 'lib/react-query'
import {TestCtrls} from 'view/com/testing/TestCtrls' import {TestCtrls} from 'view/com/testing/TestCtrls'
@ -27,7 +30,6 @@ const App = observer(function AppImpl() {
// init // init
useEffect(() => { useEffect(() => {
view.setup()
setupState().then(store => { setupState().then(store => {
setRootStore(store) setRootStore(store)
analytics.init(store) analytics.init(store)

22
src/App.web.tsx
View File

@ -1,15 +1,18 @@
import 'lib/sentry' // must be near top
import React, {useState, useEffect} from 'react' import React, {useState, useEffect} from 'react'
import 'lib/sentry' // must be relatively on top
import {SafeAreaProvider} from 'react-native-safe-area-context'
import {RootSiblingParent} from 'react-native-root-siblings'
import * as view from './view/index'
import * as analytics from 'lib/analytics/analytics'
import {RootStoreModel, setupState, RootStoreProvider} from './state'
import {Shell} from './view/shell/index'
import {ToastContainer} from './view/com/util/Toast.web'
import {ThemeProvider} from 'lib/ThemeContext'
import {observer} from 'mobx-react-lite' import {observer} from 'mobx-react-lite'
import {QueryClientProvider} from '@tanstack/react-query' import {QueryClientProvider} from '@tanstack/react-query'
import {SafeAreaProvider} from 'react-native-safe-area-context'
import {RootSiblingParent} from 'react-native-root-siblings'
import 'view/icons'
import * as analytics from 'lib/analytics/analytics'
import {RootStoreModel, setupState, RootStoreProvider} from './state'
import {Shell} from 'view/shell/index'
import {ToastContainer} from 'view/com/util/Toast.web'
import {ThemeProvider} from 'lib/ThemeContext'
import {queryClient} from 'lib/react-query' import {queryClient} from 'lib/react-query'
const App = observer(function AppImpl() { const App = observer(function AppImpl() {
@ -19,7 +22,6 @@ const App = observer(function AppImpl() {
// init // init
useEffect(() => { useEffect(() => {
view.setup()
setupState().then(store => { setupState().then(store => {
setRootStore(store) setRootStore(store)
analytics.init(store) analytics.init(store)

202
src/view/index.ts → src/view/icons.ts
View File

@ -99,105 +99,103 @@ import {faX} from '@fortawesome/free-solid-svg-icons/faX'
import {faXmark} from '@fortawesome/free-solid-svg-icons/faXmark' import {faXmark} from '@fortawesome/free-solid-svg-icons/faXmark'
import {faChevronDown} from '@fortawesome/free-solid-svg-icons/faChevronDown' import {faChevronDown} from '@fortawesome/free-solid-svg-icons/faChevronDown'
export function setup() { library.add(
library.add( faAddressCard,
faAddressCard, faAngleDown,
faAngleDown, faAngleLeft,
faAngleLeft, faAngleRight,
faAngleRight, faAngleUp,
faAngleUp, faArrowLeft,
faArrowLeft, faArrowRight,
faArrowRight, faArrowUp,
faArrowUp, faArrowDown,
faArrowDown, faArrowRightFromBracket,
faArrowRightFromBracket, faArrowUpFromBracket,
faArrowUpFromBracket, faArrowUpRightFromSquare,
faArrowUpRightFromSquare, faArrowRotateLeft,
faArrowRotateLeft, faArrowTrendUp,
faArrowTrendUp, faArrowsRotate,
faArrowsRotate, faAt,
faAt, faBan,
faBan, faBars,
faBars, faBell,
faBell, farBell,
farBell, faBookmark,
faBookmark, farBookmark,
farBookmark, farCalendar,
farCalendar, faCamera,
faCamera, faCheck,
faCheck, faChevronRight,
faChevronRight, faCircle,
faCircle, faCircleCheck,
faCircleCheck, farCircleCheck,
farCircleCheck, faCircleExclamation,
faCircleExclamation, faCircleUser,
faCircleUser, faCircleDot,
faCircleDot, faClone,
faClone, farClone,
farClone, faComment,
faComment, faCommentSlash,
faCommentSlash, faComments,
faComments, faCompass,
faCompass, faEllipsis,
faEllipsis, faEnvelope,
faEnvelope, faEye,
faEye, faExclamation,
faExclamation, farEyeSlash,
farEyeSlash, faFaceSmile,
faFaceSmile, faFire,
faFire, faFlask,
faFlask, faFloppyDisk,
faFloppyDisk, faGear,
faGear, faGlobe,
faGlobe, faHand,
faHand, farHand,
farHand, faHeart,
faHeart, fasHeart,
fasHeart, faHouse,
faHouse, faImage,
faImage, farImage,
farImage, faInfo,
faInfo, faLanguage,
faLanguage, faLink,
faLink, faList,
faList, faListUl,
faListUl, faLock,
faLock, faMagnifyingGlass,
faMagnifyingGlass, faMessage,
faMessage, faNoteSticky,
faNoteSticky, faPaste,
faPaste, faPause,
faPause, faPen,
faPen, faPenNib,
faPenNib, faPenToSquare,
faPenToSquare, faPlay,
faPlay, faPlus,
faPlus, faQuoteLeft,
faQuoteLeft, faReply,
faReply, faRetweet,
faRetweet, faRss,
faRss, faSatelliteDish,
faSatelliteDish, faShare,
faShare, faShareFromSquare,
faShareFromSquare, faShield,
faShield, faSignal,
faSignal, faSliders,
faSliders, faSquare,
faSquare, faSquareCheck,
faSquareCheck, faSquarePlus,
faSquarePlus, faUser,
faUser, faUsers,
faUsers, faUserCheck,
faUserCheck, faUserSlash,
faUserSlash, faUserPlus,
faUserPlus, faUserXmark,
faUserXmark, faUsersSlash,
faUsersSlash, faThumbtack,
faThumbtack, faTicket,
faTicket, faTrashCan,
faTrashCan, faX,
faX, faXmark,
faXmark, faChevronDown,
faChevronDown, )
)
}