Commit 67f2c093 by tungnq

TODO: Đã hoàn thiện luồng thông báo

parent 45dfc3f6
...@@ -16,7 +16,7 @@ function MyStack(props) { ...@@ -16,7 +16,7 @@ function MyStack(props) {
headerStatusBarHeight: 0, headerStatusBarHeight: 0,
}} }}
headerMode={'none'} headerMode={'none'}
initialRouteName={ScreenName.ADDNOTIFICATION}> initialRouteName={ScreenName.TABNAVIGATOR}>
<Stack.Screen name={ScreenName.HOMESCREEN} component={Home} /> <Stack.Screen name={ScreenName.HOMESCREEN} component={Home} />
<Stack.Screen name={ScreenName.TABNAVIGATOR} component={TabNavigator} /> <Stack.Screen name={ScreenName.TABNAVIGATOR} component={TabNavigator} />
<Stack.Screen name={ScreenName.DETAILNOTIFICATION} component={NotificationDetail} /> <Stack.Screen name={ScreenName.DETAILNOTIFICATION} component={NotificationDetail} />
......
...@@ -29,9 +29,6 @@ const NotificationDetail = (props) => { ...@@ -29,9 +29,6 @@ const NotificationDetail = (props) => {
return ( return (
<NotificationDetailView <NotificationDetailView
options={options}
selectedValue={selectedValue}
onValueChange={onValueChange}
dataList={dataList} dataList={dataList}
/> />
); );
......
...@@ -5,7 +5,6 @@ import Header from '../../../components/Header/Header'; ...@@ -5,7 +5,6 @@ import Header from '../../../components/Header/Header';
import TextField from '../../../components/Input/TextField'; import TextField from '../../../components/Input/TextField';
import R from '../../../assets/R'; import R from '../../../assets/R';
import TextMulti from '../../../components/Input/TextMulti'; import TextMulti from '../../../components/Input/TextMulti';
import RadioGroup from '../../../components/RadioButton/RadioGroup';
import Button from '../../../components/Button'; import Button from '../../../components/Button';
const NotificationDetailView = props => { const NotificationDetailView = props => {
const { const {
......
...@@ -11,6 +11,8 @@ import { ...@@ -11,6 +11,8 @@ import {
import Header from '../../components/Header/Header'; import Header from '../../components/Header/Header';
import styles from './style'; import styles from './style';
import R from '../../assets/R'; import R from '../../assets/R';
import * as SCREENNAME from "../../routers/ScreenNames";
import { useNavigation } from "@react-navigation/native";
const NotificationView = props => { const NotificationView = props => {
const { const {
dataTitleListTabView, dataTitleListTabView,
...@@ -21,6 +23,7 @@ const NotificationView = props => { ...@@ -21,6 +23,7 @@ const NotificationView = props => {
searchText, searchText,
onSearchChange, onSearchChange,
} = props; } = props;
const navigate = useNavigation();
//Xử lý render item cho tab view //Xử lý render item cho tab view
const getRenderItemFunction = () => { const getRenderItemFunction = () => {
switch (activeTab) { switch (activeTab) {
...@@ -111,7 +114,7 @@ const NotificationView = props => { ...@@ -111,7 +114,7 @@ const NotificationView = props => {
const renderNotificationItemTution = ({item}) => { const renderNotificationItemTution = ({item}) => {
const statusColor = getStatusColor(item.status); const statusColor = getStatusColor(item.status);
return ( return (
<TouchableOpacity style={[styles.cardItem, styles.cardItemTution]}> <TouchableOpacity style={[styles.cardItem, styles.cardItemTution]} onPress={() => navigate.navigate(SCREENNAME.DETAILNOTIFICATION)}>
<View style={styles.boxLeft}> <View style={styles.boxLeft}>
<Text style={styles.text} numberOfLines={1} ellipsizeMode="tail"> <Text style={styles.text} numberOfLines={1} ellipsizeMode="tail">
<Text style={styles.text}>Tiêu đề: </Text> <Text style={styles.text}>Tiêu đề: </Text>
...@@ -195,7 +198,7 @@ const NotificationView = props => { ...@@ -195,7 +198,7 @@ const NotificationView = props => {
<View style={styles.containerFooter}> <View style={styles.containerFooter}>
<TouchableOpacity <TouchableOpacity
style={styles.btnFooter} style={styles.btnFooter}
onPress={() => navigate.navigate(SCREENNAME.PROFILE)}> onPress={() => navigate.navigate(SCREENNAME.ADDNOTIFICATION)}>
<Text style={styles.textBtnFooter}>To thông báo mi</Text> <Text style={styles.textBtnFooter}>To thông báo mi</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment