Skip to content

Commit e5b5e69

Browse files
author
Tautvilas Mečinskas
authored
Merge pull request #303 from albinekb/disallow-font-scaling
πŸ› Disallow font scaling
2 parents 75d7882 + 0eb9f58 commit e5b5e69

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

β€Žsrc/agenda/index.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ export default class AgendaView extends Component {
401401
</Animated.View>
402402
<Animated.View style={weekdaysStyle}>
403403
{weekDaysNames.map((day) => (
404-
<Text key={day} style={this.styles.weekday} numberOfLines={1}>{day}</Text>
404+
<Text allowFontScaling={false} key={day} style={this.styles.weekday} numberOfLines={1}>{day}</Text>
405405
))}
406406
</Animated.View>
407407
<Animated.ScrollView

β€Žsrc/agenda/reservation-list/reservation.jsβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class ReservationListItem extends Component {
3939
if (date) {
4040
return (
4141
<View style={this.styles.day}>
42-
<Text style={[this.styles.dayNum, today]}>{date.getDate()}</Text>
43-
<Text style={[this.styles.dayText, today]}>{XDate.locales[XDate.defaultLocale].dayNamesShort[date.getDay()]}</Text>
42+
<Text allowFontScaling={false} style={[this.styles.dayNum, today]}>{date.getDate()}</Text>
43+
<Text allowFontScaling={false} style={[this.styles.dayText, today]}>{XDate.locales[XDate.defaultLocale].dayNamesShort[date.getDay()]}</Text>
4444
</View>
4545
);
4646
} else {
@@ -70,4 +70,4 @@ class ReservationListItem extends Component {
7070
}
7171
}
7272

73-
export default ReservationListItem;
73+
export default ReservationListItem;

β€Žsrc/calendar-list/item.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ class CalendarListItem extends Component {
4242
const text = row.toString();
4343
return (
4444
<View style={[{height: this.props.calendarHeight}, this.style.placeholder]}>
45-
<Text style={this.style.placeholderText}>{text}</Text>
45+
<Text allowFontScaling={false} style={this.style.placeholderText}>{text}</Text>
4646
</View>
4747
);
4848
}
4949
}
5050
}
5151

52-
export default CalendarListItem;
52+
export default CalendarListItem;

β€Žsrc/calendar/day/basic/index.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Day extends Component {
9797
: this.props.state === 'disabled'
9898
}
9999
>
100-
<Text style={textStyle}>{String(this.props.children)}</Text>
100+
<Text allowFontScaling={false} style={textStyle}>{String(this.props.children)}</Text>
101101
{dot}
102102
</TouchableOpacity>
103103
);

β€Žsrc/calendar/day/multi-dot/index.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Day extends Component {
9090
}
9191
return (
9292
<TouchableOpacity style={containerStyle} onPress={this.onDayPress}>
93-
<Text style={textStyle}>{String(this.props.children)}</Text>
93+
<Text allowFontScaling={false} style={textStyle}>{String(this.props.children)}</Text>
9494
<View style={{flexDirection: 'row'}}>{dot}</View>
9595
</TouchableOpacity>
9696
);

β€Žsrc/calendar/day/period/index.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class Day extends Component {
193193
<View style={this.style.wrapper}>
194194
{fillers}
195195
<View style={containerStyle}>
196-
<Text style={textStyle}>{String(this.props.children)}</Text>
196+
<Text allowFontScaling={false} style={textStyle}>{String(this.props.children)}</Text>
197197
</View>
198198
</View>
199199
</TouchableWithoutFeedback>

β€Žsrc/calendar/header/index.jsβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class CalendarHeader extends Component {
8888
<View style={this.style.header}>
8989
{leftArrow}
9090
<View style={{ flexDirection: 'row' }}>
91-
<Text style={this.style.monthText}>
91+
<Text allowFontScaling={false} style={this.style.monthText}>
9292
{this.props.month.toString(this.props.monthFormat ? this.props.monthFormat : 'MMMM yyyy')}
9393
</Text>
9494
{indicator}
@@ -98,9 +98,9 @@ class CalendarHeader extends Component {
9898
{
9999
!this.props.hideDayNames &&
100100
<View style={this.style.week}>
101-
{this.props.weekNumbers && <Text style={this.style.dayHeader}></Text>}
101+
{this.props.weekNumbers && <Text allowFontScaling={false} style={this.style.dayHeader}></Text>}
102102
{weekDaysNames.map((day, idx) => (
103-
<Text key={idx} style={this.style.dayHeader} numberOfLines={1}>{day}</Text>
103+
<Text allowFontScaling={false} key={idx} style={this.style.dayHeader} numberOfLines={1}>{day}</Text>
104104
))}
105105
</View>
106106
}

0 commit comments

Comments
Β (0)