Skip to content

Commit 8f113af

Browse files
ryerye
committed
Fix indentation again
1 parent 2b2a9b7 commit 8f113af

File tree

2 files changed

+183
-183
lines changed

2 files changed

+183
-183
lines changed

‎source/views/streaming/radio/controller.js‎

Lines changed: 169 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import * as React from 'react'
44
import {
5-
Dimensions,
6-
Image,
7-
ScrollView,
8-
StyleSheet,
9-
Text,
10-
View,
11-
Platform,
5+
Dimensions,
6+
Image,
7+
ScrollView,
8+
StyleSheet,
9+
Text,
10+
View,
11+
Platform,
1212
} from 'react-native'
1313
import noop from 'lodash/noop'
1414
import * as c from '../../components/colors'
@@ -35,168 +35,168 @@ type State = {
3535
}
3636

3737
export class KSTOView extends React.PureComponent<Props, State> {
38-
static navigationOptions = {
39-
tabBarLabel: 'KSTO',
40-
tabBarIcon: TabBarIcon('radio'),
41-
}
42-
43-
state = {
44-
playState: 'paused',
45-
streamError: null,
46-
uplinkError: null,
47-
viewport: Dimensions.get('window'),
48-
}
49-
50-
componentWillMount() {
51-
Dimensions.addEventListener('change', this.handleResizeEvent)
52-
}
53-
54-
componentWillUnmount() {
55-
Dimensions.removeEventListener('change', this.handleResizeEvent)
56-
}
57-
58-
handleResizeEvent = (event: {window: {width: number, height: number}}) => {
59-
this.setState(() => ({viewport: event.window}))
60-
}
61-
62-
play = () => {
63-
this.setState(() => ({playState: 'checking'}))
64-
}
65-
66-
pause = () => {
67-
this.setState(() => ({playState: 'paused'}))
68-
}
69-
70-
handleStreamPlay = () => {
71-
this.setState(() => ({playState: 'playing'}))
72-
}
73-
74-
handleStreamPause = () => {
75-
this.setState(() => ({playState: 'paused'}))
76-
}
77-
78-
handleStreamEnd = () => {
79-
this.setState(() => ({playState: 'paused'}))
80-
}
81-
82-
handleStreamError = (e: {code: number, message: string}) => {
83-
this.setState(() => ({streamError: e, playState: 'paused'}))
84-
}
85-
86-
openSchedule = () => {
87-
this.props.navigation.navigate('KSTOScheduleView')
88-
}
89-
90-
callStation = () => {
91-
callPhone(stationNumber)
92-
}
93-
94-
openStreamWebsite = () => {
95-
openUrl(kstoLiveUrl)
96-
}
97-
98-
renderPlayButton = (state: PlayState) => {
99-
if (Platform.OS === 'android') {
100-
return (
101-
<ActionButton
102-
icon="ios-planet"
103-
onPress={this.openStreamWebsite}
104-
text="Open"
105-
/>
106-
)
107-
}
108-
109-
switch (state) {
110-
case 'paused':
111-
return (
112-
<ActionButton icon="ios-play" onPress={this.play} text="Listen" />
113-
)
114-
115-
case 'checking':
116-
return (
117-
<ActionButton icon="ios-more" onPress={this.pause} text="Starting" />
118-
)
119-
120-
case 'playing':
121-
return (
122-
<ActionButton icon="ios-pause" onPress={this.pause} text="Pause" />
123-
)
124-
125-
default:
126-
return <ActionButton icon="ios-bug" onPress={noop} text="Error" />
127-
}
128-
}
129-
130-
render() {
131-
const sideways = this.state.viewport.width > this.state.viewport.height
132-
133-
const logoWidth = Math.min(
134-
this.state.viewport.width / 1.5,
135-
this.state.viewport.height / 1.75,
136-
)
137-
138-
const logoSize = {
139-
width: logoWidth,
140-
height: logoWidth,
141-
}
142-
143-
const error = this.state.uplinkError ? (
144-
<Text style={styles.status}>{this.state.uplinkError}</Text>
145-
) : this.state.streamError ? (
146-
<Text style={styles.status}>
147-
Error Code {this.state.streamError.code}:{' '}
148-
{this.state.streamError.message}
149-
</Text>
150-
) : null
151-
152-
return (
153-
<ScrollView
154-
contentContainerStyle={[styles.root, sideways && landscape.root]}
155-
>
156-
<View style={[styles.logoWrapper, sideways && landscape.logoWrapper]}>
157-
<Image
158-
resizeMode="contain"
159-
source={image}
160-
style={[styles.logo, logoSize]}
161-
/>
162-
</View>
163-
164-
<View style={styles.container}>
165-
<View style={styles.titleWrapper}>
166-
<Text selectable={true} style={styles.heading}>
167-
St. Olaf College Radio
168-
</Text>
169-
<Text selectable={true} style={styles.subHeading}>
170-
KSTO 93.1 FM
171-
</Text>
172-
173-
{error}
174-
</View>
175-
176-
<Row>
177-
{this.renderPlayButton(this.state.playState)}
178-
<View style={styles.spacer} />
179-
<CallButton onPress={this.callStation} />
180-
<View style={styles.spacer} />
181-
<ShowCalendarButton onPress={this.openSchedule} />
182-
</Row>
183-
184-
{Platform.OS !== 'android' ? (
185-
<StreamPlayer
186-
onEnded={this.handleStreamEnd}
187-
// onWaiting={this.handleStreamWait}
188-
onError={this.handleStreamError}
189-
// onStalled={this.handleStreamStall}
190-
onPause={this.handleStreamPause}
191-
onPlay={this.handleStreamPlay}
192-
playState={this.state.playState}
193-
style={styles.webview}
194-
/>
195-
) : null}
196-
</View>
197-
</ScrollView>
198-
)
199-
}
38+
static navigationOptions = {
39+
tabBarLabel: 'KSTO',
40+
tabBarIcon: TabBarIcon('radio'),
41+
}
42+
43+
state = {
44+
playState: 'paused',
45+
streamError: null,
46+
uplinkError: null,
47+
viewport: Dimensions.get('window'),
48+
}
49+
50+
componentWillMount() {
51+
Dimensions.addEventListener('change', this.handleResizeEvent)
52+
}
53+
54+
componentWillUnmount() {
55+
Dimensions.removeEventListener('change', this.handleResizeEvent)
56+
}
57+
58+
handleResizeEvent = (event: {window: {width: number, height: number}}) => {
59+
this.setState(() => ({viewport: event.window}))
60+
}
61+
62+
play = () => {
63+
this.setState(() => ({playState: 'checking'}))
64+
}
65+
66+
pause = () => {
67+
this.setState(() => ({playState: 'paused'}))
68+
}
69+
70+
handleStreamPlay = () => {
71+
this.setState(() => ({playState: 'playing'}))
72+
}
73+
74+
handleStreamPause = () => {
75+
this.setState(() => ({playState: 'paused'}))
76+
}
77+
78+
handleStreamEnd = () => {
79+
this.setState(() => ({playState: 'paused'}))
80+
}
81+
82+
handleStreamError = (e: {code: number, message: string}) => {
83+
this.setState(() => ({streamError: e, playState: 'paused'}))
84+
}
85+
86+
openSchedule = () => {
87+
this.props.navigation.navigate('KSTOScheduleView')
88+
}
89+
90+
callStation = () => {
91+
callPhone(stationNumber)
92+
}
93+
94+
openStreamWebsite = () => {
95+
openUrl(kstoLiveUrl)
96+
}
97+
98+
renderPlayButton = (state: PlayState) => {
99+
if (Platform.OS === 'android') {
100+
return (
101+
<ActionButton
102+
icon="ios-planet"
103+
onPress={this.openStreamWebsite}
104+
text="Open"
105+
/>
106+
)
107+
}
108+
109+
switch (state) {
110+
case 'paused':
111+
return (
112+
<ActionButton icon="ios-play" onPress={this.play} text="Listen" />
113+
)
114+
115+
case 'checking':
116+
return (
117+
<ActionButton icon="ios-more" onPress={this.pause} text="Starting" />
118+
)
119+
120+
case 'playing':
121+
return (
122+
<ActionButton icon="ios-pause" onPress={this.pause} text="Pause" />
123+
)
124+
125+
default:
126+
return <ActionButton icon="ios-bug" onPress={noop} text="Error" />
127+
}
128+
}
129+
130+
render() {
131+
const sideways = this.state.viewport.width > this.state.viewport.height
132+
133+
const logoWidth = Math.min(
134+
this.state.viewport.width / 1.5,
135+
this.state.viewport.height / 1.75,
136+
)
137+
138+
const logoSize = {
139+
width: logoWidth,
140+
height: logoWidth,
141+
}
142+
143+
const error = this.state.uplinkError ? (
144+
<Text style={styles.status}>{this.state.uplinkError}</Text>
145+
) : this.state.streamError ? (
146+
<Text style={styles.status}>
147+
Error Code {this.state.streamError.code}:{' '}
148+
{this.state.streamError.message}
149+
</Text>
150+
) : null
151+
152+
return (
153+
<ScrollView
154+
contentContainerStyle={[styles.root, sideways && landscape.root]}
155+
>
156+
<View style={[styles.logoWrapper, sideways && landscape.logoWrapper]}>
157+
<Image
158+
resizeMode="contain"
159+
source={image}
160+
style={[styles.logo, logoSize]}
161+
/>
162+
</View>
163+
164+
<View style={styles.container}>
165+
<View style={styles.titleWrapper}>
166+
<Text selectable={true} style={styles.heading}>
167+
St. Olaf College Radio
168+
</Text>
169+
<Text selectable={true} style={styles.subHeading}>
170+
KSTO 93.1 FM
171+
</Text>
172+
173+
{error}
174+
</View>
175+
176+
<Row>
177+
{this.renderPlayButton(this.state.playState)}
178+
<View style={styles.spacer} />
179+
<CallButton onPress={this.callStation} />
180+
<View style={styles.spacer} />
181+
<ShowCalendarButton onPress={this.openSchedule} />
182+
</Row>
183+
184+
{Platform.OS !== 'android' ? (
185+
<StreamPlayer
186+
onEnded={this.handleStreamEnd}
187+
// onWaiting={this.handleStreamWait}
188+
onError={this.handleStreamError}
189+
// onStalled={this.handleStreamStall}
190+
onPause={this.handleStreamPause}
191+
onPlay={this.handleStreamPlay}
192+
playState={this.state.playState}
193+
style={styles.webview}
194+
/>
195+
) : null}
196+
</View>
197+
</ScrollView>
198+
)
199+
}
200200
}
201201

202202
const styles = StyleSheet.create({

‎source/views/streaming/radio/player.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class StreamPlayer extends React.PureComponent<Props> {
9999

100100
setRef = (ref: WebView) => (this._webview = ref)
101101

102-
js = `
102+
js = `
103103
function ready(fn) {
104104
if (document.readyState !== 'loading') {
105105
fn();
@@ -182,17 +182,17 @@ export class StreamPlayer extends React.PureComponent<Props> {
182182
});
183183
`
184184

185-
render() {
186-
return (
187-
<WebView
188-
ref={this.setRef}
189-
allowsInlineMediaPlayback={true}
190-
injectedJavaScript={this.js}
191-
mediaPlaybackRequiresUserAction={false}
192-
onMessage={this.handleMessage}
193-
source={{uri: kstoEmbed}}
194-
style={this.props.style}
195-
/>
196-
)
197-
}
185+
render() {
186+
return (
187+
<WebView
188+
ref={this.setRef}
189+
allowsInlineMediaPlayback={true}
190+
injectedJavaScript={this.js}
191+
mediaPlaybackRequiresUserAction={false}
192+
onMessage={this.handleMessage}
193+
source={{uri: kstoEmbed}}
194+
style={this.props.style}
195+
/>
196+
)
197+
}
198198
}

0 commit comments

Comments
 (0)