diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index 506daeb1bc..689e8579d5 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -32,7 +32,7 @@ const moveToPremanantPath = async (path: string) => { /* Since this package stores images in a temp directory, we need to move the file to a permanent location. Relevant: IOS bug when trying to open a second time: - https://github.com/ivpusic/react-native-image-crop-picker/issues/1199 + https://github.com/ivpusic/react-native-image-crop-picker/issues/1199 */ const filename = uuid.v4() const destinationPath = `${RNFS.TemporaryDirectoryPath}/${filename}` diff --git a/src/view/com/modals/EditProfile.tsx b/src/view/com/modals/EditProfile.tsx index 8ace210eea..3ad0e2871f 100644 --- a/src/view/com/modals/EditProfile.tsx +++ b/src/view/com/modals/EditProfile.tsx @@ -23,6 +23,7 @@ import {isNetworkError} from '../../../lib/errors' import {compressIfNeeded} from '../../../lib/images' import {UserBanner} from '../util/UserBanner' import {UserAvatar} from '../util/UserAvatar' +import {usePalette} from '../../lib/hooks/usePalette' export const snapPoints = ['80%'] @@ -35,6 +36,8 @@ export function Component({ }) { const store = useStores() const [error, setError] = useState('') + const pal = usePalette('default') + const [isProcessing, setProcessing] = useState(false) const [displayName, setDisplayName] = useState( profileView.displayName || '', @@ -102,15 +105,15 @@ export function Component({ return ( - - Edit my profile + + Edit my profile - + )} - Display Name + Display Name setDisplayName(enforceLen(v, MAX_DISPLAY_NAME))} /> - Description + Description - Cancel + Cancel diff --git a/src/view/com/modals/Modal.tsx b/src/view/com/modals/Modal.tsx index e0e18d54ae..1f77d91801 100644 --- a/src/view/com/modals/Modal.tsx +++ b/src/view/com/modals/Modal.tsx @@ -12,13 +12,15 @@ import * as EditProfileModal from './EditProfile' import * as ServerInputModal from './ServerInput' import * as ReportPostModal from './ReportPost' import * as ReportAccountModal from './ReportAccount' +import {usePalette} from '../../lib/hooks/usePalette' +import {StyleSheet} from 'react-native' const CLOSED_SNAPPOINTS = ['10%'] export const Modal = observer(function Modal() { const store = useStores() const bottomSheetRef = useRef(null) - + const pal = usePalette('default') const onBottomSheetChange = (snapPoint: number) => { if (snapPoint === -1) { store.shell.closeModal() @@ -88,8 +90,17 @@ export const Modal = observer(function Modal() { backdropComponent={ store.shell.isModalActive ? createCustomBackdrop(onClose) : undefined } + handleIndicatorStyle={{backgroundColor: pal.text.color}} + handleStyle={[styles.handle, pal.view]} onChange={onBottomSheetChange}> {element} ) }) + +const styles = StyleSheet.create({ + handle: { + borderTopLeftRadius: 10, + borderTopRightRadius: 10, + }, +}) diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx index 745c39d55f..424c1e720d 100644 --- a/src/view/com/util/UserAvatar.tsx +++ b/src/view/com/util/UserAvatar.tsx @@ -11,6 +11,7 @@ import { } from 'react-native-image-crop-picker' import {colors, gradients} from '../../lib/styles' import {DropdownButton} from './forms/DropdownButton' +import {usePalette} from '../../lib/hooks/usePalette' export function UserAvatar({ size, @@ -26,7 +27,7 @@ export function UserAvatar({ onSelectNewAvatar?: (img: PickedImage) => void }) { const initials = getInitials(displayName || handle) - + const pal = usePalette('default') const renderSvg = (svgSize: number, svgInitials: string) => ( @@ -117,11 +118,11 @@ export function UserAvatar({ ) : ( renderSvg(size, initials) )} - + diff --git a/src/view/com/util/UserBanner.tsx b/src/view/com/util/UserBanner.tsx index d10b540232..fdd2517d16 100644 --- a/src/view/com/util/UserBanner.tsx +++ b/src/view/com/util/UserBanner.tsx @@ -11,6 +11,7 @@ import { openPicker, } from 'react-native-image-crop-picker' import {DropdownButton} from './forms/DropdownButton' +import {usePalette} from '../../lib/hooks/usePalette' export function UserBanner({ banner, @@ -19,6 +20,7 @@ export function UserBanner({ banner?: string | null onSelectNewBanner?: (img: PickedImage) => void }) { + const pal = usePalette('default') const dropdownItems = [ { label: 'Camera', @@ -100,11 +102,12 @@ export function UserBanner({ ) : ( renderSvg() )} - +