@amityco/react-native-social-uikit 4.0.0-b295c41.0 → 4.0.0-c2327e7.0

package/src/components/PostTypeChoiceModal/style.ts

@@ -37,8 +37,7 @@ export const useStyles = () => {
     modalRow: {
       flexDirection: 'row',
       alignItems: 'center',
-      padding: 5,
-      marginVertical: 5,
+      paddingVertical: 16,
     },
     closeButtonText: {
       color: '#FFF',

package/src/components/Social/PostList/index.tsx

@@ -67,7 +67,7 @@ export interface IPost {
 export interface IPostList {
   onDelete?: (postId: string) => void;
   onChange?: (postDetail: Amity.Post<any>) => void;
-  postDetail: Amity.Post<any> & { structureType?: string };
+  postDetail: Amity.Post<any>;
   postIndex?: number;
   isGlobalfeed?: boolean;
 }
@@ -124,7 +124,6 @@ export default function PostList({
     children: childrenPosts = [],
     editedAt,
     metadata,
-    structureType,
   } = postDetail ?? {};
   const mentionPosition = metadata?.mentioned;
 
@@ -412,8 +411,6 @@ export default function PostList({
     });
   };
 
-  if (structureType === 'liveStream') return null;
-
   return (
     <View key={postId} style={styles.postWrap}>
       <View style={styles.headerSection}>

package/src/index.tsx

@@ -63,7 +63,7 @@ import {
   AmityAllCategoriesPage,
   AmityCommunitiesByCategoryPage,
   AmityCommunityProfilePage as CommunityProfilePage,
-  // AmityCreateLivestreamPage,
+  AmityCreateLivestreamPage,
   AmityLivestreamPostTargetSelectionPage,
   AmityLivestreamTerminatedPage,
   AmityLivestreamPlayerPage,
@@ -162,7 +162,7 @@ export {
   AmityAllCategoriesPage,
   AmityCommunitiesByCategoryPage,
   CommunityProfilePage,
-  // AmityCreateLivestreamPage,
+  AmityCreateLivestreamPage,
   AmityLivestreamPostTargetSelectionPage,
   AmityLivestreamTerminatedPage,
   AmityLivestreamPlayerPage,

package/src/screens/CreateLivestream/CreateLivestream.tsx

@@ -16,7 +16,7 @@ import { useStyles } from './styles';
 import useImagePicker from '../../../src/hooks/useImagePicker';
 import { uploadImageFile } from '../../../src/providers/file-provider';
 
-import { StreamRepository, PostRepository } from '@amityco/ts-sdk-react-native';
+import { PostRepository, RoomRepository } from '@amityco/ts-sdk-react-native';
 import BottomSheet, { BottomSheetMethods } from '@devvie/bottom-sheet';
 
 // import {
@@ -55,7 +55,7 @@ const CreateLivestream = ({ navigation, route }) => {
 
   const [title, setTitle] = useState<string>('');
   const [description, setDescription] = useState<string>('');
-  const [stream, setStream] = useState<Amity.Stream | null>(null);
+  const [room, setRoom] = useState<Amity.Room | null>(null);
   const [isLive, setIsLive] = useState<boolean>(false);
   const [timer] = useState<number | null>(null);
 
@@ -141,16 +141,16 @@ const CreateLivestream = ({ navigation, route }) => {
   }, []);
 
   const createStreamPost = useCallback(
-    (newStream: Amity.Stream) => {
+    (newRoom: Amity.Room) => {
       const params = {
         targetId,
         targetType,
-        dataType: 'liveStream' as Amity.PostContentType,
+        dataType: 'room' as Amity.PostContentType,
         data: {
-          text: `${newStream.title}${
-            newStream.description ? `\n\n${newStream.description}` : ''
+          text: `${newRoom.title}${
+            newRoom.description ? `\n\n${newRoom.description}` : ''
           }`,
-          streamId: newStream.streamId,
+          roomId: newRoom.roomId,
         },
       };
 
@@ -168,18 +168,18 @@ const CreateLivestream = ({ navigation, route }) => {
 
       if (imageUri) fileId = await uploadFile(imageUri);
 
-      const { data: newStream } = await StreamRepository.createStream({
+      const { data: newRoom } = await RoomRepository.createRoom({
         title,
         description: description || undefined,
         thumbnailFileId: fileId,
       });
 
-      if (newStream) {
-        const { data: newPost } = await createStreamPost(newStream);
-        setStream(newStream);
+      if (newRoom) {
+        const { data: newPost } = await createStreamPost(newRoom);
+        setRoom(newRoom);
         setPost(newPost);
 
-        streamRef?.current.startPublish(newStream.streamId);
+        streamRef?.current.startPublish(newRoom.roomId);
       }
     } else emptyTitleAlert();
   }, [title, description, createStreamPost, imageUri, uploadFile]);
@@ -193,17 +193,17 @@ const CreateLivestream = ({ navigation, route }) => {
   // };
 
   const onStopStream = useCallback(async () => {
-    if (stream) {
+    if (room) {
       setIsEnding(true);
       try {
-        await StreamRepository.disposeStream(stream.streamId);
+        await RoomRepository.stopRoom(room.roomId);
       } catch (e) {
-        console.log('disposeStream error', e);
+        console.log('stopRoom error', e);
       }
 
       streamRef?.current.stopPublish();
       setIsLive(false);
-      setStream(null);
+      setRoom(null);
       setTitle(undefined);
       setDescription(undefined);
       setTime(0);
@@ -214,7 +214,7 @@ const CreateLivestream = ({ navigation, route }) => {
         postId: post.postId,
       });
     }
-  }, [stream, timer, post, navigation]);
+  }, [room, timer, post, navigation]);
 
   const onSwitchCamera = () => {
     streamRef?.current.switchCamera();

package/src/screens/LivestreamPlayer/index.tsx

@@ -7,14 +7,11 @@ import {
 } from 'react-native';
 import { useStyles } from './styles';
 
-// @ts-ignore
-// import { AmityStreamPlayer } from '@amityco/video-player-react-native';
-
 import LivestreamEndedView from '../../v4/component/LivestreamContent/LivestreamEndedThumbnail';
 import { Animated } from 'react-native';
 import { SvgXml } from 'react-native-svg';
 import { closeIcon, playIcon, stopIcon } from '../../svg/svg-xml-list';
-import { StreamRepository } from '@amityco/ts-sdk-react-native';
+import { RoomRepository } from '@amityco/ts-sdk-react-native';
 
 const LiveStreamPlayer = ({ navigation, route }) => {
   const ref = useRef<any>(null);
@@ -24,9 +21,9 @@ const LiveStreamPlayer = ({ navigation, route }) => {
 
   const [isPlaying, setIsPlaying] = useState(true);
 
-  const { streamId } = route.params;
+  const { roomId } = route.params;
 
-  const [livestream, setLivestream] = useState<Amity.Stream>();
+  const [livestream, setLivestream] = useState<Amity.Room>();
 
   const onClosePlayer = () => {
     navigation.goBack();
@@ -59,15 +56,12 @@ const LiveStreamPlayer = ({ navigation, route }) => {
 
   useEffect(() => {
     const getLivestream = () => {
-      return StreamRepository.getStreamById(
-        streamId,
-        ({ data, loading, error }) => {
-          if (error) console.error('Error fetching livestream', error);
-          if (!loading && data) {
-            setLivestream({ ...data });
-          }
+      return RoomRepository.getRoom(roomId, ({ data, loading, error }) => {
+        if (error) console.error('Error fetching livestream', error);
+        if (!loading && data) {
+          setLivestream({ ...data });
         }
-      );
+      });
     };
 
     const unsubscribe = getLivestream();
@@ -75,7 +69,7 @@ const LiveStreamPlayer = ({ navigation, route }) => {
     return () => {
       unsubscribe();
     };
-  }, [streamId]);
+  }, [roomId]);
 
   return (
     <View style={styles.container}>

package/src/svg/svg-xml-list.ts

@@ -396,7 +396,7 @@ export const editThumbnailIcon = (
 export const livestreamIcon = (
   color: string = '#292B32'
 ) => `<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.41406 8.80469L8.02734 8.41797C7.92188 8.3125 7.78125 8.24219 7.64062 8.24219C7.46484 8.24219 7.28906 8.3125 7.18359 8.45312C6.30469 9.47266 5.8125 10.8086 5.8125 12.25C5.8125 13.7266 6.30469 15.0625 7.18359 16.082C7.28906 16.2227 7.46484 16.293 7.64062 16.293C7.78125 16.293 7.92188 16.2227 8.02734 16.1172L8.41406 15.7305C8.51953 15.625 8.58984 15.5195 8.58984 15.3438C8.58984 15.2383 8.55469 15.0977 8.48438 15.0273C7.85156 14.2539 7.5 13.3047 7.5 12.2852C7.5 11.2305 7.85156 10.2812 8.48438 9.50781C8.55469 9.4375 8.58984 9.29688 8.58984 9.19141C8.58984 9.01562 8.51953 8.91016 8.41406 8.80469ZM5.63672 6.0625L5.25 5.67578C5.14453 5.57031 5.00391 5.53516 4.82812 5.53516C4.65234 5.53516 4.51172 5.60547 4.40625 5.71094C2.75391 7.50391 1.875 9.82422 1.875 12.25C1.875 14.7109 2.75391 16.9961 4.40625 18.8242C4.51172 18.9297 4.65234 19.0352 4.82812 19.0352C5.00391 19.0352 5.14453 18.9648 5.25 18.8594L5.63672 18.4727C5.84766 18.2617 5.84766 17.9453 5.63672 17.6992C4.33594 16.2578 3.5625 14.3594 3.5625 12.2852C3.5625 10.1758 4.33594 8.27734 5.63672 6.83594C5.84766 6.58984 5.84766 6.27344 5.63672 6.0625ZM19.5586 5.71094C19.4531 5.60547 19.3125 5.5 19.1367 5.5C18.9609 5.5 18.8203 5.57031 18.75 5.67578L18.3281 6.0625C18.1172 6.27344 18.1172 6.58984 18.3281 6.83594C19.6289 8.27734 20.4023 10.1758 20.4023 12.25C20.4023 14.3594 19.6289 16.2578 18.3281 17.6992C18.1172 17.9453 18.1172 18.2617 18.3281 18.4727L18.75 18.8594C18.8203 18.9648 18.9609 19 19.1367 19C19.3125 19 19.4531 18.9297 19.5586 18.8242C21.2109 16.9961 22.125 14.7109 22.125 12.25C22.125 9.82422 21.2109 7.50391 19.5586 5.71094ZM12 10.2812C10.9102 10.2812 10.0312 11.1953 10.0312 12.25C10.0312 13.3398 10.9102 14.2188 12 14.2188C13.0547 14.2188 13.9688 13.3398 13.9688 12.25C13.9688 11.1953 13.0547 10.2812 12 10.2812ZM15.9375 8.41797L15.5508 8.80469C15.4453 8.91016 15.375 9.01562 15.375 9.19141C15.375 9.29688 15.4102 9.4375 15.4805 9.50781C16.1133 10.2812 16.4648 11.2305 16.4648 12.25C16.4648 13.3047 16.1133 14.2539 15.4805 15.0273C15.4102 15.0977 15.375 15.2383 15.375 15.3438C15.375 15.5195 15.4453 15.625 15.5508 15.7305L15.9375 16.1172C16.043 16.2227 16.1836 16.293 16.3242 16.293C16.5 16.293 16.6758 16.2227 16.7812 16.082C17.6602 15.0625 18.1523 13.7266 18.1523 12.2852C18.1523 10.8086 17.6602 9.47266 16.7812 8.45312C16.6758 8.3125 16.5 8.24219 16.3242 8.24219C16.1836 8.24219 16.043 8.3125 15.9375 8.41797Z" fill=${color}/>
+<path d="M8.41406 8.80469C8.51953 8.91016 8.58984 9.01562 8.58984 9.19141C8.58984 9.29688 8.55469 9.4375 8.48438 9.50781C7.85156 10.2812 7.5 11.2305 7.5 12.2852C7.5 13.3047 7.85156 14.2539 8.48438 15.0273C8.55469 15.0977 8.58984 15.2383 8.58984 15.3438C8.58984 15.5195 8.51953 15.625 8.41406 15.7305L8.02734 16.1172C7.92188 16.2227 7.78125 16.293 7.64062 16.293C7.46484 16.293 7.28906 16.2227 7.18359 16.082C6.30469 15.0625 5.8125 13.7266 5.8125 12.25C5.8125 10.8086 6.30469 9.47266 7.18359 8.45312C7.28906 8.3125 7.46484 8.24219 7.64062 8.24219C7.78125 8.24219 7.92188 8.3125 8.02734 8.41797L8.41406 8.80469ZM5.63672 6.0625C5.84766 6.27344 5.84766 6.58984 5.63672 6.83594C4.33594 8.27734 3.5625 10.1758 3.5625 12.2852C3.5625 14.3594 4.33594 16.2578 5.63672 17.6992C5.84766 17.9453 5.84766 18.2617 5.63672 18.4727L5.25 18.8594C5.14453 18.9648 5.00391 19.0352 4.82812 19.0352C4.65234 19.0352 4.51172 18.9297 4.40625 18.8242C2.75391 16.9961 1.875 14.7109 1.875 12.25C1.875 9.82422 2.75391 7.50391 4.40625 5.71094C4.51172 5.60547 4.65234 5.53516 4.82812 5.53516C5.00391 5.53516 5.14453 5.57031 5.25 5.67578L5.63672 6.0625ZM19.5586 5.71094C21.2109 7.50391 22.125 9.82422 22.125 12.25C22.125 14.7109 21.2109 16.9961 19.5586 18.8242C19.4531 18.9297 19.3125 19 19.1367 19C18.9609 19 18.8203 18.9648 18.75 18.8594L18.3281 18.4727C18.1172 18.2617 18.1172 17.9453 18.3281 17.6992C19.6289 16.2578 20.4023 14.3594 20.4023 12.25C20.4023 10.1758 19.6289 8.27734 18.3281 6.83594C18.1172 6.58984 18.1172 6.27344 18.3281 6.0625L18.75 5.67578C18.8203 5.57031 18.9609 5.5 19.1367 5.5C19.3125 5.5 19.4531 5.60547 19.5586 5.71094ZM12 10.2812C13.0547 10.2812 13.9688 11.1953 13.9688 12.25C13.9688 13.3398 13.0547 14.2188 12 14.2188C10.9102 14.2188 10.0312 13.3398 10.0312 12.25C10.0312 11.1953 10.9102 10.2812 12 10.2812ZM15.9375 8.41797C16.043 8.3125 16.1836 8.24219 16.3242 8.24219C16.5 8.24219 16.6758 8.3125 16.7812 8.45312C17.6602 9.47266 18.1523 10.8086 18.1523 12.2852C18.1523 13.7266 17.6602 15.0625 16.7812 16.082C16.6758 16.2227 16.5 16.293 16.3242 16.293C16.1836 16.293 16.043 16.2227 15.9375 16.1172L15.5508 15.7305C15.4453 15.625 15.375 15.5195 15.375 15.3438C15.375 15.2383 15.4102 15.0977 15.4805 15.0273C16.1133 14.2539 16.4648 13.3047 16.4648 12.25C16.4648 11.2305 16.1133 10.2812 15.4805 9.50781C15.4102 9.4375 15.375 9.29688 15.375 9.19141C15.375 9.01562 15.4453 8.91016 15.5508 8.80469L15.9375 8.41797Z" fill=${color}/>
 </svg>
 `;
 

package/src/util/postTypeChecker.ts

@@ -8,7 +8,7 @@ export const isTextPost = (
 
 export const isStreamPost = (
   post?: Amity.Post | null
-): post is Amity.Post<'liveStream'> => {
+): post is Amity.Post<'room'> => {
   return !!(
     post &&
     post.data &&

package/src/v4/PublicApi/Components/AmityCreatePostMenuComponent/AmityCreatePostMenuComponent.tsx

@@ -62,14 +62,14 @@ const AmityCreatePostMenuComponent = ({
           navigation.navigate('PollTargetSelection');
         },
 
-        // [AmityPostTargetSelectionPageType.livestream]: () => {
-        //   if (
-        //     AmityCreatePostMenuComponentBehavior.goToSelectLivestreamPostTargetPage
-        //   ) {
-        //     AmityCreatePostMenuComponentBehavior.goToSelectLivestreamPostTargetPage();
-        //   }
-        //   navigation.navigate('LivestreamPostTargetSelection');
-        // },
+        [AmityPostTargetSelectionPageType.livestream]: () => {
+          if (
+            AmityCreatePostMenuComponentBehavior.goToSelectLivestreamPostTargetPage
+          ) {
+            AmityCreatePostMenuComponentBehavior.goToSelectLivestreamPostTargetPage();
+          }
+          navigation.navigate('LivestreamPostTargetSelection');
+        },
       };
       postTypeHandlers[postType]?.();
     },
@@ -100,14 +100,14 @@ const AmityCreatePostMenuComponent = ({
         elementId={ElementID.create_poll_button}
         onClick={() => onPressCreatePost(AmityPostTargetSelectionPageType.poll)}
       />
-      {/* <ButtonWithIconElement
+      <ButtonWithIconElement
         pageId={pageId}
         componentId={componentId}
         elementId={ElementID.create_livestream_button}
         onClick={() =>
           onPressCreatePost(AmityPostTargetSelectionPageType.livestream)
         }
-      /> */}
+      />
     </View>
   );
 };

package/src/v4/PublicApi/Components/AmityPostContentComponent/AmityPostContentComponent.tsx

@@ -34,7 +34,7 @@ import AnnouncementBadge from '../../../../v4/elements/AnnouncementBadge';
 import { Typography } from '../../../../v4/component/Typography/Typography';
 
 type AmityPostContentComponentProps = {
-  post: Amity.Post & { structureType?: string };
+  post: Amity.Post;
   pageId?: PageID;
   AmityPostContentComponentStyle?: AmityPostContentComponentStyleEnum;
   isCommunityNameShown?: boolean;

package/src/v4/PublicApi/Elements/ButtonWithIconElement/styles.ts

@@ -6,6 +6,7 @@ export const useStyle = (themeStyle: MyMD3Theme) => {
     container: {
       display: 'flex',
       flexDirection: 'row',
+      alignItems: 'center',
       width: 200,
       paddingTop: 12,
       paddingBottom: 12,
@@ -13,8 +14,8 @@ export const useStyle = (themeStyle: MyMD3Theme) => {
       gap: 12,
     },
     icon: {
-      width: 20,
-      height: 20,
+      width: 24,
+      height: 24,
       tintColor: themeStyle.colors.base,
     },
     label: {

package/src/v4/PublicApi/Pages/AmityCommunityProfilePage/AmityCommunityProfilePage.tsx

@@ -35,8 +35,7 @@ import { RootStackParamList } from '../../../routes/RouteParamList';
 import CommunityCreatePostButton from '../../../elements/CommunityCreatePostButton/CommunityCreatePostButton';
 import { SvgXml } from 'react-native-svg';
 import { useBehaviour } from '../../../../v4/providers/BehaviourProvider';
-
-import { poll, post, story } from '../../../../v4/assets/icons';
+import { livestream, poll, post, story } from '../../../../v4/assets/icons';
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native';
 
 import { useTheme } from 'react-native-paper';
@@ -265,7 +264,7 @@ function CommunityProfileActions({ pageId, communityId, styles }) {
     AmityPostTargetSelectionPageBehavior,
     AmityPollTargetSelectionPageBehavior,
     AmityStoryTargetSelectionPageBehavior,
-    // AmityLivestreamPostTargetSelectionPageBehavior,
+    AmityLivestreamPostTargetSelectionPageBehavior,
   } = useBehaviour();
   const navigation =
     useNavigation<
@@ -311,26 +310,26 @@ function CommunityProfileActions({ pageId, communityId, styles }) {
     });
   };
 
-  // const handleCreateLivestream = () => {
-  //   closeBottomSheet();
-
-  //   if (
-  //     AmityLivestreamPostTargetSelectionPageBehavior.goToCreateLivestreamPage
-  //   ) {
-  //     return AmityLivestreamPostTargetSelectionPageBehavior.goToCreateLivestreamPage(
-  //       {
-  //         targetId: communityId,
-  //         targetType: 'community',
-  //         targetName: community?.displayName,
-  //       }
-  //     );
-  //   }
-  //   navigation.navigate('CreateLivestream', {
-  //     targetId: communityId,
-  //     targetType: 'community',
-  //     targetName: community?.displayName,
-  //   });
-  // };
+  const handleCreateLivestream = () => {
+    closeBottomSheet();
+
+    if (
+      AmityLivestreamPostTargetSelectionPageBehavior.goToCreateLivestreamPage
+    ) {
+      return AmityLivestreamPostTargetSelectionPageBehavior.goToCreateLivestreamPage(
+        {
+          targetId: communityId,
+          targetType: 'community',
+          targetName: community?.displayName,
+        }
+      );
+    }
+    navigation.navigate('CreateLivestream', {
+      targetId: communityId,
+      targetType: 'community',
+      targetName: community?.displayName,
+    });
+  };
 
   const handleCreatePoll = () => {
     closeBottomSheet();
@@ -398,7 +397,7 @@ function CommunityProfileActions({ pageId, communityId, styles }) {
               <SvgXml width={24} height={24} xml={poll()} color={colors.base} />
               <Text style={styles.bottomSheetOptionText}>Poll</Text>
             </TouchableOpacity>
-            {/* <TouchableOpacity
+            <TouchableOpacity
               onPress={handleCreateLivestream}
               style={styles.bottomSheetOption}
             >
@@ -409,7 +408,7 @@ function CommunityProfileActions({ pageId, communityId, styles }) {
                 color={colors.base}
               />
               <Text style={styles.bottomSheetOptionText}>Livestream</Text>
-            </TouchableOpacity> */}
+            </TouchableOpacity>
           </Animated.View>
         </Pressable>
       </Modal>

package/src/v4/PublicApi/Pages/AmityCommunityProfilePage/styles.ts

@@ -41,7 +41,7 @@ export const useStyles = (theme: MyMD3Theme) => {
       backgroundColor: theme.colors.background,
       borderTopLeftRadius: 20,
       borderTopRightRadius: 20,
-      padding: 10,
+      paddingHorizontal: 16,
       minHeight: 200,
       paddingBottom: insets.bottom + 10,
     },
@@ -57,7 +57,7 @@ export const useStyles = (theme: MyMD3Theme) => {
       flexDirection: 'row',
       alignItems: 'center',
       paddingVertical: 16,
-      paddingHorizontal: 16,
+      paddingHorizontal: 0,
     },
     bottomSheetOptionText: {
       fontSize: 16,