Merge branch 'master' into add-info

kazup01 · web-flow · commit f0ae62dd12dc · 2017-12-30T10:11:41.000+09:00
diff --git a/app/App.js b/app/App.js
@@ -72,7 +72,7 @@ const styles = {
             width: 0,
             height: 3,
         },
-        shadowColor: '#CF5425',
+        shadowColor: '#282C34',
         shadowOpacity: 0.4,
         shadowRadius: 6,
     },
diff --git a/app/views/DropboxNoteList.js b/app/views/DropboxNoteList.js
@@ -70,29 +70,14 @@ const styles = {
     fontSize: 21,
     marginRight: 20
   },
-  noteListIconWrap: {
-    backgroundColor: '#eeeeee',
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    width: 30,
-    height: 30,
-    borderRadius: 50,
-    overflow: 'hidden',
-    marginTop: 9
-  },
-  noteListIcon: {
-    fontSize: 14,
-    color: '#adadad'
-  },
   noteListText: {
     position: 'absolute',
     color: '#3a3941',
     backgroundColor: 'transparent',
     top: 15,
     fontSize: 14,
     width: '73%',
-    marginLeft: 40
+    marginLeft: 10
   },
   noteListTextNone: {
     position: 'absolute',
@@ -531,9 +516,6 @@ export default class DropboxNoteList extends Component {
                         key={note.fileName}
                         button onPress={() => this.setNoteModalOpen(note.path)}>
                         <Body>
-                        <View style={styles.noteListIconWrap}>
-                          <Icon name='md-code-working' style={styles.noteListIcon}/>
-                        </View>
                         <Text numberOfLines={1}
                               style={styles.noteListText}>{note.content}</Text>
                         <Text style={styles.noteListDate}>{moment(note.updatedAt).format('MMM D')}</Text>
diff --git a/app/views/note/DropboxNoteModal.js b/app/views/note/DropboxNoteModal.js
@@ -310,7 +310,7 @@ export default class DropboxNoteModal extends React.Component {
                     style={styles.switchEditButton}
                     onPress={this.handleSwitchEditButtonClick.bind(this)}>
                      <Text style={styles.switchEditText}>
-                         {this.state.isEditting ? 'Done' : 'Edit'}
+                         {this.state.isEditting ? 'Save' : 'Edit'}
                      </Text>
                   </Button>
                   <Button transparent onPress={() => ActionSheet.show(
@@ -330,7 +330,7 @@ export default class DropboxNoteModal extends React.Component {
                       }
                     }
                   )}>
-                    <Text><Icon name='md-more' style={styles.noteDetailButton}/></Text>
+                    <Text><Icon name='ios-more' style={styles.noteDetailButton}/></Text>
                   </Button>
                 </Root>
               </View>
diff --git a/app/views/note/NoteModal.js b/app/views/note/NoteModal.js
@@ -230,7 +230,7 @@ export default class NoteModal extends React.Component {
                                         style={styles.switchEditButton}
                                         onPress={this.handleSwitchEditButtonClick.bind(this)}>
                                          <Text style={styles.switchEditText}>
-                                             {this.state.isEditting ? 'Done' : 'Edit'}
+                                             {this.state.isEditting ? 'Save' : 'Edit'}
                                          </Text>
                                     </Button>
                                     <Button transparent onPress={() => ActionSheet.show(
