From 92e5aa800406a97e9cae2e08f77548c0f0fe8469 Mon Sep 17 00:00:00 2001
From: aguilhot <Alban.GUILHOT@etu.uca.fr>
Date: Thu, 15 Dec 2022 09:46:43 +0100
Subject: [PATCH] CHANGES: conversation data and test view

---
 bob_party/src/screens/Test.tsx                | 36 ++++++++-----------
 .../loaderConversationApi.ts                  | 15 +++++---
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/bob_party/src/screens/Test.tsx b/bob_party/src/screens/Test.tsx
index d70c639..1f2618c 100644
--- a/bob_party/src/screens/Test.tsx
+++ b/bob_party/src/screens/Test.tsx
@@ -5,36 +5,28 @@ import React from 'react';
 import { FlatList } from 'react-native-gesture-handler';
 import { SkinComponent } from '../components/Skin';
 import { Skin } from '../core/skin';
+import { MessageComponent } from '../components/MessageComponent';
+import { MANAGER_CONVERSATION, MANAGER_USER } from '../../appManagers';
+import { Message } from '../core/message';
+import { User } from '../core/User/user';
 
-/*
-const skinTest = new Skin("S0001","Bob",require('../../assets/BobsSkins/BobClassic.png'));
-const skinBleu = new Skin("S0001","Bob Bleu", require('../../assets/BobsSkins/BobBlue.png'))
-const skinBW = new Skin("S0001","Bob BW", require('../../assets/BobsSkins/BobBW.png'))
-const skinGreen = new Skin("S0001","Bob Vert", require('../../assets/BobsSkins/BobGreen.png'))
-const skinPT = new Skin("S0001","Bob R&T", require('../../assets/BobsSkins/BobPinkTurquoise.png'))
-
-let listSkin: Array<Skin> = [skinTest, skinBleu, skinBW, skinGreen, skinPT]
 
 function Test(props: { navigation: any; }) {
+    
     const { navigation } = props
 
-    const ItemSeprator = () => <View style={{
-        height: 2,
-        width: "100%",
-        backgroundColor: "red",
-    }}/>
+    let skin= new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobClassic.png", 0);
+    
+    let user1 = new User(1, "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, skin, [skin]);
+
+    let message = new Message(1, "bonjour je m'appelle alban et blablablablablablablafkfjsbndfihbsfiusbdfisdubfsdijbfisdjfbsdiufbsdifbsdifbsdibfsdifbsdifbsdifbsdibfsdibfsdiubfsdibfsdiubfsdiubfsqhdbqshjdbsqhbdqshbdqksjb", user1, new Date(2022,12,12));
+
 
     return (
-        <View style={{backgroundColor: 'blue', flex: 0.7, alignSelf: 'center'}}>
-            <FlatList 
-                data={listSkin}
-                numColumns={2}
-                columnWrapperStyle={{ flex: 1, justifyContent: "space-around"}}
-                keyExtractor={item =>item.getSkinName()}
-                renderItem={({item}) => <SkinComponent skin={item} state='shop'/>} />
+        <View style={{backgroundColor: '#45444D', flex: 1, flexDirection: 'column-reverse', paddingBottom: 50,}}>
+            <MessageComponent mess={message}></MessageComponent>
         </View>
     );
 }
 
-export default Test
-*/
\ No newline at end of file
+export default Test
\ No newline at end of file
diff --git a/bob_party/src/services/conversationService/loaderConversationApi.ts b/bob_party/src/services/conversationService/loaderConversationApi.ts
index 8e0a5b8..2dab3f1 100644
--- a/bob_party/src/services/conversationService/loaderConversationApi.ts
+++ b/bob_party/src/services/conversationService/loaderConversationApi.ts
@@ -27,11 +27,18 @@ export class LoaderConversationApi implements ILoaderConversation{
          })
          .then(function (response: any) {
             let skin= new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobClassic.png", 0);
+            let skin2= new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobBlue.png", 0);
+            let user1 = new User(1, "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, skin, [skin]);
+            let user2 = new User(3, "Fefe63", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 12222, 123324, 12, skin2, [skin]);
             tabConv=[new Conversation(1, 
-            [new User(1, "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, skin, [skin]),
-            new User(3, "Fefe63", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 12222, 123324, 12, skin, [skin])],
-            [new Message(1, "bonjour", new User(1, "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, skin, [skin]), new Date(2022,12,12)),
-            new Message(2, "test", new User(2, "Fefe63", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, skin, [skin]), new Date(2022,12,13))], "leNom")];
+                [user1, user2],
+                [
+                new Message(1, "bonjour", user1, new Date(2022,12,12)), 
+                new Message(2, "test", user2, new Date(2022,12,13)),
+                new Message(3, "Je m'appelle alban et j'aime trop faire les messages quand ça marche mais ya encore qq trucs qui marche pas donc un peu cool mais pas trop", user1, new Date(2022,12,14)), 
+                new Message(4, "Fefe63 est dans la place", user2, new Date(2022,12,15)), 
+                ]
+                , user1.getUsername()+user2.getUsername())];
         });
         return tabConv;
     }