Skip to content
This repository was archived by the owner on Feb 21, 2020. It is now read-only.

Commit fbd917b

Browse files
authored
Merge pull request #147 from BoostIO/new-style
New style
2 parents f5bb7d8 + a87b997 commit fbd917b

File tree

18 files changed

+467
-373
lines changed

18 files changed

+467
-373
lines changed

β€Žandroid/app/build.gradleβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ android {
138138
}
139139

140140
dependencies {
141+
compile project(':react-native-svg')
141142
compile project(':react-native-device-info')
142143
compile project(':react-native-code-push')
143144
compile project(':react-native-fetch-blob')

β€Žandroid/app/src/main/java/io/boostnote/MainApplication.javaβ€Ž

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44

55
import com.RNFetchBlob.RNFetchBlobPackage;
66
import com.facebook.react.ReactApplication;
7+
import com.horcrux.svg.SvgPackage;
78
import com.facebook.react.ReactNativeHost;
89
import com.facebook.react.ReactPackage;
910
import com.facebook.soloader.SoLoader;
1011
import com.learnium.RNDeviceInfo.RNDeviceInfo;
1112
import com.microsoft.codepush.react.CodePush;
13+
import com.horcrux.svg.SvgPackage;
1214

1315
import java.util.Arrays;
1416
import java.util.List;
@@ -33,7 +35,8 @@ protected List<ReactPackage> getPackages() {
3335
new MyMainReactPackage(),
3436
new RNDeviceInfo(),
3537
new RNFetchBlobPackage(),
36-
new CodePush("byLfL38UaCCfKxo_2kTLHuR190e81a2d16b3-a6fd-494f-8deb-050bb34a68be", MainApplication.this, BuildConfig.DEBUG)
38+
new CodePush("byLfL38UaCCfKxo_2kTLHuR190e81a2d16b3-a6fd-494f-8deb-050bb34a68be", MainApplication.this, BuildConfig.DEBUG),
39+
new SvgPackage()
3740
);
3841
}
3942
};

β€Žandroid/settings.gradleβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
rootProject.name = 'boostnotemobile'
2+
include ':react-native-svg'
3+
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
24
include ':react-native-device-info'
35
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
46
include ':react-native-fetch-blob'

β€Žapp/App.jsβ€Ž

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,24 @@ const DEFAULT_FOLDER = "DEFAULT_FOLDER"
3737

3838
const styles = {
3939
iosHeader: {
40-
backgroundColor: '#239F85',
40+
backgroundColor: '#f9f9f9',
4141
},
4242
androidHeader: {
43-
backgroundColor: '#29BB9C',
43+
backgroundColor: '#f9f9f9',
4444
height: 70
4545
},
4646
iOsAppName: {
47-
color: '#ffffff',
48-
fontSize: 21,
49-
fontWeight: '300',
47+
color: '#1ec38b',
48+
fontSize: 18,
49+
fontWeight: '600',
5050
},
5151
androidAppName: {
52-
color: '#ffffff',
53-
fontSize: 21,
54-
fontWeight: '300',
52+
color: '#1ec38b',
53+
fontSize: 18,
54+
fontWeight: '600',
5555
},
5656
headerMenuButton: {
57-
color: '#ffffff',
57+
color: '#1ec38b',
5858
fontSize: 24,
5959
},
6060
headerRightMenuButton: {
@@ -80,7 +80,7 @@ const styles = {
8080
display: 'flex',
8181
alignItems: 'center',
8282
justifyContent: 'center',
83-
backgroundColor: '#D15419',
83+
backgroundColor: '#1ec38b',
8484
width: 60,
8585
height: 60,
8686
borderRadius: 50,
@@ -337,7 +337,7 @@ export default class App extends Component {
337337
<Left>
338338
<View>
339339
<Button transparent onPress={this.openDrawer}>
340-
<Icon name='md-list' style={styles.headerMenuButton}/>
340+
<Icon name='md-reorder' style={styles.headerMenuButton}/>
341341
</Button>
342342
</View>
343343
</Left>
@@ -347,7 +347,7 @@ export default class App extends Component {
347347
<Title style={Platform.OS === 'android' ? styles.androidAppName : styles.iOsAppName}>
348348
{
349349
mode === 0
350-
? 'NOTES'
350+
? 'All Notes'
351351
: 'Dropbox'
352352
}
353353
</Title>
@@ -380,7 +380,7 @@ export default class App extends Component {
380380
onPress={() => this.onPressActionButton()}
381381
style={styles.newPostButtonWrap}>
382382
<View style={styles.newPostButton}>
383-
<Icon name='md-create' style={{color: "#fff"}}/>
383+
<Icon name='md-add' style={{color: "#fff"}}/>
384384
</View>
385385
</Button>
386386
<NoteModal setIsOpen={this.setNoteModalIsOpen}
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
Β (0)