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.

Sign up for GitHub

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

Jump to bottom

UI/UX improvements in Edit profile screen #1767

Merged
merged 3 commits into from
Oct 31, 2023
Merged

UI/UX improvements in Edit profile screen #1767

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e761fe
Remove cropped area in Edit profile screen iOS
tarikfp Oct 28, 2023
23f0d44
Hide cancel button when saving changes in EditProfile
tarikfp Oct 28, 2023
1fb774b
Disable fadeOut animation cancel button for web in EditProfile screen
tarikfp Oct 28, 2023
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
34 changes: 21 additions & 13 deletions src/view/com/modals/EditProfile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ import {usePalette} from 'lib/hooks/usePalette'
import {useTheme} from 'lib/ThemeContext'
import {useAnalytics} from 'lib/analytics/analytics'
import {cleanError, isNetworkError} from 'lib/strings/errors'
import Animated, {FadeOut} from 'react-native-reanimated'
import {isWeb} from 'platform/detection'

const AnimatedTouchableOpacity =
Animated.createAnimatedComponent(TouchableOpacity)

export const snapPoints = ['fullscreen']

Expand Down Expand Up @@ -144,7 +149,7 @@ export function Component({
])

return (
<KeyboardAvoidingView behavior="height">
<KeyboardAvoidingView style={s.flex1} behavior="height">
<ScrollView style={[pal.view]} testID="editProfileModal">
<Text style={[styles.title, pal.text]}>Edit my profile</Text>
<View style={styles.photos}>
Expand Down Expand Up @@ -219,18 +224,21 @@ export function Component({
</LinearGradient>
</TouchableOpacity>
)}
<TouchableOpacity
testID="editProfileCancelBtn"
style={s.mt5}
onPress={onPressCancel}
accessibilityRole="button"
accessibilityLabel="Cancel profile editing"
accessibilityHint=""
onAccessibilityEscape={onPressCancel}>
<View style={[styles.btn]}>
<Text style={[s.black, s.bold, pal.text]}>Cancel</Text>
</View>
</TouchableOpacity>
{!isProcessing && (
<AnimatedTouchableOpacity
exiting={!isWeb ? FadeOut : undefined}
testID="editProfileCancelBtn"
style={s.mt5}
onPress={onPressCancel}
accessibilityRole="button"
accessibilityLabel="Cancel profile editing"
accessibilityHint=""
onAccessibilityEscape={onPressCancel}>
<View style={[styles.btn]}>
<Text style={[s.black, s.bold, pal.text]}>Cancel</Text>
</View>
</AnimatedTouchableOpacity>
)}
</View>
</ScrollView>
</KeyboardAvoidingView>
Expand Down