Add CreateMuteList modal
This commit is contained in:
@@ -37,6 +37,11 @@ export interface ReportAccountModal {
|
|||||||
did: string
|
did: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface CreateMuteListModal {
|
||||||
|
name: 'create-mute-list'
|
||||||
|
onCreate?: (uri: string) => void
|
||||||
|
}
|
||||||
|
|
||||||
export interface CropImageModal {
|
export interface CropImageModal {
|
||||||
name: 'crop-image'
|
name: 'crop-image'
|
||||||
uri: string
|
uri: string
|
||||||
@@ -95,9 +100,10 @@ export type Modal =
|
|||||||
| ContentFilteringSettingsModal
|
| ContentFilteringSettingsModal
|
||||||
| ContentLanguagesSettingsModal
|
| ContentLanguagesSettingsModal
|
||||||
|
|
||||||
// Reporting
|
// Moderation
|
||||||
| ReportAccountModal
|
| ReportAccountModal
|
||||||
| ReportPostModal
|
| ReportPostModal
|
||||||
|
| CreateMuteListModal
|
||||||
|
|
||||||
// Posts
|
// Posts
|
||||||
| AltTextImageModal
|
| AltTextImageModal
|
||||||
|
|||||||
@@ -0,0 +1,236 @@
|
|||||||
|
import React, {useState, useCallback} from 'react'
|
||||||
|
import * as Toast from '../util/Toast'
|
||||||
|
import {
|
||||||
|
ActivityIndicator,
|
||||||
|
KeyboardAvoidingView,
|
||||||
|
ScrollView,
|
||||||
|
StyleSheet,
|
||||||
|
TextInput,
|
||||||
|
TouchableOpacity,
|
||||||
|
View,
|
||||||
|
} from 'react-native'
|
||||||
|
import LinearGradient from 'react-native-linear-gradient'
|
||||||
|
import {Image as RNImage} from 'react-native-image-crop-picker'
|
||||||
|
import {Text} from '../util/text/Text'
|
||||||
|
import {ErrorMessage} from '../util/error/ErrorMessage'
|
||||||
|
import {useStores} from 'state/index'
|
||||||
|
import {s, colors, gradients} from 'lib/styles'
|
||||||
|
import {enforceLen} from 'lib/strings/helpers'
|
||||||
|
import {compressIfNeeded} from 'lib/media/manip'
|
||||||
|
import {UserAvatar} from '../util/UserAvatar'
|
||||||
|
import {usePalette} from 'lib/hooks/usePalette'
|
||||||
|
import {useTheme} from 'lib/ThemeContext'
|
||||||
|
import {useAnalytics} from 'lib/analytics'
|
||||||
|
import {cleanError, isNetworkError} from 'lib/strings/errors'
|
||||||
|
|
||||||
|
const MAX_NAME = 64 // todo
|
||||||
|
const MAX_DESCRIPTION = 300 // todo
|
||||||
|
|
||||||
|
export const snapPoints = ['fullscreen']
|
||||||
|
|
||||||
|
export function Component({onCreate}: {onCreate?: (uri: string) => void}) {
|
||||||
|
const store = useStores()
|
||||||
|
const [error, setError] = useState<string>('')
|
||||||
|
const pal = usePalette('default')
|
||||||
|
const theme = useTheme()
|
||||||
|
const {track} = useAnalytics()
|
||||||
|
|
||||||
|
const [isProcessing, setProcessing] = useState<boolean>(false)
|
||||||
|
const [name, setName] = useState<string>('')
|
||||||
|
const [description, setDescription] = useState<string>('')
|
||||||
|
const [avatar, setAvatar] = useState<string | undefined>(undefined)
|
||||||
|
const [newAvatar, setNewAvatar] = useState<RNImage | undefined | null>()
|
||||||
|
|
||||||
|
const onPressCancel = useCallback(() => {
|
||||||
|
store.shell.closeModal()
|
||||||
|
}, [store])
|
||||||
|
|
||||||
|
const onSelectNewAvatar = useCallback(
|
||||||
|
async (img: RNImage | null) => {
|
||||||
|
if (!img) {
|
||||||
|
setNewAvatar(null)
|
||||||
|
setAvatar(null)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
track('CreateMuteList:AvatarSelected')
|
||||||
|
try {
|
||||||
|
const finalImg = await compressIfNeeded(img, 1000000)
|
||||||
|
setNewAvatar(finalImg)
|
||||||
|
setAvatar(finalImg.path)
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(cleanError(e))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[track, setNewAvatar, setAvatar, setError],
|
||||||
|
)
|
||||||
|
|
||||||
|
const onPressSave = useCallback(async () => {
|
||||||
|
track('CreateMuteList:Save')
|
||||||
|
setProcessing(true)
|
||||||
|
if (error) {
|
||||||
|
setError('')
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// TODO
|
||||||
|
Toast.show('Mute-list created')
|
||||||
|
onCreate?.('todo')
|
||||||
|
store.shell.closeModal()
|
||||||
|
} catch (e: any) {
|
||||||
|
if (isNetworkError(e)) {
|
||||||
|
setError(
|
||||||
|
'Failed to create the mute-list. Check your internet connection and try again.',
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
setError(cleanError(e))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setProcessing(false)
|
||||||
|
}, [
|
||||||
|
track,
|
||||||
|
setProcessing,
|
||||||
|
setError,
|
||||||
|
error,
|
||||||
|
onCreate,
|
||||||
|
store,
|
||||||
|
name,
|
||||||
|
description,
|
||||||
|
newAvatar,
|
||||||
|
])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<KeyboardAvoidingView behavior="height">
|
||||||
|
<ScrollView style={[pal.view]} testID="createMuteListModal">
|
||||||
|
<Text style={[styles.title, pal.text]}>New Mute List</Text>
|
||||||
|
{error !== '' && (
|
||||||
|
<View style={styles.errorContainer}>
|
||||||
|
<ErrorMessage message={error} />
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
<Text style={[styles.label, pal.text]}>List Avatar</Text>
|
||||||
|
<View style={[styles.avi, {borderColor: pal.colors.background}]}>
|
||||||
|
<UserAvatar
|
||||||
|
size={80}
|
||||||
|
avatar={avatar}
|
||||||
|
onSelectNewAvatar={onSelectNewAvatar}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<View style={styles.form}>
|
||||||
|
<View>
|
||||||
|
<Text style={[styles.label, pal.text]}>List Name</Text>
|
||||||
|
<TextInput
|
||||||
|
testID="editNameInput"
|
||||||
|
style={[styles.textInput, pal.border, pal.text]}
|
||||||
|
placeholder="e.g. Spammers"
|
||||||
|
placeholderTextColor={colors.gray4}
|
||||||
|
value={name}
|
||||||
|
onChangeText={v => setName(enforceLen(v, MAX_NAME))}
|
||||||
|
accessible={true}
|
||||||
|
accessibilityLabel="Name"
|
||||||
|
accessibilityHint="Set the list's name"
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<View style={s.pb10}>
|
||||||
|
<Text style={[styles.label, pal.text]}>Description</Text>
|
||||||
|
<TextInput
|
||||||
|
testID="editDescriptionInput"
|
||||||
|
style={[styles.textArea, pal.border, pal.text]}
|
||||||
|
placeholder="e.g. Users that repeatedly reply with ads."
|
||||||
|
placeholderTextColor={colors.gray4}
|
||||||
|
keyboardAppearance={theme.colorScheme}
|
||||||
|
multiline
|
||||||
|
value={description}
|
||||||
|
onChangeText={v => setDescription(enforceLen(v, MAX_DESCRIPTION))}
|
||||||
|
accessible={true}
|
||||||
|
accessibilityLabel="Description"
|
||||||
|
accessibilityHint="Edit your list's description"
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
{isProcessing ? (
|
||||||
|
<View style={[styles.btn, s.mt10, {backgroundColor: colors.gray2}]}>
|
||||||
|
<ActivityIndicator />
|
||||||
|
</View>
|
||||||
|
) : (
|
||||||
|
<TouchableOpacity
|
||||||
|
testID="saveBtn"
|
||||||
|
style={s.mt10}
|
||||||
|
onPress={onPressSave}
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel="Save"
|
||||||
|
accessibilityHint="Creates the mute list">
|
||||||
|
<LinearGradient
|
||||||
|
colors={[gradients.blueLight.start, gradients.blueLight.end]}
|
||||||
|
start={{x: 0, y: 0}}
|
||||||
|
end={{x: 1, y: 1}}
|
||||||
|
style={[styles.btn]}>
|
||||||
|
<Text style={[s.white, s.bold]}>Save</Text>
|
||||||
|
</LinearGradient>
|
||||||
|
</TouchableOpacity>
|
||||||
|
)}
|
||||||
|
<TouchableOpacity
|
||||||
|
testID="cancelBtn"
|
||||||
|
style={s.mt5}
|
||||||
|
onPress={onPressCancel}
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel="Cancel creating the mute list"
|
||||||
|
accessibilityHint=""
|
||||||
|
onAccessibilityEscape={onPressCancel}>
|
||||||
|
<View style={[styles.btn]}>
|
||||||
|
<Text style={[s.black, s.bold, pal.text]}>Cancel</Text>
|
||||||
|
</View>
|
||||||
|
</TouchableOpacity>
|
||||||
|
</View>
|
||||||
|
</ScrollView>
|
||||||
|
</KeyboardAvoidingView>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
title: {
|
||||||
|
textAlign: 'center',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
fontSize: 24,
|
||||||
|
marginBottom: 18,
|
||||||
|
},
|
||||||
|
label: {
|
||||||
|
fontWeight: 'bold',
|
||||||
|
paddingHorizontal: 4,
|
||||||
|
paddingBottom: 4,
|
||||||
|
marginTop: 20,
|
||||||
|
},
|
||||||
|
form: {
|
||||||
|
paddingHorizontal: 6,
|
||||||
|
},
|
||||||
|
textInput: {
|
||||||
|
borderWidth: 1,
|
||||||
|
borderRadius: 6,
|
||||||
|
paddingHorizontal: 14,
|
||||||
|
paddingVertical: 10,
|
||||||
|
fontSize: 16,
|
||||||
|
},
|
||||||
|
textArea: {
|
||||||
|
borderWidth: 1,
|
||||||
|
borderRadius: 6,
|
||||||
|
paddingHorizontal: 12,
|
||||||
|
paddingTop: 10,
|
||||||
|
fontSize: 16,
|
||||||
|
height: 100,
|
||||||
|
textAlignVertical: 'top',
|
||||||
|
},
|
||||||
|
btn: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
width: '100%',
|
||||||
|
borderRadius: 32,
|
||||||
|
padding: 10,
|
||||||
|
marginBottom: 10,
|
||||||
|
},
|
||||||
|
avi: {
|
||||||
|
width: 84,
|
||||||
|
height: 84,
|
||||||
|
borderWidth: 2,
|
||||||
|
borderRadius: 42,
|
||||||
|
marginTop: 4,
|
||||||
|
},
|
||||||
|
errorContainer: {marginTop: 20},
|
||||||
|
})
|
||||||
@@ -12,6 +12,7 @@ import * as EditProfileModal from './EditProfile'
|
|||||||
import * as ServerInputModal from './ServerInput'
|
import * as ServerInputModal from './ServerInput'
|
||||||
import * as ReportPostModal from './ReportPost'
|
import * as ReportPostModal from './ReportPost'
|
||||||
import * as RepostModal from './Repost'
|
import * as RepostModal from './Repost'
|
||||||
|
import * as CreateMuteListModal from './CreateMuteList'
|
||||||
import * as AltImageModal from './AltImage'
|
import * as AltImageModal from './AltImage'
|
||||||
import * as ReportAccountModal from './ReportAccount'
|
import * as ReportAccountModal from './ReportAccount'
|
||||||
import * as DeleteAccountModal from './DeleteAccount'
|
import * as DeleteAccountModal from './DeleteAccount'
|
||||||
@@ -66,6 +67,9 @@ export const ModalsContainer = observer(function ModalsContainer() {
|
|||||||
} else if (activeModal?.name === 'report-account') {
|
} else if (activeModal?.name === 'report-account') {
|
||||||
snapPoints = ReportAccountModal.snapPoints
|
snapPoints = ReportAccountModal.snapPoints
|
||||||
element = <ReportAccountModal.Component {...activeModal} />
|
element = <ReportAccountModal.Component {...activeModal} />
|
||||||
|
} else if (activeModal?.name === 'create-mute-list') {
|
||||||
|
snapPoints = ReportAccountModal.snapPoints
|
||||||
|
element = <CreateMuteListModal.Component {...activeModal} />
|
||||||
} else if (activeModal?.name === 'delete-account') {
|
} else if (activeModal?.name === 'delete-account') {
|
||||||
snapPoints = DeleteAccountModal.snapPoints
|
snapPoints = DeleteAccountModal.snapPoints
|
||||||
element = <DeleteAccountModal.Component />
|
element = <DeleteAccountModal.Component />
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import * as EditProfileModal from './EditProfile'
|
|||||||
import * as ServerInputModal from './ServerInput'
|
import * as ServerInputModal from './ServerInput'
|
||||||
import * as ReportPostModal from './ReportPost'
|
import * as ReportPostModal from './ReportPost'
|
||||||
import * as ReportAccountModal from './ReportAccount'
|
import * as ReportAccountModal from './ReportAccount'
|
||||||
|
import * as CreateMuteListModal from './CreateMuteList'
|
||||||
import * as DeleteAccountModal from './DeleteAccount'
|
import * as DeleteAccountModal from './DeleteAccount'
|
||||||
import * as RepostModal from './Repost'
|
import * as RepostModal from './Repost'
|
||||||
import * as CropImageModal from './crop-image/CropImage.web'
|
import * as CropImageModal from './crop-image/CropImage.web'
|
||||||
@@ -68,6 +69,8 @@ function Modal({modal}: {modal: ModalIface}) {
|
|||||||
element = <ReportPostModal.Component {...modal} />
|
element = <ReportPostModal.Component {...modal} />
|
||||||
} else if (modal.name === 'report-account') {
|
} else if (modal.name === 'report-account') {
|
||||||
element = <ReportAccountModal.Component {...modal} />
|
element = <ReportAccountModal.Component {...modal} />
|
||||||
|
} else if (modal.name === 'create-mute-list') {
|
||||||
|
element = <CreateMuteListModal.Component {...modal} />
|
||||||
} else if (modal.name === 'crop-image') {
|
} else if (modal.name === 'crop-image') {
|
||||||
element = <CropImageModal.Component {...modal} />
|
element = <CropImageModal.Component {...modal} />
|
||||||
} else if (modal.name === 'delete-account') {
|
} else if (modal.name === 'delete-account') {
|
||||||
|
|||||||
@@ -33,16 +33,25 @@ export const ModerationMuteListsScreen = withAuthRequired(({route}: Props) => {
|
|||||||
}, [store]),
|
}, [store]),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const onPressNewMuteList = React.useCallback(() => {
|
||||||
|
store.shell.openModal({
|
||||||
|
name: 'create-mute-list',
|
||||||
|
onCreate: (uri: string) => {
|
||||||
|
// TODO
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}, [store])
|
||||||
|
|
||||||
const renderEmptyState = React.useCallback(() => {
|
const renderEmptyState = React.useCallback(() => {
|
||||||
return (
|
return (
|
||||||
<EmptyStateWithButton
|
<EmptyStateWithButton
|
||||||
icon="users-slash"
|
icon="users-slash"
|
||||||
message="You can subscribe to mute-lists to automatically mute all of the users they include. Mute-lists are public but your subscription to a mute-list is private."
|
message="You can subscribe to mute-lists to automatically mute all of the users they include. Mute-lists are public but your subscription to a mute-list is private."
|
||||||
buttonLabel="New Mute List"
|
buttonLabel="New Mute List"
|
||||||
onPress={() => undefined}
|
onPress={onPressNewMuteList}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}, [])
|
}, [onPressNewMuteList])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CenteredView
|
<CenteredView
|
||||||
|
|||||||
Reference in New Issue
Block a user