Skip to content

added cancel button at the bottom #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rnfomin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added cancel button at the bottom #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions Calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ export default class Calendar extends Component {
'end': '结 束',
'date': '日 期',
'save': '保 存',
'clear': '清除'
'clear': '清除',
'cancel':'取消'
},
'date': 'M月D日'
},
Expand All @@ -55,7 +56,8 @@ export default class Calendar extends Component {
'end': 'End',
'date': 'Date',
'save': 'Save',
'clear': 'Reset'
'clear': 'Reset',
'cancel': 'Cancel'
},
'date': 'DD / MM'
},
Expand All @@ -67,7 +69,8 @@ export default class Calendar extends Component {
'end': 'エンド',
'date': '時　間',
'save': '確　認',
'clear': 'クリア'
'clear': 'クリア',
'cancel':'キャンセル'
},
'date': 'M月D日'
}
Expand Down Expand Up @@ -293,26 +296,38 @@ export default class Calendar extends Component {
{isValid ?
<TouchableHighlight
underlayColor="rgba(255, 255, 255, 0.45)"
style={styles.confirmContainer}
style={styles.buttonContainer}
onPress={this.confirm}>
<View style={styles.confirmBtn}>
<View style={styles.buttonTextContainer}>
<Text
ellipsisMode="tail" numberOfLines={1}
style={[styles.confirmText, subFontColor]}>
style={[styles.buttonText, subFontColor]}>
{this._i18n('save', 'text')}
</Text>
</View>
</TouchableHighlight> :
<View style={[styles.confirmContainer, styles.confirmContainerDisabled]}>
<View style={styles.confirmBtn}>
<View style={[styles.buttonContainer, styles.confirmContainerDisabled]}>
<View style={styles.buttonTextContainer}>
<Text
ellipsisMode="tail" numberOfLines={1}
style={[styles.confirmText, styles.confirmTextDisabled]}>
style={[styles.buttonText, styles.confirmTextDisabled]}>
{this._i18n('save', 'text')}
</Text>
</View>
</View>
}
<TouchableHighlight
underlayColor="rgba(255, 255, 255, 0.45)"
style={styles.buttonContainer}
onPress={this.cancel}>
<View style={styles.buttonTextContainer}>
<Text
ellipsisMode="tail" numberOfLines={1}
style={[styles.buttonText, subFontColor]}>
{this._i18n('cancel', 'text')}
</Text>
</View>
</TouchableHighlight>
</View>
</View>
</Modal>
Expand Down
7 changes: 4 additions & 3 deletions CalendarStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ export default StyleSheet.create({
btn: {
flex: 1.5,
justifyContent: 'center',
alignItems: 'center'
alignItems: 'center',
flexDirection:'row'
},
confirmContainer: {
buttonContainer: {
overflow: 'hidden',
backgroundColor: 'rgba(255, 255, 255, 0.40)',
borderRadius: 4,
Expand All @@ -95,7 +96,7 @@ export default StyleSheet.create({
confirmContainerDisabled: {
backgroundColor: 'rgba(255, 255, 255, 0.20)'
},
confirmText: {
buttonText: {
fontSize: 16,
fontWeight: 'bold',
textAlign: 'center'
Expand Down