Commit 65b74a0c authored by W.D.R.P. Sandeepa's avatar W.D.R.P. Sandeepa

Merge branch 'it18218640' into 'master'

It18218640

See merge request !77
parents 512afb6a d9d17d74
...@@ -3,4 +3,5 @@ import App from './App'; ...@@ -3,4 +3,5 @@ import App from './App';
import {name as appName} from './app.json'; import {name as appName} from './app.json';
AppRegistry.registerComponent(appName, () => App); AppRegistry.registerComponent(appName, () => App);
\ No newline at end of file
...@@ -2,6 +2,7 @@ import { useNavigation } from "@react-navigation/native"; ...@@ -2,6 +2,7 @@ import { useNavigation } from "@react-navigation/native";
import React from "react"; import React from "react";
import {Text, TouchableOpacity, StyleSheet, View, Image} from 'react-native' import {Text, TouchableOpacity, StyleSheet, View, Image} from 'react-native'
export default function ColorActivity(props){ export default function ColorActivity(props){
const {title, image, id, color, des} = props; const {title, image, id, color, des} = props;
......
...@@ -56,8 +56,8 @@ export default function Color(){ ...@@ -56,8 +56,8 @@ export default function Color(){
</View> </View>
</View> </View>
{datas.map((data) =>{ {datas.map((data, index) =>{
return(<ColorActivity title={data.name} image={data.image} id={data.idcolorActivities} des={data.des} color={data.color}/>) return(<ColorActivity key={index} title={data.name} image={data.image} id={data.idcolorActivities} des={data.des} color={data.color}/>)
})} })}
</ScrollView> </ScrollView>
......
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