Skip to content

RTL Support #36

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

RTL Support #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5006f8
RTL Support
bamlhs Mar 29, 2019
0f7d3fb
Merge branch 'master' into master
bamlhs Mar 11, 2020
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
45 changes: 23 additions & 22 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ import {
View,
Text,
TouchableOpacity,
AppState
AppState,
I18nManager
} from 'react-native';
import _ from 'lodash';
import {sprintf} from 'sprintf-js';
import { sprintf } from 'sprintf-js';

const DEFAULT_DIGIT_STYLE = {backgroundColor: '#FAB913'};
const DEFAULT_DIGIT_TXT_STYLE = {color: '#000'};
const DEFAULT_TIME_LABEL_STYLE = {color: '#000'};
const DEFAULT_SEPARATOR_STYLE = {color: '#000'};
const DEFAULT_DIGIT_STYLE = { backgroundColor: '#FAB913' };
const DEFAULT_DIGIT_TXT_STYLE = { color: '#000' };
const DEFAULT_TIME_LABEL_STYLE = { color: '#000' };
const DEFAULT_SEPARATOR_STYLE = { color: '#000' };
const DEFAULT_TIME_TO_SHOW = ['D', 'H', 'M', 'S'];
const DEFAULT_TIME_LABELS = {
d: 'Days',
Expand Down Expand Up @@ -69,7 +70,7 @@ class CountDown extends React.Component {
}

_handleAppStateChange = currentAppState => {
const {until, wentBackgroundAt} = this.state;
const { until, wentBackgroundAt } = this.state;
if (currentAppState === 'active' && wentBackgroundAt && this.props.running) {
const diff = (Date.now() - wentBackgroundAt) / 1000.0;
this.setState({
Expand All @@ -78,12 +79,12 @@ class CountDown extends React.Component {
});
}
if (currentAppState === 'background') {
this.setState({wentBackgroundAt: Date.now()});
this.setState({ wentBackgroundAt: Date.now() });
}
}

getTimeLeft = () => {
const {until} = this.state;
const { until } = this.state;
return {
seconds: until % 60,
minutes: parseInt(until / 60, 10) % 60,
Expand All @@ -96,7 +97,6 @@ class CountDown extends React.Component {
// Don't fetch these values here, because their value might be changed
// in another thread
// const {lastUntil, until} = this.state;

if (this.state.lastUntil === this.state.until || !this.props.running) {
return;
}
Expand All @@ -109,6 +109,7 @@ class CountDown extends React.Component {
}
}


if (this.state.until === 0) {
this.setState({lastUntil: 0, until: 0});
} else {
Expand All @@ -123,7 +124,7 @@ class CountDown extends React.Component {
};

renderDigit = (d) => {
const {digitStyle, digitTxtStyle, size} = this.props;
const { digitStyle, digitTxtStyle, size } = this.props;
return (
<View style={[
styles.digitCont,
Expand All @@ -132,7 +133,7 @@ class CountDown extends React.Component {
]}>
<Text style={[
styles.digitTxt,
{fontSize: size},
{ fontSize: size },
digitTxtStyle,
]}>
{d}
Expand All @@ -142,12 +143,12 @@ class CountDown extends React.Component {
};

renderLabel = label => {
const {timeLabelStyle, size} = this.props;
const { timeLabelStyle, size } = this.props;
if (label) {
return (
<Text style={[
styles.timeTxt,
{fontSize: size / 1.8},
{ fontSize: size / 1.8 },
timeLabelStyle,
]}>
{label}
Expand All @@ -168,12 +169,12 @@ class CountDown extends React.Component {
};

renderSeparator = () => {
const {separatorStyle, size} = this.props;
const { separatorStyle, size } = this.props;
return (
<View style={{justifyContent: 'center', alignItems: 'center'}}>
<View style={{ justifyContent: 'center', alignItems: 'center' }}>
<Text style={[
styles.separatorTxt,
{fontSize: size * 1.2},
{ fontSize: size * 1.2 },
separatorStyle,
]}>
{':'}
Expand All @@ -183,9 +184,9 @@ class CountDown extends React.Component {
};

renderCountDown = () => {
const {timeToShow, timeLabels, showSeparator} = this.props;
const {until} = this.state;
const {days, hours, minutes, seconds} = this.getTimeLeft();
const { timeToShow, timeLabels, showSeparator } = this.props;
const { until } = this.state;
const { days, hours, minutes, seconds } = this.getTimeLeft();
const newTime = sprintf('%02d:%02d:%02d:%02d', days, hours, minutes, seconds).split(':');
const Component = this.props.onPress ? TouchableOpacity : View;

Expand Down Expand Up @@ -229,7 +230,7 @@ CountDown.defaultProps = {

const styles = StyleSheet.create({
timeCont: {
flexDirection: 'row',
flexDirection: (I18nManager.isRTL) ? 'row-reverse' : 'row',
justifyContent: 'center',
},
timeTxt: {
Expand All @@ -238,7 +239,7 @@ const styles = StyleSheet.create({
backgroundColor: 'transparent',
},
timeInnerCont: {
flexDirection: 'row',
flexDirection: (I18nManager.isRTL) ? 'row-reverse' : 'row',
justifyContent: 'center',
alignItems: 'center',
},
Expand Down