Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New progress guide - 10 follows #7128

Merged
merged 47 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
aa3924b
new follow-10 progress guide
mozzius Dec 13, 2024
d1cf899
find follows dialog
mozzius Dec 13, 2024
4a63f63
wip tabs
mozzius Dec 16, 2024
d0a0dca
flatlist version with search
mozzius Dec 16, 2024
9e43c3f
hardcode out jake gold
mozzius Dec 16, 2024
fee33d3
lazy load followup suggestions
mozzius Dec 16, 2024
83aa748
Update src/components/ProgressGuide/FollowDialog.tsx
mozzius Dec 16, 2024
146d1e5
comment out replacing, enable paging
mozzius Dec 16, 2024
85d3bfb
rm autofocus
mozzius Dec 16, 2024
ccb9849
find shadow profiles in paginated search
mozzius Dec 16, 2024
ecf7275
clear search when press tabs
mozzius Dec 16, 2024
ec77909
better tab a11y
mozzius Dec 16, 2024
cf3efca
fix label
mozzius Dec 16, 2024
a8accdd
adjust scroll indicator insets
mozzius Dec 16, 2024
d6c62ca
do the same scroll indicator adjustment for searchable people list
mozzius Dec 16, 2024
719e5e3
hardcode jake to just be 'tech'
mozzius Dec 16, 2024
ac89201
Merge branch 'main' into samuel/new-progressguide
gaearon Dec 16, 2024
c27a988
Merge branch 'main' into samuel/new-progressguide
gaearon Dec 17, 2024
69704b1
Retain state on close/reopen
gaearon Dec 17, 2024
aa92244
only change follow btn color when not followed
mozzius Dec 17, 2024
47c6281
add guide to inside dialog
mozzius Dec 17, 2024
98c12ad
fix task alignment
mozzius Dec 17, 2024
64060e8
Enable contextual suggestions
gaearon Dec 17, 2024
cf18a59
Merge branch 'main' into samuel/new-progressguide
gaearon Dec 17, 2024
1c329d6
WIP: show multiple suggestions
gaearon Dec 17, 2024
d4395b2
Rework so it animates well
gaearon Dec 17, 2024
02591f2
Show more items
gaearon Dec 17, 2024
1ede288
remove card style
mozzius Dec 17, 2024
a8ed39c
move tabs to own component
mozzius Dec 17, 2024
4299bbb
split out header top
mozzius Dec 17, 2024
12bcb6a
scroll active tab into view
mozzius Dec 17, 2024
4de570b
rm log
mozzius Dec 17, 2024
d1f5460
Improve perf a bit
gaearon Dec 17, 2024
e3c0b02
boost popular interests over alphabetical ones
mozzius Dec 17, 2024
8b6c609
scroll active tab into view
mozzius Dec 17, 2024
eba2c11
Merge remote-tracking branch 'origin/samuel/new-progressguide' into s…
gaearon Dec 17, 2024
680bec6
Merge commit 'e3c0b02f6ebaa9b817b3ec816eae703548e6815f' into samuel/n…
gaearon Dec 17, 2024
9f29230
revert back to round buttons
mozzius Dec 17, 2024
b279ba9
Fix overrenders of the tab bar items
gaearon Dec 17, 2024
1e88134
Fix unintended animation
gaearon Dec 17, 2024
0aaf39a
Scroll initial into view if needed
gaearon Dec 17, 2024
534433a
Unlift state, the dialog thing breaks lifting
gaearon Dec 17, 2024
bc4a17d
Persist simply
gaearon Dec 17, 2024
3e5628c
Fix empty state
gaearon Dec 17, 2024
c6e974f
Fix incorrect gate exposure
gaearon Dec 17, 2024
0e77c9c
Fix another bad useGate
gaearon Dec 17, 2024
15fe2f5
Nit
gaearon Dec 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/alf/atoms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,18 @@ export const atoms = {
border_0: {
borderWidth: 0,
},
border_t_0: {
borderTopWidth: 0,
},
border_b_0: {
borderBottomWidth: 0,
},
border_l_0: {
borderLeftWidth: 0,
},
border_r_0: {
borderRightWidth: 0,
},
border: {
borderWidth: StyleSheet.hairlineWidth,
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/FeedInterstitials.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ export function ProfileGrid({
profile={profile}
moderationOpts={moderationOpts}
logContext="FeedInterstitial"
color="secondary_inverted"
shape="round"
colorInverted
/>
</ProfileCard.Header>
<ProfileCard.Description profile={profile} numberOfLines={2} />
Expand Down
7 changes: 6 additions & 1 deletion src/components/ProfileCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ export type FollowButtonProps = {
moderationOpts: ModerationOpts
logContext: LogEvents['profile:follow']['logContext'] &
LogEvents['profile:unfollow']['logContext']
colorInverted?: boolean
} & Partial<ButtonProps>

export function FollowButton(props: FollowButtonProps) {
Expand All @@ -297,6 +298,8 @@ export function FollowButtonInner({
profile: profileUnshadowed,
moderationOpts,
logContext,
onPress: onPressProp,
colorInverted,
...rest
}: FollowButtonProps) {
const {_} = useLingui()
Expand All @@ -321,6 +324,7 @@ export function FollowButtonInner({
)}`,
),
)
onPressProp?.(e)
} catch (err: any) {
if (err?.name !== 'AbortError') {
Toast.show(_(msg`An issue occurred, please try again.`), 'xmark')
Expand All @@ -341,6 +345,7 @@ export function FollowButtonInner({
)}`,
),
)
onPressProp?.(e)
} catch (err: any) {
if (err?.name !== 'AbortError') {
Toast.show(_(msg`An issue occurred, please try again.`), 'xmark')
Expand Down Expand Up @@ -387,7 +392,7 @@ export function FollowButtonInner({
label={followLabel}
size="small"
variant="solid"
color="primary"
color={colorInverted ? 'secondary_inverted' : 'primary'}
{...rest}
onPress={onPressFollow}>
<ButtonIcon icon={Plus} position={isRound ? undefined : 'left'} />
Expand Down
Loading
Loading