robinwobin.dev / witchsky.app
forked from jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
fork atom

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

Revise icons startup code

authored by

Eric Bailey and committed by
GitHub 4bf17190 85c26fb5

+118 -116
+9 -7
src/App.native.tsx
··· 1 1 import 'react-native-url-polyfill/auto' 2 + import 'lib/sentry' // must be near top 3 + 2 4 import React, {useState, useEffect} from 'react' 3 - import 'lib/sentry' // must be relatively on top 4 - import {withSentry} from 'lib/sentry' 5 5 import {RootSiblingParent} from 'react-native-root-siblings' 6 6 import * as SplashScreen from 'expo-splash-screen' 7 7 import {GestureHandlerRootView} from 'react-native-gesture-handler' 8 8 import {observer} from 'mobx-react-lite' 9 + import {QueryClientProvider} from '@tanstack/react-query' 10 + 11 + import 'view/icons' 12 + 13 + import {withSentry} from 'lib/sentry' 9 14 import {ThemeProvider} from 'lib/ThemeContext' 10 15 import {s} from 'lib/styles' 11 - import * as view from './view/index' 12 16 import {RootStoreModel, setupState, RootStoreProvider} from './state' 13 - import {Shell} from './view/shell' 17 + import {Shell} from 'view/shell' 14 18 import * as notifications from 'lib/notifications/notifications' 15 19 import * as analytics from 'lib/analytics/analytics' 16 - import * as Toast from './view/com/util/Toast' 17 - import {QueryClientProvider} from '@tanstack/react-query' 20 + import * as Toast from 'view/com/util/Toast' 18 21 import {queryClient} from 'lib/react-query' 19 22 import {TestCtrls} from 'view/com/testing/TestCtrls' 20 23 ··· 27 30 28 31 // init 29 32 useEffect(() => { 30 - view.setup() 31 33 setupState().then(store => { 32 34 setRootStore(store) 33 35 analytics.init(store)
+9 -7
src/App.web.tsx
··· 1 + import 'lib/sentry' // must be near top 2 + 1 3 import React, {useState, useEffect} from 'react' 2 - import 'lib/sentry' // must be relatively on top 4 + import {observer} from 'mobx-react-lite' 5 + import {QueryClientProvider} from '@tanstack/react-query' 3 6 import {SafeAreaProvider} from 'react-native-safe-area-context' 4 7 import {RootSiblingParent} from 'react-native-root-siblings' 5 - import * as view from './view/index' 8 + 9 + import 'view/icons' 10 + 6 11 import * as analytics from 'lib/analytics/analytics' 7 12 import {RootStoreModel, setupState, RootStoreProvider} from './state' 8 - import {Shell} from './view/shell/index' 9 - import {ToastContainer} from './view/com/util/Toast.web' 13 + import {Shell} from 'view/shell/index' 14 + import {ToastContainer} from 'view/com/util/Toast.web' 10 15 import {ThemeProvider} from 'lib/ThemeContext' 11 - import {observer} from 'mobx-react-lite' 12 - import {QueryClientProvider} from '@tanstack/react-query' 13 16 import {queryClient} from 'lib/react-query' 14 17 15 18 const App = observer(function AppImpl() { ··· 19 22 20 23 // init 21 24 useEffect(() => { 22 - view.setup() 23 25 setupState().then(store => { 24 26 setRootStore(store) 25 27 analytics.init(store)
+100 -102
src/view/index.ts src/view/icons.ts
··· 99 99 import {faXmark} from '@fortawesome/free-solid-svg-icons/faXmark' 100 100 import {faChevronDown} from '@fortawesome/free-solid-svg-icons/faChevronDown' 101 101 102 - export function setup() { 103 - library.add( 104 - faAddressCard, 105 - faAngleDown, 106 - faAngleLeft, 107 - faAngleRight, 108 - faAngleUp, 109 - faArrowLeft, 110 - faArrowRight, 111 - faArrowUp, 112 - faArrowDown, 113 - faArrowRightFromBracket, 114 - faArrowUpFromBracket, 115 - faArrowUpRightFromSquare, 116 - faArrowRotateLeft, 117 - faArrowTrendUp, 118 - faArrowsRotate, 119 - faAt, 120 - faBan, 121 - faBars, 122 - faBell, 123 - farBell, 124 - faBookmark, 125 - farBookmark, 126 - farCalendar, 127 - faCamera, 128 - faCheck, 129 - faChevronRight, 130 - faCircle, 131 - faCircleCheck, 132 - farCircleCheck, 133 - faCircleExclamation, 134 - faCircleUser, 135 - faCircleDot, 136 - faClone, 137 - farClone, 138 - faComment, 139 - faCommentSlash, 140 - faComments, 141 - faCompass, 142 - faEllipsis, 143 - faEnvelope, 144 - faEye, 145 - faExclamation, 146 - farEyeSlash, 147 - faFaceSmile, 148 - faFire, 149 - faFlask, 150 - faFloppyDisk, 151 - faGear, 152 - faGlobe, 153 - faHand, 154 - farHand, 155 - faHeart, 156 - fasHeart, 157 - faHouse, 158 - faImage, 159 - farImage, 160 - faInfo, 161 - faLanguage, 162 - faLink, 163 - faList, 164 - faListUl, 165 - faLock, 166 - faMagnifyingGlass, 167 - faMessage, 168 - faNoteSticky, 169 - faPaste, 170 - faPause, 171 - faPen, 172 - faPenNib, 173 - faPenToSquare, 174 - faPlay, 175 - faPlus, 176 - faQuoteLeft, 177 - faReply, 178 - faRetweet, 179 - faRss, 180 - faSatelliteDish, 181 - faShare, 182 - faShareFromSquare, 183 - faShield, 184 - faSignal, 185 - faSliders, 186 - faSquare, 187 - faSquareCheck, 188 - faSquarePlus, 189 - faUser, 190 - faUsers, 191 - faUserCheck, 192 - faUserSlash, 193 - faUserPlus, 194 - faUserXmark, 195 - faUsersSlash, 196 - faThumbtack, 197 - faTicket, 198 - faTrashCan, 199 - faX, 200 - faXmark, 201 - faChevronDown, 202 - ) 203 - } 102 + library.add( 103 + faAddressCard, 104 + faAngleDown, 105 + faAngleLeft, 106 + faAngleRight, 107 + faAngleUp, 108 + faArrowLeft, 109 + faArrowRight, 110 + faArrowUp, 111 + faArrowDown, 112 + faArrowRightFromBracket, 113 + faArrowUpFromBracket, 114 + faArrowUpRightFromSquare, 115 + faArrowRotateLeft, 116 + faArrowTrendUp, 117 + faArrowsRotate, 118 + faAt, 119 + faBan, 120 + faBars, 121 + faBell, 122 + farBell, 123 + faBookmark, 124 + farBookmark, 125 + farCalendar, 126 + faCamera, 127 + faCheck, 128 + faChevronRight, 129 + faCircle, 130 + faCircleCheck, 131 + farCircleCheck, 132 + faCircleExclamation, 133 + faCircleUser, 134 + faCircleDot, 135 + faClone, 136 + farClone, 137 + faComment, 138 + faCommentSlash, 139 + faComments, 140 + faCompass, 141 + faEllipsis, 142 + faEnvelope, 143 + faEye, 144 + faExclamation, 145 + farEyeSlash, 146 + faFaceSmile, 147 + faFire, 148 + faFlask, 149 + faFloppyDisk, 150 + faGear, 151 + faGlobe, 152 + faHand, 153 + farHand, 154 + faHeart, 155 + fasHeart, 156 + faHouse, 157 + faImage, 158 + farImage, 159 + faInfo, 160 + faLanguage, 161 + faLink, 162 + faList, 163 + faListUl, 164 + faLock, 165 + faMagnifyingGlass, 166 + faMessage, 167 + faNoteSticky, 168 + faPaste, 169 + faPause, 170 + faPen, 171 + faPenNib, 172 + faPenToSquare, 173 + faPlay, 174 + faPlus, 175 + faQuoteLeft, 176 + faReply, 177 + faRetweet, 178 + faRss, 179 + faSatelliteDish, 180 + faShare, 181 + faShareFromSquare, 182 + faShield, 183 + faSignal, 184 + faSliders, 185 + faSquare, 186 + faSquareCheck, 187 + faSquarePlus, 188 + faUser, 189 + faUsers, 190 + faUserCheck, 191 + faUserSlash, 192 + faUserPlus, 193 + faUserXmark, 194 + faUsersSlash, 195 + faThumbtack, 196 + faTicket, 197 + faTrashCan, 198 + faX, 199 + faXmark, 200 + faChevronDown, 201 + )