circle goes in square hole 🗣️ (APPEARANCE SETTINGS 🤯) · jollywhoppers.com/witchsky.app@37e42c5

··· 14 14 type NativeStackScreenProps, 15 15 } from '#/lib/routes/types' 16 16 import {isNative} from '#/platform/detection' 17 + import { 18 + useEnableSquareAvatars, 19 + useSetEnableSquareAvatars, 20 + } from '#/state/preferences/enable-square-avatars' 21 + import { 22 + useEnableSquareButtons, 23 + useSetEnableSquareButtons, 24 + } from '#/state/preferences/enable-square-buttons' 17 25 import {useKawaiiMode, useSetKawaiiMode} from '#/state/preferences/kawaii' 18 26 import {useSetThemePrefs, useThemePrefs} from '#/state/shell' 19 27 import {SettingsListItem as AppIconSettingsListItem} from '#/screens/Settings/AppIconSettings/SettingsListItem' ··· 21 29 import * as SegmentedControl from '#/components/forms/SegmentedControl' 22 30 import {Slider} from '#/components/forms/Slider' 23 31 import * as Toggle from '#/components/forms/Toggle' 32 + import {Circle_And_Square_Stroke1_Corner0_Rounded_Filled as SquareIcon} from '#/components/icons/CircleAndSquare' 24 33 import {type Props as SVGIconProps} from '#/components/icons/common' 25 34 import {Moon_Stroke2_Corner0_Rounded as MoonIcon} from '#/components/icons/Moon' 26 35 import {Phone_Stroke2_Corner0_Rounded as PhoneIcon} from '#/components/icons/Phone' ··· 45 54 46 55 const kawaiiMode = useKawaiiMode() 47 56 const setKawaiiMode = useSetKawaiiMode() 57 + 58 + const enableSquareAvatars = useEnableSquareAvatars() 59 + const setEnableSquareAvatars = useSetEnableSquareAvatars() 60 + 61 + const enableSquareButtons = useEnableSquareButtons() 62 + const setEnableSquareButtons = useSetEnableSquareButtons() 48 63 49 64 const onChangeAppearance = useCallback( 50 65 (value: 'light' | 'system' | 'dark') => { ··· 258 273 style={[a.w_full]}> 259 274 <Toggle.LabelText style={[a.flex_1]}> 260 275 <Trans>Enable kawaii logo</Trans> 276 + </Toggle.LabelText> 277 + <Toggle.Platform /> 278 + </Toggle.Item> 279 + </SettingsList.Group> 280 + 281 + <SettingsList.Divider /> 282 + 283 + <SettingsList.Group contentContainerStyle={[a.gap_sm]}> 284 + <SettingsList.ItemIcon icon={SquareIcon} /> 285 + <SettingsList.ItemText> 286 + <Trans>Shapes</Trans> 287 + </SettingsList.ItemText> 288 + <Toggle.Item 289 + name="enable_square_avatars" 290 + label={_(msg`Enable square avatars`)} 291 + value={enableSquareAvatars} 292 + onChange={value => setEnableSquareAvatars(value)} 293 + style={[a.w_full]}> 294 + <Toggle.LabelText style={[a.flex_1]}> 295 + <Trans>Enable square avatars</Trans> 296 + </Toggle.LabelText> 297 + <Toggle.Platform /> 298 + </Toggle.Item> 299 + 300 + <Toggle.Item 301 + name="enable_square_buttons" 302 + label={_(msg`Enable square buttons`)} 303 + value={enableSquareButtons} 304 + onChange={value => setEnableSquareButtons(value)} 305 + style={[a.w_full]}> 306 + <Toggle.LabelText style={[a.flex_1]}> 307 + <Trans>Enable square buttons</Trans> 261 308 </Toggle.LabelText> 262 309 <Toggle.Platform /> 263 310 </Toggle.Item>

+6 -44

src/screens/Settings/DeerSettings.tsx

··· 31 31 } from '#/state/preferences/direct-fetch-records' 32 32 import { 33 33 useDisableFollowedByMetrics, 34 - useSetDisableFollowedByMetrics 34 + useSetDisableFollowedByMetrics, 35 35 } from '#/state/preferences/disable-followed-by-metrics' 36 36 import { 37 37 useDisableFollowersMetrics, 38 - useSetDisableFollowersMetrics 38 + useSetDisableFollowersMetrics, 39 39 } from '#/state/preferences/disable-followers-metrics' 40 40 import { 41 41 useDisableFollowingMetrics, 42 - useSetDisableFollowingMetrics 42 + useSetDisableFollowingMetrics, 43 43 } from '#/state/preferences/disable-following-metrics' 44 44 import { 45 45 useDisableLikesMetrics, ··· 74 74 useSetDisableViaRepostNotification, 75 75 } from '#/state/preferences/disable-via-repost-notification' 76 76 import { 77 - useEnableSquareAvatars, 78 - useSetEnableSquareAvatars, 79 - } from '#/state/preferences/enable-square-avatars' 80 - import { 81 - useEnableSquareButtons, 82 - useSetEnableSquareButtons, 83 - } from '#/state/preferences/enable-square-buttons' 84 - import { 85 77 useSetShowExternalShareButtons, 86 78 useShowExternalShareButtons, 87 79 } from '#/state/preferences/external-share-buttons' ··· 316 308 317 309 const hideSimilarAccountsRecomm = useHideSimilarAccountsRecomm() 318 310 const setHideSimilarAccountsRecomm = useSetHideSimilarAccountsRecomm() 319 - 320 - const enableSquareAvatars = useEnableSquareAvatars() 321 - const setEnableSquareAvatars = useSetEnableSquareAvatars() 322 - 323 - const enableSquareButtons = useEnableSquareButtons() 324 - const setEnableSquareButtons = useSetEnableSquareButtons() 325 311 326 312 const disableVerifyEmailReminder = useDisableVerifyEmailReminder() 327 313 const setDisableVerifyEmailReminder = useSetDisableVerifyEmailReminder() ··· 602 588 </Toggle.Item> 603 589 604 590 <Toggle.Item 605 - name="enable_square_avatars" 606 - label={_(msg`Enable square avatars`)} 607 - value={enableSquareAvatars} 608 - onChange={value => setEnableSquareAvatars(value)} 609 - style={[a.w_full]}> 610 - <Toggle.LabelText style={[a.flex_1]}> 611 - <Trans>Enable square avatars</Trans> 612 - </Toggle.LabelText> 613 - <Toggle.Platform /> 614 - </Toggle.Item> 615 - 616 - <Toggle.Item 617 - name="enable_square_buttons" 618 - label={_(msg`Enable square buttons`)} 619 - value={enableSquareButtons} 620 - onChange={value => setEnableSquareButtons(value)} 621 - style={[a.w_full]}> 622 - <Toggle.LabelText style={[a.flex_1]}> 623 - <Trans>Enable square buttons</Trans> 624 - </Toggle.LabelText> 625 - <Toggle.Platform /> 626 - </Toggle.Item> 627 - 628 - <Toggle.Item 629 591 name="disable_verify_email_reminder" 630 592 label={_(msg`Disable verify email reminder`)} 631 593 value={disableVerifyEmailReminder} ··· 638 600 </Toggle.Item> 639 601 <Admonition type="warning" style={[a.flex_1]}> 640 602 <Trans> 641 - This only gets rid of the reminder on app launch, 642 - useful if your PDS does not have email verification setup.\nThis 643 - does NOT give access to features locked behind email verification. 603 + This only gets rid of the reminder on app launch, useful if your 604 + PDS does not have email verification setup.\nThis does NOT give 605 + access to features locked behind email verification. 644 606 </Trans> 645 607 </Admonition> 646 608 </SettingsList.Group>