Merge branch 'master' of https://github.com/amaurymartiny/shoot-i-smoke

.eslintrc.js

@@ -1,23 +1 @@
-module.exports = {
- env: {
- jest: true
- },
- extends: [
- 'plugin:react/recommended',
- 'plugin:@typescript-eslint/recommended',
- 'prettier/@typescript-eslint',
- 'plugin:prettier/recommended'
- ],
- parser: '@typescript-eslint/parser',
- plugins: ['react', '@typescript-eslint', 'prettier'],
- rules: {
- // disable the rule for all files
- '@typescript-eslint/explicit-function-return-type': 'off',
- '@typescript-eslint/no-explicit-any': 'off'
- },
- settings: {
- react: {
- version: 'detect'
- }
- }
-};
+module.exports = require('@amaurymartiny/eslintrc');

.github/FUNDING.yml

@@ -1,5 +1,6 @@
 # These are supported funding model platforms
 
+github: amaurymartiny
 patreon: amaurymartiny
 open_collective: amaurymartiny
 liberapay: amaurymartiny

.github/workflows/pr.yml

@@ -0,0 +1,21 @@
+name: pr
+
+on: [pull_request]
+
+jobs:
+ lint:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v1
+ - name: Lint
+ run: |
+ yarn install
+ yarn lint
+ test:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v1
+ - name: Test
+ run: |
+ yarn install
+ yarn test

App/App.tsx

@@ -14,10 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Sh**t! I Smoke. If not, see <https://www.gnu.org/licenses/>.
 
-import * as Font from 'expo-font';
+import { ApolloProvider } from '@apollo/react-hooks';
 import Constants from 'expo-constants';
+import * as Font from 'expo-font';
 import React, { useEffect, useState } from 'react';
-import { AppState } from 'react-native';
+import { AppState, Platform, StatusBar } from 'react-native';
 import * as Sentry from 'sentry-expo';
 
 import { Screens } from './Screens';
@@ -30,6 +31,7 @@ import {
  LocationContextProvider
 } from './stores';
 import { setupAmplitude, track } from './util/amplitude';
+import { client } from './util/apollo';
 
 // Add Sentry if available
 if (Constants.manifest.extra.sentryPublicDsn) {
@@ -43,7 +45,7 @@ if (Constants.manifest.extra.sentryPublicDsn) {
  }
 }
 
-export function App() {
+export function App(): React.ReactElement {
  const [ready, setReady] = useState(false);
  useEffect(() => {
  Promise.all([
@@ -56,7 +58,7 @@ export function App() {
  ])
 
  .then(() => setReady(true))
- .catch(console.error);
+ .catch(error => console.error(error));
  }, []);
 
  useEffect(() => {
@@ -72,13 +74,18 @@ export function App() {
  return ready ? (
  <ErrorContextProvider>
  <LocationContextProvider>
- <ApiContextProvider>
- <FrequencyContextProvider>
- <DistanceUnitProvider>
- <Screens />
- </DistanceUnitProvider>
- </FrequencyContextProvider>
- </ApiContextProvider>
+ <ApolloProvider client={client}>
+ <ApiContextProvider>
+ <FrequencyContextProvider>
+ <DistanceUnitProvider>
+ {Platform.select({
+ ios: <StatusBar barStyle="dark-content" />
+ })}
+ <Screens />
+ </DistanceUnitProvider>
+ </FrequencyContextProvider>
+ </ApiContextProvider>
+ </ApolloProvider>
  </LocationContextProvider>
  </ErrorContextProvider>
  ) : (

App/Screens/About/About.tsx

@@ -28,11 +28,13 @@ import {
 import { ScrollIntoView, wrapScrollView } from 'react-native-scroll-into-view';
 import { scale } from 'react-native-size-matters';
 import { NavigationInjectedProps } from 'react-navigation';
+
 import { BackButton } from '../../components';
 import { i18n } from '../../localization';
 import { useDistanceUnit } from '../../stores/distanceUnit';
 import { trackScreen } from '../../util/amplitude';
 import * as theme from '../../util/theme';
+import { SelectNotifications } from '../Home/SelectNotifications';
 import { Box } from './Box';
 
 const CustomScrollView = wrapScrollView(ScrollView);
@@ -49,25 +51,25 @@ export const aboutSections = {
  aboutWhyIsTheStationSoFarTitle: 'aboutWhyIsTheStationSoFarTitle'
 };
 
-const handleOpenAmaury = () => {
+const handleOpenAmaury = (): void => {
  Linking.openURL('https://twitter.com/amaurymartiny');
 };
 
-const handleOpenAqi = () => {
+const handleOpenAqi = (): void => {
  Linking.openURL('https://aqicn.org/');
 };
 
-const handleOpenArticle = () => {
+const handleOpenArticle = (): void => {
  Linking.openURL(
  'https://berkeleyearth.org/air-pollution-and-cigarette-equivalence/'
  );
 };
 
-const handleOpenGithub = () => {
+const handleOpenGithub = (): void => {
  Linking.openURL('https://github.com/amaurymartiny/shoot-i-smoke');
 };
 
-const handleOpenMarcelo = () => {
+const handleOpenMarcelo = (): void => {
  Linking.openURL('https://www.behance.net/marceloscoelho');
 };
 
@@ -129,7 +131,7 @@ const styles = StyleSheet.create({
  }
 });
 
-export function About(props: AboutProps) {
+export function About(props: AboutProps): React.ReactElement {
  const { navigation } = props;
  const {
  distanceUnit,
@@ -139,7 +141,7 @@ export function About(props: AboutProps) {
 
  trackScreen('ABOUT');
 
- const toggleDistanceSwitch = (value: boolean) =>
+ const toggleDistanceSwitch = (value: boolean): void =>
  setDistanceUnit(value ? 'km' : 'mile');
 
  return (
@@ -148,7 +150,9 @@ export function About(props: AboutProps) {
  style={theme.withPadding}
  >
  <BackButton
- onPress={() => navigation.goBack()}
+ onPress={(): void => {
+ navigation.goBack();
+ }}
  style={styles.backButton}
  />
 
@@ -231,6 +235,15 @@ export function About(props: AboutProps) {
  </Text>
  </View>
 
+ <View style={styles.distance}>
+ <Text style={styles.h2}>Notifications (alpha)</Text>
+ <Text style={theme.text}>
+ This section is an alpha testing stage of the new notifications
+ feature.
+ </Text>
+ <SelectNotifications />
+ </View>
+
  <View style={styles.distance}>
  <Text style={styles.h2}>{i18n.t('about_distance_unit_title')}</Text>
  <View style={styles.distanceSwitchWrapper}>

App/Screens/About/Box/Box.tsx

@@ -17,6 +17,7 @@
 import React from 'react';
 import { Image, Platform, StyleSheet, Text, View } from 'react-native';
 import { scale } from 'react-native-size-matters';
+
 import cigarette from '../../../../assets/images/cigarette.png';
 import { i18n } from '../../../localization';
 import * as theme from '../../../util/theme';
@@ -91,7 +92,7 @@ const styles = StyleSheet.create({
  }
 });
 
-export function Box() {
+export function Box(): React.ReactElement {
  return (
  <View style={styles.box}>
  <View style={styles.equivalence}>

App/Screens/About/Language/Language.tsx

@@ -16,6 +16,7 @@
 
 import React, { useContext } from 'react';
 import { Picker, StyleSheet, Text, View } from 'react-native';
+
 import { i18n } from '../../../localization';
 import { ApiContext } from '../../../stores';
 import * as theme from '../../../util/theme';
@@ -33,10 +34,10 @@ const styles = StyleSheet.create({
  }
 });
 
-export function Language() {
+export function Language(): React.ReactElement {
  const { reloadApp } = useContext(ApiContext);
 
- const handleValueChange = (itemValue: string) => {
+ const handleValueChange = (itemValue: string): void => {
  i18n.locale = itemValue;
 
  // Reload app for changes to take effect

App/Screens/Details/Details.tsx

@@ -19,6 +19,7 @@ import { StyleSheet, View } from 'react-native';
 import MapView, { Marker } from 'react-native-maps';
 import { NavigationInjectedProps } from 'react-navigation';
 import truncate from 'truncate';
+
 import homeIcon from '../../../assets/images/home.png';
 import stationIcon from '../../../assets/images/station.png';
 import { i18n } from '../../localization';
@@ -46,7 +47,7 @@ const styles = StyleSheet.create({
 // Holds the ref to the MapView.Marker representing the AQI station
 let stationMarker: Marker | undefined;
 
-export function Details(props: DetailsProps) {
+export function Details(props: DetailsProps): React.ReactElement {
  const { navigation } = props;
 
  const [showMap, setShowMap] = useState(false);
@@ -63,11 +64,11 @@ export function Details(props: DetailsProps) {
  setTimeout(() => setShowMap(true), 500);
  }, []);
 
- const handleMapReady = () => {
+ const handleMapReady = (): void => {
  stationMarker && stationMarker.showCallout && stationMarker.showCallout();
  };
 
- const handleStationRef = (ref: Marker) => {
+ const handleStationRef = (ref: Marker): void => {
  stationMarker = ref;
  };
 
@@ -91,17 +92,18 @@ export function Details(props: DetailsProps) {
  const distance = distanceToStation(currentLocation, api, distanceUnit);
 
  const station = {
- description: api.shootISmoke.station || '',
- title: api.shootISmoke.station || '',
- ...getCorrectLatLng(currentLocation, {
- latitude: api.city.geo[0],
- longitude: api.city.geo[1]
- })
+ description: api.closestStation.name,
+ title: api.closestStation.name,
+ ...getCorrectLatLng(currentLocation, api.closestStation.gps)
  };
 
  return (
  <View style={styles.container}>
- <Header onBackClick={() => navigation.goBack()} />
+ <Header
+ onBackClick={(): void => {
+ navigation.goBack();
+ }}
+ />
  <View style={styles.mapContainer}>
  {showMap && (
  <MapView

App/Screens/Details/Distance/Distance.tsx

@@ -16,6 +16,7 @@
 
 import React from 'react';
 import { StyleSheet, Text } from 'react-native';
+
 import { Banner } from '../../../components';
 import { i18n } from '../../../localization';
 import { useDistanceUnit } from '../../../stores/distanceUnit';
@@ -36,7 +37,7 @@ const styles = StyleSheet.create({
  }
 });
 
-export function Distance(props: DistanceProps) {
+export function Distance(props: DistanceProps): React.ReactElement {
  const { localizedDistanceUnit } = useDistanceUnit();
  const distanceUnit = localizedDistanceUnit('short');