Skip to content

Commit

Permalink
chore(deps-dev): Bump @amaurymartiny/config from 1.0.11 to 1.1.0 (#521)
Browse files Browse the repository at this point in the history
* chore(deps-dev): Bump @amaurymartiny/config from 1.0.11 to 1.1.0

Bumps [@amaurymartiny/config](https://github.com/amaurymartiny/config) from 1.0.11 to 1.1.0.
- [Release notes](https://github.com/amaurymartiny/config/releases)
- [Changelog](https://github.com/amaurymartiny/config/blob/master/CHANGELOG.md)
- [Commits](https://github.com/amaurymartiny/config/compare/v1.0.11...v1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* yarn lint --fix

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Amaury Martiny <amaury.martiny@protonmail.com>
  • Loading branch information
dependabot-preview[bot] and amaury1093 authored Mar 30, 2020
1 parent fc9ebd1 commit cf8db9b
Show file tree
Hide file tree
Showing 55 changed files with 457 additions and 389 deletions.
16 changes: 7 additions & 9 deletions App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
FrequencyContextProvider,
getApolloClient,
LocationContextProvider,
TCacheShape
TCacheShape,
} from './stores';
import { setupAmplitude, track } from './util/amplitude';
import { IS_SENTRY_SET_UP, RELEASE_CHANNEL } from './util/constants';
Expand All @@ -41,7 +41,7 @@ import { sentryError } from './util/sentry';
if (IS_SENTRY_SET_UP) {
Sentry.init({
dsn: Constants.manifest.extra.sentryPublicDsn,
debug: true
debug: true,
});

Sentry.setRelease(RELEASE_CHANNEL);
Expand All @@ -58,25 +58,23 @@ export function App(): React.ReactElement {
Promise.all([
Font.loadAsync({
'gotham-black': require('../assets/fonts/Gotham-Black.ttf'),
'gotham-book': require('../assets/fonts/Gotham-Book.ttf')
'gotham-book': require('../assets/fonts/Gotham-Book.ttf'),
}),
// Add Amplitude if available
setupAmplitude()
setupAmplitude(),
])
.then(() => setReady(true))
.catch(sentryError('App'));
}, []);

useEffect(() => {
// Load the Offix client
getApolloClient()
.then(setClient)
.catch(sentryError('App'));
getApolloClient().then(setClient).catch(sentryError('App'));
}, []);

useEffect(() => {
// Track user closing/re-opening the app
AppState.addEventListener('change', state => {
AppState.addEventListener('change', (state) => {
if (state === 'active') {
track('APP_REFOCUS');
} else if (state === 'background') {
Expand All @@ -100,7 +98,7 @@ export function App(): React.ReactElement {
<LoadingBackground />
)}
{Platform.select({
ios: <StatusBar barStyle="dark-content" />
ios: <StatusBar barStyle="dark-content" />,
})}
</DistanceUnitProvider>
</FrequencyContextProvider>
Expand Down
38 changes: 19 additions & 19 deletions App/Screens/About/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
ScrollView,
StyleSheet,
Text,
View
View,
} from 'react-native';
import { ScrollIntoView, wrapScrollView } from 'react-native-scroll-into-view';
import { scale } from 'react-native-size-matters';
Expand All @@ -41,13 +41,13 @@ const scrollViewOptions = {
align: 'top' as 'top',
insets: {
bottom: 0,
top: scale(theme.spacing.normal)
}
top: scale(theme.spacing.normal),
},
};

export const aboutSections = {
aboutBetaInaccurate: 'aboutBetaInaccurate',
aboutWhyIsTheStationSoFarTitle: 'aboutWhyIsTheStationSoFarTitle'
aboutWhyIsTheStationSoFarTitle: 'aboutWhyIsTheStationSoFarTitle',
};

const handleOpenAmaury = (): void => {
Expand Down Expand Up @@ -83,58 +83,58 @@ type AboutProps = NavigationInjectedProps<{
const styles = StyleSheet.create({
articleLink: {
...theme.text,
fontSize: scale(8)
fontSize: scale(8),
},
backButton: {
marginBottom: theme.spacing.normal,
marginTop: theme.spacing.normal
marginTop: theme.spacing.normal,
},
credits: {
borderTopColor: theme.iconBackgroundColor,
borderTopWidth: 1,
marginBottom: theme.spacing.normal,
paddingTop: theme.spacing.big
paddingTop: theme.spacing.big,
},
distance: {
borderTopColor: theme.iconBackgroundColor,
borderTopWidth: 1,
marginBottom: theme.spacing.big,
paddingTop: theme.spacing.big
paddingTop: theme.spacing.big,
},
distancePicker: {
...Platform.select({
ios: {
marginBottom: scale(-60),
marginTop: scale(-40)
}
})
marginTop: scale(-40),
},
}),
},
distanceText: {
...theme.text,
fontSize: scale(14),
paddingLeft: theme.spacing.small,
textTransform: 'capitalize'
textTransform: 'capitalize',
},
h2: {
...theme.title,
fontSize: scale(20),
letterSpacing: 0,
lineHeight: scale(24),
marginBottom: theme.spacing.small
marginBottom: theme.spacing.small,
},
micro: {
...Platform.select({
ios: {
fontFamily: 'Georgia'
fontFamily: 'Georgia',
},
android: {
fontFamily: 'normal'
}
})
fontFamily: 'normal',
},
}),
},
section: {
marginBottom: theme.spacing.big
}
marginBottom: theme.spacing.big,
},
});

export function About(props: AboutProps): React.ReactElement {
Expand Down
28 changes: 14 additions & 14 deletions App/Screens/About/Box/Box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,65 +31,65 @@ const styles = StyleSheet.create({
backgroundColor: 'white',
marginTop: 20,
marginBottom: 10,
padding: 10
padding: 10,
},
boxDescription: {
...theme.text,
fontSize: 9,
lineHeight: 16,
marginTop: 15
marginTop: 15,
},
cigarette: {
left: 6,
position: 'absolute',
bottom: 12
bottom: 12,
},
equal: {
...theme.text,
color: theme.secondaryTextColor,
fontSize: 44,
lineHeight: 44,
marginHorizontal: 18
marginHorizontal: 18,
},
equivalence: {
alignItems: 'center',
flexDirection: 'row',
justifyContent: 'center'
justifyContent: 'center',
},
label: {
...theme.title,
color: theme.secondaryTextColor,
fontSize: 12,
fontWeight: '900',
letterSpacing: scale(0.5)
letterSpacing: scale(0.5),
},
micro: {
...Platform.select({
ios: {
fontFamily: 'Georgia'
fontFamily: 'Georgia',
},
android: {
fontFamily: 'normal'
}
})
fontFamily: 'normal',
},
}),
},
statisticsLeft: {
alignItems: 'flex-end',
justifyContent: 'flex-end',
marginTop: 36,
paddingRight: 10,
width: 90
width: 90,
},
statisticsRight: {
alignItems: 'center',
width: 90
width: 90,
},
value: {
...theme.text,
color: theme.secondaryTextColor,
fontSize: 44,
lineHeight: 44
}
lineHeight: 44,
},
});

export function Box(): React.ReactElement {
Expand Down
8 changes: 4 additions & 4 deletions App/Screens/About/Language/Language.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import * as names from './names.json';

const styles = StyleSheet.create({
container: {
borderWidth: 0
borderWidth: 0,
},
picker: {
height: 1000,
position: 'absolute',
top: 0,
width: 1000
}
width: 1000,
},
});

export function Language(): React.ReactElement {
Expand All @@ -55,7 +55,7 @@ export function Language(): React.ReactElement {
selectedValue={i18n.locale}
style={styles.picker}
>
{Object.keys(i18n.translations).map(lang => (
{Object.keys(i18n.translations).map((lang) => (
<Picker.Item key={lang} label={names[lang].nativeName} value={lang} />
))}
</Picker>
Expand Down
12 changes: 6 additions & 6 deletions App/Screens/Details/Details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ type DetailsProps = NavigationInjectedProps;

const styles = StyleSheet.create({
container: {
flexGrow: 1
flexGrow: 1,
},
map: {
flexGrow: 1
flexGrow: 1,
},
mapContainer: {
flexGrow: 1
}
flexGrow: 1,
},
});

// Holds the ref to the MapView.Marker representing the AQI station
Expand Down Expand Up @@ -95,7 +95,7 @@ export function Details(props: DetailsProps): React.ReactElement {
const station = {
description: stationName(api.pm25),
title: stationName(api.pm25),
...getCorrectLatLng(currentLocation, api.pm25.coordinates)
...getCorrectLatLng(currentLocation, api.pm25.coordinates),
};

return (
Expand All @@ -114,7 +114,7 @@ export function Details(props: DetailsProps): React.ReactElement {
Math.abs(currentLocation.latitude - station.latitude) * 2,
longitude: (currentLocation.longitude + station.longitude) / 2,
longitudeDelta:
Math.abs(currentLocation.longitude - station.longitude) * 2
Math.abs(currentLocation.longitude - station.longitude) * 2,
}}
onMapReady={handleMapReady}
style={styles.map}
Expand Down
8 changes: 4 additions & 4 deletions App/Screens/Details/Distance/Distance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ interface DistanceProps {
const styles = StyleSheet.create({
banner: {
flexDirection: 'row',
justifyContent: 'center'
justifyContent: 'center',
},
distance: {
...theme.title,
color: 'white'
}
color: 'white',
},
});

export function Distance(props: DistanceProps): React.ReactElement {
Expand All @@ -46,7 +46,7 @@ export function Distance(props: DistanceProps): React.ReactElement {
<Text style={styles.distance}>
{t('details_distance_label', {
distanceToStation: props.distance,
distanceUnit
distanceUnit,
}).toUpperCase()}
</Text>
</Banner>
Expand Down
26 changes: 13 additions & 13 deletions App/Screens/Details/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
StyleSheet,
Text,
TextStyle,
View
View,
} from 'react-native';

import locationIcon from '../../../../assets/images/location.png';
Expand All @@ -40,44 +40,44 @@ interface HeaderProps {

const styles = StyleSheet.create({
backButton: {
marginBottom: theme.spacing.normal
marginBottom: theme.spacing.normal,
},
changeLocation: {
marginRight: theme.spacing.normal
marginRight: theme.spacing.normal,
},
container: {
...theme.elevationShadowStyle(2, 'bottom'),
...theme.withPadding,
backgroundColor: 'white',
paddingBottom: theme.spacing.small,
paddingTop: theme.spacing.normal,
zIndex: 1
zIndex: 1,
},
content: {
flex: 1
flex: 1,
},
currentLocation: {
marginBottom: theme.spacing.normal
marginBottom: theme.spacing.normal,
},
info: {
...theme.text,
marginVertical: 5
marginVertical: 5,
},
label: {
color: theme.primaryColor,
fontFamily: theme.gothamBlack
fontFamily: theme.gothamBlack,
},
layout: {
flexDirection: 'row'
flexDirection: 'row',
},
pollutantItem: {
flexBasis: '45%'
flexBasis: '45%',
},
pollutants: {
flexDirection: 'row',
flexWrap: 'wrap',
marginTop: theme.spacing.normal
}
marginTop: theme.spacing.normal,
},
});

const renderInfo = (
Expand Down Expand Up @@ -132,7 +132,7 @@ export function Header(props: HeaderProps): React.ReactElement {
)}

<View style={styles.pollutants}>
{api.normalized.map(normalized => {
{api.normalized.map((normalized) => {
return renderInfo(
`${normalized.parameter.toUpperCase()} AQI:`,
convert(
Expand Down
Loading

0 comments on commit cf8db9b

Please sign in to comment.