3 次程式碼提交

作者 SHA1 備註 提交日期
  juan.hernandez41 eec51e748e modificaciones al background y botones 2 年之前
  juan.hernandez41 2615e977b1 test commit 2 年之前
  juan.hernandez41 e77862625e test commit 2 年之前
共有 3 個檔案被更改,包括 34619 行新增19819 行删除
  1. 44
    21
      App.js
  2. 25081
    10674
      package-lock.json
  3. 9494
    9124
      yarn.lock

+ 44
- 21
App.js 查看文件

@@ -4,7 +4,7 @@ import { View, Image, StyleSheet, Text, Button, ScrollView } from 'react-native'
4 4
 import data from './transfer.json' 
5 5
 
6 6
 
7
-//test
7
+
8 8
 
9 9
 //change this to an external css file later
10 10
 const styles = StyleSheet.create({
@@ -12,7 +12,10 @@ const styles = StyleSheet.create({
12 12
   buttons: {
13 13
 	  flexDirection: 'row',
14 14
 	  justifyContent: 'center',
15
-	  marginTop: 30
15
+	  marginTop: 30,
16
+	  marginBottom: 30,
17
+	  margin: "4px",
18
+	  borderColor: "grey",
16 19
   },
17 20
   container: {
18 21
     flexDirection: 'column',
@@ -20,7 +23,13 @@ const styles = StyleSheet.create({
20 23
     backgroundColor: 'black',
21 24
     alignItems: 'center',
22 25
     justifyContent: 'center',
23
-	marginTop: 20
26
+	marginTop: 20,
27
+	marginBottom: 500
28
+  },
29
+  containerbackground:{
30
+	
31
+    backgroundColor: '#063970',
32
+	padding: "40px"
24 33
   },
25 34
   intro: {
26 35
 	  fontWeight: "bold",
@@ -30,6 +39,7 @@ const styles = StyleSheet.create({
30 39
   },
31 40
   sub: {
32 41
       color:"#D7D6D6",
42
+	  
33 43
 	  fontSize: 20,
34 44
   },
35 45
   scrollView:{
@@ -52,21 +62,27 @@ function importJSON() {
52 62
 //states
53 63
 
54 64
 let states = {
65
+	
55 66
 		welcome:
56 67
 		  
68
+
69
+		<View style = {styles.containerbackground}>
57 70
 		  <View style = {styles.container}>
58 71
 		  
59 72
 		  
60
-			<Text style={styles.intro}>WELCOME!!!!</Text>
73
+			<Text style={styles.intro}>BIENVENIDO!!!!</Text>
61 74
 		
62
-			<Text style={styles.sub}>オレノウタヲキケ!</Text>
75
+			<Text style={styles.sub}>Aqui podra mantenerse al tanto con las 
76
+			ultimas noticias relacionadas al censo</Text>
63 77
 			 
64 78
 			<Image source={require('./testimg.gif')} />
65 79
 			
66
-		  </View>,
80
+		  </View>
81
+		</View>,
67 82
 		  
68 83
 		dataView:
69 84
 		
85
+		<View style = {styles.containerbackground}>
70 86
 		<ScrollView style={styles.scrollView}>
71 87
 		 <View style = {styles.container}>
72 88
 		  
@@ -78,7 +94,7 @@ let states = {
78 94
 			<Image source={require('./testimg.gif')} />
79 95
 			
80 96
 		 </View>
81
-		</ScrollView>
97
+		</ScrollView></View>
82 98
 	}
83 99
 
84 100
 
@@ -97,21 +113,28 @@ setData = () => this.setState({ current: states.dataView })
97 113
    render() {
98 114
       return (
99 115
 	  <View>
100
-		<View style = {styles.buttons}>
101
-			  <Button
102
-				 onPress = {this.setHome}
103
-				 title = "Noticias"
104
-				 color = "blue"
105
-			  />
116
+		
117
+			<View style = {styles.containerbackground}>
118
+				<View style = {styles.container}>
119
+					<Text style={styles.sub}> Navegador</Text>
120
+						<View style = {styles.buttons}>
121
+			 		 			<Button
122
+								 onPress = {this.setHome}
123
+				 				title = "Noticias"
124
+				 				color = "blue"
125
+			  					/>
106 126
 			  
107
-			  <Button
108
-				 onPress = {this.setData}
109
-				 title = "Datos"
110
-				 color = "black"
111
-			  />
112
-		  </View>
113
-		  {this.state.current}
114
-	</View>
127
+			  					<Button
128
+								 onPress = {this.setData}
129
+								 title = "Datos"
130
+								 color = "black"
131
+			  					/>
132
+
133
+						</View>
134
+		  				{this.state.current}
135
+						</View>
136
+			</View>
137
+		</View>
115 138
       );
116 139
    }
117 140
 }

+ 25081
- 10674
package-lock.json
文件差異過大導致無法顯示
查看文件


+ 9494
- 9124
yarn.lock
文件差異過大導致無法顯示
查看文件