Skip to content

Commit ad35b31

Browse files
soyjavisoyjavi
committed
Change theme
1 parent 926d82a commit ad35b31

15 files changed

Lines changed: 35 additions & 43 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# <a href='http://sohobase.co/splitbits/'><img src='https://i.imgur.com/ABE1Otk.png' height='64'></a>
22

3-
[![version](https://img.shields.io/badge/v-0.9.1-blue.svg?style=for-the-badge)]()
3+
[![version](https://img.shields.io/badge/v-0.9.2-blue.svg?style=for-the-badge)]()
44
[![slack](https://img.shields.io/badge/slack--blue.svg?style=for-the-badge)](https://sohobase.slack.com/join/shared_invite/enQtMjUxMjI4MjEyNjQ2LTNkYWRjY2VkMmEwNzRkYjg3Y2JmOTU5ODliMDBiODgwZWQ3MjcwM2IwOWIyYTAxODkyYWQ2NDY4N2ZiOGMxZjc)
55
[![support](https://img.shields.io/badge/support--blue.svg?style=for-the-badge)](support@sohobase.co)
66
[![Donate](https://img.shields.io/badge/donate-₿-yellow.svg?style=for-the-badge)](https://chart.googleapis.com/chart?chs=320x320&cht=qr&chl=bitcoin:19hdnHUYwTSCffNKazV379r9HrwNwEfeeA?amount=0.001) [![Donate](https://img.shields.io/badge/donate-Ł-lightgrey.svg?style=for-the-badge)]()

‎app.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
"slug": "sohobase-splitbits",
66
"privacy": "unlisted",
77
"sdkVersion": "25.0.0",
8-
"version": "0.9.1",
8+
"version": "0.9.2",
99
"orientation": "portrait",
10-
"primaryColor": "#2f2bad",
10+
"primaryColor": "#141414",
1111
"icon": "./assets/app-icon.png",
1212
"loading": {
1313
"icon": "./assets/app-sohobase.png",
1414
"hideExponentText": true,
15-
"backgroundColor": "#2f2bad"
15+
"backgroundColor": "#141414"
1616
},
1717
"notification": {
1818
"icon": "./assets/app-notification.png",
19-
"color": "#2f2bad"
19+
"color": "#141414"
2020
},
2121
"ios": {
2222
"bundleIdentifier": "com.sohobase.splitbits",
23-
"buildNumber": "901",
23+
"buildNumber": "902",
2424
"supportsTablet": false,
2525
},
2626
"android": {
2727
"package": "com.sohobase.splitbits",
2828
"permissions": ["ACCESS_NETWORK_STATE", "CAMERA", "VIBRATE", "USE_FINGERPRINT", "WRITE_EXTERNAL_STORAGE"],
29-
"versionCode": 901
29+
"versionCode": 902
3030
},
3131
"androidStatusBar": {
32-
"backgroundColor": "#2f2bad",
32+
"backgroundColor": "#141414",
3333
"barStyle": "light-content"
3434
},
3535
"assetBundlePatterns": [

‎assets/app-icon.png‎

199 KB
Loading

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Splitbits",
33
"description": "Next-gen private & friendly mobile wallet for your cryptos.",
4-
"version": "0.9.1",
4+
"version": "0.9.2",
55
"author": {
66
"name": "Javi Jimenez",
77
"email": "javi@sohobase.co",

‎src/components/Button.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { LinearGradient } from 'expo';
12
import { array, bool, func, node, number, object, oneOfType, shape, string } from 'prop-types';
23
import React from 'react';
34
import { StyleSheet, Text } from 'react-native';
@@ -10,7 +11,7 @@ import { SHAPE, STYLE, THEME } from '../config';
1011
import styles from './Button.style';
1112

1213
const Button = ({
13-
accent, caption, captionStyle, children, circle, disabled, i18n, icon, onPress, processing, raised, style, motion,
14+
caption, captionStyle, children, circle, disabled, i18n, icon, onPress, processing, raised, style, motion,
1415
}) => (
1516
<Touchable
1617
onPress={!disabled && !processing ? onPress : undefined}
@@ -24,14 +25,22 @@ const Button = ({
2425
STYLE.CENTERED,
2526
(circle && styles.circle),
2627
(!circle && !raised && styles.square),
27-
(!disabled && !processing && !raised && !accent && styles.primary),
28-
(!disabled && !processing && !raised && accent && styles.accent),
2928
(raised && styles.raised),
3029
((disabled || processing) && !raised && styles.disabled),
3130
(disabled && raised && styles.disabledOpacity),
3231
style,
3332
])}
3433
>
34+
{ !disabled && !processing && !raised &&
35+
<LinearGradient
36+
colors={[THEME.COLOR.ACCENT_DARKEN, THEME.COLOR.ACCENT]}
37+
start={[0, 0]}
38+
end={[1, 0]}
39+
style={StyleSheet.flatten([
40+
styles.gradient,
41+
circle ? styles.circle : styles.square,
42+
])}
43+
/>}
3544
{ icon &&
3645
<Icon value={icon} style={[styles.icon, captionStyle]} /> }
3746
{ caption && !processing && <Text style={[styles.caption, captionStyle]}>{caption}</Text> }
@@ -45,7 +54,6 @@ const Button = ({
4554
);
4655

4756
Button.propTypes = {
48-
accent: bool,
4957
caption: string,
5058
captionStyle: oneOfType([array, number, object]),
5159
children: node,
@@ -61,7 +69,6 @@ Button.propTypes = {
6169
};
6270

6371
Button.defaultProps = {
64-
accent: false,
6572
caption: undefined,
6673
captionStyle: [],
6774
children: undefined,

‎src/components/Button.style.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,22 @@ export default StyleSheet.create({
2525
backgroundColor: COLOR.TRANSPARENT,
2626
},
2727

28-
primary: {
29-
backgroundColor: COLOR.PRIMARY,
30-
shadowColor: COLOR.PRIMARY,
31-
shadowOffset: { height: 6 },
32-
shadowOpacity: 0.5,
33-
shadowRadius: 6,
28+
disabled: {
29+
backgroundColor: COLOR.DIVIDER,
3430
},
3531

36-
accent: {
32+
gradient: {
3733
backgroundColor: COLOR.ACCENT,
34+
bottom: 0,
35+
left: 0,
36+
position: 'absolute',
37+
right: 0,
3838
shadowColor: COLOR.ACCENT,
3939
shadowOffset: { height: 6 },
4040
shadowOpacity: 0.5,
4141
shadowRadius: 6,
42-
},
43-
44-
disabled: {
45-
backgroundColor: COLOR.DIVIDER,
42+
top: 0,
43+
zIndex: -1,
4644
},
4745

4846
disabledOpacity: {

‎src/components/QRreader.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ class QRreader extends Component {
6565
</View>
6666
<View style={styles.border}>
6767
<Button
68-
accent
6968
motion={{ animation: 'bounceInUp', delay: 300, duration: DURATION }}
7069
circle
7170
icon="close"

‎src/config/theme.js‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
import Color from 'color';
22
import { Dimensions, Platform } from 'react-native';
33

4-
import C from './constants';
5-
6-
const { DEV } = C;
74
const UNIT = 10;
85
const OFFSET = UNIT * 1.6;
9-
const PRIMARY = '#2F2BAD';
10-
const ACCENT = '#F71568';
116
const WHITE = '#ffffff';
127
const BLACK = '#000000';
138
const DISABLED = 0.38;
@@ -36,18 +31,16 @@ export default {
3631
BUTTON_CIRCLE_SIZE: UNIT * 6.4,
3732

3833
COLOR: {
39-
PRIMARY: DEV ? BLACK : PRIMARY,
40-
ACCENT,
34+
PRIMARY: '#141414',
35+
ACCENT: '#E34B89',
36+
ACCENT_DARKEN: '#70206F',
4137
BLUE: '#303498',
4238
PINK: '#ff4566',
4339
GREEN: '#5edeb3',
4440
RED: '#F44336',
4541
TRANSPARENT: 'transparent',
4642
WHITE,
4743
BLACK,
48-
BTC: PRIMARY,
49-
ETH: 'transparent',
50-
LTC: '#B6B6BA',
5144

5245
BACKGROUND: WHITE,
5346
BACKGROUND_HIGHLIGHT: Color(WHITE).alpha(0.15),

‎src/containers/DeviceItem.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ class DeviceItem extends Component {
6868
</View>
6969
{ request && !requested &&
7070
<Button
71-
accent
7271
caption={i18n.REQUEST}
7372
style={styles.button}
7473
captionStyle={styles.buttonCaption}

‎src/containers/ModalMnemonic.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class ModalMnemonic extends Component {
8383
</View>
8484

8585
<Button
86-
accent
8786
caption={readOnly ? i18n.PAPER_KEY_DONE : i18n.NEXT}
8887
disabled={!readOnly && !MnemonicService.validate(words)}
8988
onPress={readOnly ? _onBackup : _onRecover}

0 commit comments

Comments
 (0)