done requested changes

This commit is contained in:
Sadaqat Ali 2022-01-14 22:32:05 +05:00
parent 407923be52
commit d385404d0b
6 changed files with 66 additions and 41 deletions

View File

@ -105,6 +105,7 @@
"react-native-modal-translucent": "^5.0.0",
"react-native-navigation-bar-color": "^1.0.0",
"react-native-os": "^1.0.1",
"react-native-portalize": "^1.0.7",
"react-native-progress": "^5.0.0",
"react-native-push-notification": "^7.3.1",
"react-native-qrcode-svg": "^6.0.3",

View File

@ -13,12 +13,15 @@ export default EStyleSheet.create({
flex:1,
},
modalContainer: {
paddingVertical: 4,
// paddingVertical: 4,
},
modalHeader: {},
modalHeader: {
paddingHorizontal: 12,
paddingVertical:8,
},
titleBtnTxt: {
fontSize: 18,
fontWeight: 'bold',

View File

@ -3,26 +3,18 @@ import ActionSheet from 'react-native-actions-sheet';
import EStyleSheet from 'react-native-extended-stylesheet';
import styles from './quickReplyModalStyles';
import { forwardRef } from 'react';
import {
View,
Text,
Alert,
TouchableOpacity,
KeyboardAvoidingView,
Platform,
Keyboard,
} from 'react-native';
import { View, Text, Alert, TouchableOpacity, Keyboard } from 'react-native';
import { useIntl } from 'react-intl';
import { MainButton, SummaryArea, TextInput, UserAvatar } from '..';
import { IconButton, MainButton, SummaryArea, TextInput, UserAvatar } from '..';
import { useSelector, useDispatch } from 'react-redux';
import { generateReplyPermlink } from '../../utils/editor';
import { postComment } from '../../providers/hive/dhive';
import AsyncStorage from '@react-native-community/async-storage';
import { toastNotification } from '../../redux/actions/uiAction';
import { useAppSelector } from '../../hooks';
import { default as ROUTES } from '../../constants/routeNames';
import get from 'lodash/get';
import { navigate } from '../../navigation/service';
import { Portal } from 'react-native-portalize';
export interface QuickReplyModalProps {}
@ -31,7 +23,6 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
const dispatch = useDispatch();
const currentAccount = useSelector((state) => state.account.currentAccount);
const pinCode = useSelector((state) => state.application.pin);
const isLoggedIn = useAppSelector((state) => state.application.isLoggedIn);
const [selectedPost, setSelectedPost] = useState(null);
const [commentValue, setCommentValue] = useState('');
@ -40,6 +31,7 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
const sheetModalRef = useRef<ActionSheet>();
const inputRef = useRef<TextInput>(null);
// keyboard listener hook for checking if keyboard is active/inactove
useEffect(() => {
const keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () => {
setKeyboardVisible(true); // or some other action
@ -62,7 +54,6 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
//CALLBACK_METHODS
useImperativeHandle(ref, () => ({
show: (post: any) => {
console.log('Showing action modal');
setSelectedPost(post);
sheetModalRef.current?.setModalVisible(true);
// wait for modal to open and then show the keyboard
@ -74,6 +65,11 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
// handlers
// handle close press
const _handleClosePress = () => {
sheetModalRef.current?.setModalVisible(false);
setKeyboardVisible(false);
};
// navigate to post on summary press
const _handleOnSummaryPress = () => {
Keyboard.dismiss();
@ -90,6 +86,9 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
// handle submit reply
const _submitReply = async () => {
let stateTimer;
if (!commentValue) {
return;
}
if (isSending) {
return;
}
@ -122,11 +121,10 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
parentTags,
)
.then(() => {
AsyncStorage.setItem('temp-reply', '');
stateTimer = setTimeout(() => {
setIsSending(false);
sheetModalRef.current?.setModalVisible(false);
setCommentValue('');
dispatch(
toastNotification(
intl.formatMessage({
@ -156,6 +154,18 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
//VIEW_RENDERERS
const _renderSheetHeader = () => (
<View style={styles.modalHeader}>
<IconButton
name="close"
iconType="MaterialCommunityIcons"
size={28}
color={EStyleSheet.value('$primaryBlack')}
iconStyle={{}}
onPress={() => _handleClosePress()}
/>
</View>
);
const _renderSummary = () => (
<TouchableOpacity onPress={() => _handleOnSummaryPress()}>
<SummaryArea style={styles.summaryStyle} summary={selectedPost.summary} />
@ -174,7 +184,7 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
return (
<View style={styles.modalContainer}>
{_renderSummary()}
{isLoggedIn && _renderAvatar()}
{_renderAvatar()}
<View style={styles.inputContainer}>
<TextInput
innerRef={inputRef}
@ -207,21 +217,19 @@ const QuickReplyModal = ({}: QuickReplyModalProps, ref) => {
};
return (
<ActionSheet
ref={sheetModalRef}
gestureEnabled={true}
keyboardShouldPersistTaps="handled"
containerStyle={styles.sheetContent}
keyboardHandlerEnabled
indicatorColor={EStyleSheet.value('$primaryWhiteLightBackground')}
>
<KeyboardAvoidingView
behavior={'position'}
style={{ paddingBottom: Platform.OS === 'ios' ? 0 : !isKeyboardVisible ? 0 : 32 }}
<Portal>
<ActionSheet
ref={sheetModalRef}
gestureEnabled={true}
keyboardShouldPersistTaps="handled"
containerStyle={styles.sheetContent}
keyboardHandlerEnabled
indicatorColor={EStyleSheet.value('$primaryWhiteLightBackground')}
CustomHeaderComponent={_renderSheetHeader()}
>
{selectedPost && _renderContent()}
</KeyboardAvoidingView>
</ActionSheet>
</ActionSheet>
</Portal>
);
};

View File

@ -318,7 +318,12 @@ const TabContent = ({
// show quick reply modal
const _showQuickReplyModal = (post:any) => {
// console.log('post: ', post);
quickReplyModalRef.current.show(post)
if (isLoggedIn) {
quickReplyModalRef.current.show(post);
} else {
console.log('Not LoggedIn');
}
}
return (

View File

@ -1,6 +1,7 @@
import React, { Fragment, useEffect, useState } from 'react';
import SplashScreen from 'react-native-splash-screen';
import { Host } from 'react-native-portalize';
import ApplicationContainer from './container/applicationContainer';
import WelcomeScreen from './screen/welcomeScreen';
import ApplicationScreen from './screen/applicationScreen';
@ -62,15 +63,17 @@ const Application = () => {
</Modal>
{isThemeReady && isRenderRequire && (
<ApplicationScreen
isConnected={isConnected}
locale={locale}
toastNotification={toastNotification}
isReady={isReady}
isDarkTheme={isDarkTheme}
rcOffer={rcOffer}
foregroundNotificationData={foregroundNotificationData}
/>
<Host>
<ApplicationScreen
isConnected={isConnected}
locale={locale}
toastNotification={toastNotification}
isReady={isReady}
isDarkTheme={isDarkTheme}
rcOffer={rcOffer}
foregroundNotificationData={foregroundNotificationData}
/>
</Host>
)}
{!_isAppReady && <LaunchScreen />}
</ErrorBoundary>

View File

@ -8637,6 +8637,11 @@ react-native-os@^1.0.1:
resolved "https://registry.yarnpkg.com/react-native-os/-/react-native-os-1.2.6.tgz#1bb16d78ccad1143972183a04f443cf1af9fbefa"
integrity sha512-OlT+xQAcvkcnf7imgXiu+myMkqDt4xw2bP5SlVo19hEn5XHBkPMLX7dk3sSGxxncH/ToMDsf1KLyrPabNVtadA==
react-native-portalize@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/react-native-portalize/-/react-native-portalize-1.0.7.tgz#8b3c742a06f863654d526ea1075a8596625f8482"
integrity sha512-icqopPh9ZSV+I8C5LlZN9pQJ0OMeBDNqHhP80+qDx0hOGEcsDC09wgjogbEMfJE0GcMDM7PDYtyQkqa9gIqd1g==
react-native-progress@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/react-native-progress/-/react-native-progress-5.0.0.tgz#f5ac6ceaeee27f184c660b00f29419e82a9d0ab0"