quilling.dev / social-app
An ATproto social media client -- with an independent Appview.
6
fork

Configure Feed

Select the types of activity you want to include in your feed.

fix: deconflict cherry-pick

serenity b25fbacc e01e77c9

+3 -14
+1 -14
src/Navigation.tsx
··· 89 89 import {ProfileFollowersScreen} from '#/screens/Profile/ProfileFollowers' 90 90 import {ProfileFollowsScreen} from '#/screens/Profile/ProfileFollows' 91 91 import {ProfileLabelerLikedByScreen} from '#/screens/Profile/ProfileLabelerLikedBy' 92 - import {ProfileSearchScreen} from '#/screens/Profile/ProfileSearch' 93 92 import {ProfileListScreen} from '#/screens/ProfileList' 94 93 import {SavedFeeds} from '#/screens/SavedFeeds' 95 94 import {SearchScreen} from '#/screens/Search' 96 - import {AboutSettingsScreen} from '#/screens/Settings/AboutSettings' 97 - import {AccessibilitySettingsScreen} from '#/screens/Settings/AccessibilitySettings' 98 - import {AccountSettingsScreen} from '#/screens/Settings/AccountSettings' 99 95 import {ActivityPrivacySettingsScreen} from '#/screens/Settings/ActivityPrivacySettings' 100 96 import {AppearanceSettingsScreen} from '#/screens/Settings/AppearanceSettings' 101 97 import {AppIconSettingsScreen} from '#/screens/Settings/AppIconSettings' 102 - import {AppPasswordsScreen} from '#/screens/Settings/AppPasswords' 103 - import {ContentAndMediaSettingsScreen} from '#/screens/Settings/ContentAndMediaSettings' 104 - import {ExternalMediaPreferencesScreen} from '#/screens/Settings/ExternalMediaPreferences' 105 - import {FollowingFeedPreferencesScreen} from '#/screens/Settings/FollowingFeedPreferences' 106 98 import {InterestsSettingsScreen} from '#/screens/Settings/InterestsSettings' 107 - import {LanguageSettingsScreen} from '#/screens/Settings/LanguageSettings' 108 99 import {LegacyNotificationSettingsScreen} from '#/screens/Settings/LegacyNotificationSettings' 109 100 import {NotificationSettingsScreen} from '#/screens/Settings/NotificationSettings' 110 101 import {ActivityNotificationSettingsScreen} from '#/screens/Settings/NotificationSettings/ActivityNotificationSettings' ··· 117 108 import {ReplyNotificationSettingsScreen} from '#/screens/Settings/NotificationSettings/ReplyNotificationSettings' 118 109 import {RepostNotificationSettingsScreen} from '#/screens/Settings/NotificationSettings/RepostNotificationSettings' 119 110 import {RepostsOnRepostsNotificationSettingsScreen} from '#/screens/Settings/NotificationSettings/RepostsOnRepostsNotificationSettings' 120 - import {PrivacyAndSecuritySettingsScreen} from '#/screens/Settings/PrivacyAndSecuritySettings' 121 - import {SettingsScreen} from '#/screens/Settings/Settings' 122 - import {ThreadPreferencesScreen} from '#/screens/Settings/ThreadPreferences' 123 111 import { 124 112 StarterPackScreen, 125 113 StarterPackScreenShort, 126 114 } from '#/screens/StarterPack/StarterPackScreen' 127 115 import {Wizard} from '#/screens/StarterPack/Wizard' 128 - import TopicScreen from '#/screens/Topic' 129 116 import {VideoFeed} from '#/screens/VideoFeed' 130 117 import {type Theme, useTheme} from '#/alf' 131 118 import { ··· 399 386 }} 400 387 /> 401 388 <Stack.Screen 402 - name="DeerSettings" 389 + name="CatskySettings" 403 390 getComponent={() => DeerSettingsScreen} 404 391 options={{ 405 392 title: title(msg`Deer Settings`),
+1
src/lib/routes/types.ts
··· 123 123 Feeds: undefined 124 124 Notifications: undefined 125 125 Messages: {pushToConversation?: string; animation?: 'push' | 'pop'} 126 + CatskySettings: undefined 126 127 } 127 128 128 129 export type AllNavigatorParams = CommonNavigatorParams & {
+1
src/lib/statsig/statsig.tsx
··· 7 7 import {isWeb} from '#/platform/detection' 8 8 import * as persisted from '#/state/persisted' 9 9 import * as env from '#/env' 10 + import {device} from '#/storage' 10 11 import {timeout} from '../async/timeout' 11 12 import {type Gate} from './gates' 12 13