Merge pull request #292 from paritytech/hanwen-button-color

fix: change button default color

src/colors.js

@@ -16,12 +16,11 @@
 
 export default {
   bg: '#1D1D1D',
+  bg_button: '#48acf0',
   bg_text: '#FFFFFF',
   bg_text_sec: '#B4B5B0',
-  bg_positive: '#72E762',
   bg_warning: '#FAE265',
   bg_alert: '#ED332B',
-  bg_text_positive: '#72E762',
   card_bg: '#F9F9F9',
   card_text: '#1A1A1A',
   card_bg_text_sec: '#B4B5B0'

src/components/Button.js

@@ -70,7 +70,7 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
     elevation: 4,
-    backgroundColor: colors.bg_text_sec,
+    backgroundColor: colors.bg_button,
     height: 60
   },
   text: {

src/components/Header.js

-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React from 'react';
-import { Image, SafeAreaView, StyleSheet, Text, View } from 'react-native';
-import colors from '../colors';
-
-export default function() {
-  return (
-    <SafeAreaView style={{ backgroundColor: colors.bg }}>
-      <View style={styles.row}>
-        <Image source={require('../../icon.png')} style={styles.logo} />
-        <Text style={styles.headerTextLeft}>parity</Text>
-        <Text style={styles.headerTextRight}>Secure</Text>
-      </View>
-    </SafeAreaView>
-  );
-}
-
-const styles = StyleSheet.create({
-  row: {
-    backgroundColor: colors.bg,
-    height: 60,
-    flexDirection: 'row',
-    alignItems: 'center',
-    padding: 14,
-    borderBottomWidth: 0.5,
-    borderBottomColor: colors.bg_text_sec
-  },
-  logo: {
-    width: 50,
-    height: 50
-  },
-  headerTextLeft: {
-    flex: 1,
-    paddingLeft: 10,
-    fontSize: 25,
-    fontFamily: 'Manifold CF',
-    fontWeight: '900',
-    color: colors.bg_text
-  },
-  headerTextRight: {
-    marginLeft: 0,
-    fontFamily: 'Roboto',
-    fontSize: 17,
-    fontWeight: 'bold',
-    color: colors.bg_text_positive
-  }
-});

src/screens/MessageDetails.js

@@ -105,9 +105,8 @@ export class MessageDetailsView extends React.PureComponent {
             : this.props.data}
         </Text>
         <Button
-          buttonStyles={{ backgroundColor: colors.bg_positive, height: 60 }}
+          buttonStyles={{ height: 60 }}
           title="Sign Message"
-          textStyles={{ color: colors.card_text }}
           onPress={() => this.props.onNext()}
         />
       </ScrollView>

src/screens/TxDetails.js

@@ -106,9 +106,8 @@ export class TxDetailsView extends React.PureComponent {
           networkKey={this.props.recipient.networkKey || ''}
         />
         <Button
-          buttonStyles={{ backgroundColor: colors.bg_positive, height: 60 }}
+          buttonStyles={{ height: 60 }}
           title="Sign Transaction"
-          textStyles={{ color: colors.card_text }}
           onPress={() => this.props.onNext()}
         />
       </ScrollView>