Code Cleaning Done

android/app/build.gradle

@@ -199,7 +199,7 @@ dependencies {
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation "androidx.annotation:annotation:1.1.0"
 
-    compile project(':react-native-fs')
+    implementation project(':react-native-fs')
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";

android/build.gradle

@@ -15,7 +15,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath('com.android.tools.build:gradle:3.5.0')
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

app/Entry.js

@@ -1,11 +1,9 @@
 import React, { Component } from 'react';
-
 import { NavigationContainer } from '@react-navigation/native';
 import {
   createStackNavigator,
   CardStyleInterpolators,
 } from '@react-navigation/stack';
-import { SafeAreaView } from 'react-native';
 import LocationTracking from './views/LocationTracking';
 import NewsScreen from './views/News';
 import ExportScreen from './views/Export';
@@ -20,8 +18,7 @@ import Onboarding2 from './views/onboarding/Onboarding2';
 import Onboarding5 from './views/onboarding/Onboarding5';
 import AboutScreen from './views/About';
 import ChooseProviderScreen from './views/ChooseProvider';
-
-import { GetStoreData, SetStoreData } from './helpers/General';
+import { GetStoreData } from './helpers/General';
 import { PARTICIPATE } from './constants/storage';
 
 const Stack = createStackNavigator();

app/components/NativePicker.js

@@ -23,7 +23,6 @@ export default class NativePicker extends Component {
   render() {
     // iOS and Android Pickers behave differently, handled below
     if (Platform.OS === 'android') {
-
       const selectedItem = this.props.items.find(
         i => i.value === this.props.value,
       );
@@ -35,7 +34,6 @@ export default class NativePicker extends Component {
             onPress={() => this.setState({ modalVisible: true })}>
             <TextInput
               style={[styles.touchableTrigger, styles.touchableText]}
-
               editable={false}
               placeholder='Select language'
               onChangeText={searchString => {
@@ -129,32 +127,6 @@ export default class NativePicker extends Component {
 }
 
 const styles = StyleSheet.create({
-  mainContainer: {
-    flex: 1,
-    backgroundColor: '#ffffff',
-  },
-  imageContainer: {
-    alignItems: 'center',
-    justifyContent: 'center',
-    margin: '3%',
-  },
-  descriptionContainer: {
-    flex: 1,
-    flexDirection: 'row',
-  },
-  descriptionIconContainer: {
-    alignSelf: 'center',
-  },
-  descriptionIcon: {
-    width: 10,
-    height: 10,
-    resizeMode: 'contain',
-  },
-  descriptionTextContainer: {
-    flex: 1,
-    justifyContent: 'center',
-    marginLeft: '5%',
-  },
   touchableTrigger: {
     backgroundColor: '#ffffff',
     opacity: 0.4,
@@ -168,5 +140,4 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     textTransform: 'uppercase',
   },
-
 });

app/services/__tests__/LocationService.spec.js

@@ -1,4 +1,4 @@
-import LocationService, { LocationData } from '../LocationService';
+import { LocationData } from '../LocationService';
 import * as General from '../../helpers/General';
 
 function mockGetStoreData(data) {

app/views/About.js

@@ -1,8 +1,6 @@
 import React, { Component } from 'react';
 import { StyleSheet, View, Text, ScrollView, BackHandler } from 'react-native';
-
 import languages from './../locales/languages';
-import { isPlatformiOS } from './../Util';
 import Colors from '../constants/colors';
 import fontFamily from './../constants/fonts';
 import team from './../assets/svgs/team';
@@ -74,12 +72,6 @@ const styles = StyleSheet.create({
     paddingHorizontal: 26,
     flex: 1,
   },
-  section: {
-    flexDirection: 'column',
-    width: '87.5%',
-    alignSelf: 'center',
-    backgroundColor: Colors.WHITE,
-  },
   aboutSectionIconTeam: {
     width: 40.38,
     height: 19,

app/views/ChooseProvider.js

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import {
-  SafeAreaView,
   StyleSheet,
   View,
   Text,
@@ -27,7 +26,6 @@ import { GetStoreData, SetStoreData } from '../helpers/General';
 import colors from '../constants/colors';
 import Colors from '../constants/colors';
 import fontFamily from '../constants/fonts';
-import backArrow from './../assets/images/backArrow.png';
 import closeIcon from './../assets/images/closeIcon.png';
 import saveIcon from './../assets/images/saveIcon.png';
 import languages from '../locales/languages';
@@ -358,14 +356,6 @@ class ChooseProviderScreen extends Component {
 }
 
 const styles = StyleSheet.create({
-  // Container covers the entire screen
-  container: {
-    flex: 1,
-    flexDirection: 'column',
-    justifyContent: 'space-between',
-    color: colors.PRIMARY_TEXT,
-    backgroundColor: colors.WHITE,
-  },
   main: {
     flex: 2,
     flexDirection: 'column',
@@ -385,12 +375,6 @@ const styles = StyleSheet.create({
     alignSelf: 'center',
     backgroundColor: colors.WHITE,
   },
-  row: {
-    flex: 1,
-    flexDirection: 'row',
-    color: colors.PRIMARY_TEXT,
-    backgroundColor: colors.WHITE,
-  },
   value: {
     fontSize: 20,
     fontWeight: '200',
@@ -411,33 +395,11 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     color: '#ffffff',
   },
-
-  buttonTouchable: {
-    borderRadius: 12,
-    backgroundColor: '#665eff',
-    height: 52,
-    alignSelf: 'center',
-    width: width * 0.7866,
-    marginTop: 30,
-    justifyContent: 'center',
-  },
-  buttonText: {
-    fontFamily: fontFamily.primaryBold,
-    fontSize: 14,
-    lineHeight: 19,
-    letterSpacing: 0,
-    textAlign: 'center',
-    color: '#ffffff',
-  },
   headerTitle: {
     fontSize: 24,
     fontFamily: fontFamily.primaryBold,
     color: Colors.VIOLET_TEXT,
   },
-  backArrow: {
-    height: 18,
-    width: 18.48,
-  },
   sectionDescription: {
     fontSize: 18,
     lineHeight: 24,

app/views/Export.js

@@ -4,30 +4,25 @@ import {
   StyleSheet,
   View,
   Text,
-  Image,
   TouchableOpacity,
   BackHandler,
   StatusBar,
   ScrollView,
-  Platform,
 } from 'react-native';
 import PropTypes from 'prop-types';
 import { useFocusEffect, useNavigation } from '@react-navigation/native';
 import RNFetchBlob from 'rn-fetch-blob';
 import RNFS from 'react-native-fs';
 import Share from 'react-native-share';
-// import colors from '../constants/colors';
 import fontFamily from '../constants/fonts';
 import { GetStoreData } from '../helpers/General';
 import { timeSincePoint } from '../helpers/convertPointsToString';
 import LocationServices, { LocationData } from '../services/LocationService';
-import backArrow from './../assets/images/backArrow.png';
 import { isPlatformiOS } from './../Util';
 import LinearGradient from 'react-native-linear-gradient';
 
 import Colors from '../constants/colors';
 import languages from './../locales/languages';
-import licenses from './../assets/LICENSE.json';
 import { SvgXml } from 'react-native-svg';
 import close from './../assets/svgs/close';
 import exportIcon from './../assets/svgs/export';
@@ -176,7 +171,6 @@ function ExportScreen(props) {
 }
 
 const styles = StyleSheet.create({
-  // Container covers the entire screen
   topSafeAreaContainer: {
     flex: 0,
     backgroundColor: Colors.VIOLET_BUTTON,
@@ -206,12 +200,6 @@ const styles = StyleSheet.create({
     flex: 1,
     paddingHorizontal: 26,
   },
-  row: {
-    flexDirection: 'row',
-    color: Colors.PRIMARY_TEXT,
-    alignItems: 'flex-start',
-  },
-
   exportSectionTitles: {
     color: Colors.WHITE,
     fontSize: 26,
@@ -225,7 +213,6 @@ const styles = StyleSheet.create({
     marginTop: 22,
     fontFamily: fontFamily.primaryRegular,
   },
-
   exportButton: {
     backgroundColor: Colors.WHITE,
     flexDirection: 'row',

app/views/Import.js

@@ -7,8 +7,6 @@ import {
   Dimensions,
   ActivityIndicator,
 } from 'react-native';
-
-import colors from '../constants/colors';
 import fontFamily from '../constants/fonts';
 import WebView from 'react-native-webview';
 import { SearchAndImport } from '../helpers/GoogleTakeOutAutoImport';
@@ -108,13 +106,6 @@ class ImportScreen extends Component {
 }
 
 const styles = StyleSheet.create({
-  // Container covers the entire screen
-  container: {
-    flex: 1,
-    flexDirection: 'column',
-    color: colors.PRIMARY_TEXT,
-    backgroundColor: colors.WHITE,
-  },
   subHeaderTitle: {
     textAlign: 'center',
     fontWeight: 'bold',

app/views/Licenses.js

@@ -13,7 +13,6 @@ import {
 } from 'react-native';
 import { WebView } from 'react-native-webview';
 import packageJson from '../../package.json';
-
 import Colors from '../constants/colors';
 import fontFamily from '../constants/fonts';
 import languages from './../locales/languages';

app/views/LocationTracking.js

@@ -1,25 +1,17 @@
 import React, { Component } from 'react';
 import {
   AppState,
-  SafeAreaView,
   StyleSheet,
   Linking,
   View,
   Text,
   TouchableOpacity,
   Dimensions,
   Image,
-  ScrollView,
   BackHandler,
   ImageBackground,
   StatusBar,
 } from 'react-native';
-import {
-  Menu,
-  MenuOptions,
-  MenuOption,
-  MenuTrigger,
-} from 'react-native-popup-menu';
 import BackgroundImage from './../assets/images/launchScreenBackground.png';
 import BackgroundImageAtRisk from './../assets/images/backgroundAtRisk.png';
 import Colors from '../constants/colors';
@@ -39,8 +31,6 @@ import {
   RESULTS,
   openSettings,
 } from 'react-native-permissions';
-import foreArrow from './../assets/images/foreArrow.png';
-
 import { GetStoreData, SetStoreData } from '../helpers/General';
 import languages from '../locales/languages';
 
@@ -50,7 +40,7 @@ import StateNoContact from './../assets/svgs/stateNoContact';
 import StateUnknown from './../assets/svgs/stateUnknown';
 import SettingsGear from './../assets/svgs/settingsGear';
 import fontFamily from '../constants/fonts';
-import { PARTICIPATE, CROSSED_PATHS } from '../constants/storage';
+import { PARTICIPATE } from '../constants/storage';
 
 const StateEnum = {
   UNKNOWN: 0,
@@ -501,32 +491,6 @@ const styles = StyleSheet.create({
     fontFamily: fontFamily.primaryLight,
     marginBottom: '8%',
   },
-  mayoInfoRow: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-  },
-  mayoInfoContainer: {
-    flexDirection: 'column',
-    justifyContent: 'space-between',
-    alignContent: 'flex-end',
-    padding: 20,
-  },
-  mainMayoHeader: {
-    textAlign: 'left',
-    color: Colors.MISCHKA,
-    fontSize: 18,
-    fontFamily: fontFamily.primaryBold,
-  },
-  mainMayoSubtext: {
-    textAlign: 'left',
-    color: Colors.MISCHKA,
-    fontSize: 18,
-    fontFamily: fontFamily.primaryRegular,
-  },
-  arrowContainer: {
-    alignSelf: 'center',
-    paddingRight: 20,
-  },
 });
 
 export default LocationTracking;