Merge pull request #19 from inaturalist/errors

Merge bug fixes into master

.gitignore

@@ -30,6 +30,7 @@ build/
 local.properties
 *.iml
 android/app/src/main/res/values/config.xml
+android/app/release/
 
 # node.js
 #

android/app/build.gradle

@@ -72,6 +72,19 @@ import com.android.build.OutputFile
  * ]
  */
 
+ def getPassword(String currentUser, String keyChain) {
+   def stdout = new ByteArrayOutputStream()
+   def stderr = new ByteArrayOutputStream()
+   exec {
+       commandLine 'security', '-q', 'find-generic-password', '-a', currentUser, '-s', keyChain, '-w'
+       standardOutput = stdout
+       errorOutput = stderr
+       ignoreExitValue true
+   }
+   //noinspection GroovyAssignabilityCheck
+      stdout.toString().trim()
+}
+
 project.ext.react = [
     entryFile: "index.js"
 ]
@@ -93,6 +106,8 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
+def pass = getPassword("iNaturalist.org","inaturalist-android")
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion '28.0.3'
@@ -108,6 +123,14 @@ android {
         }
         vectorDrawables.useSupportLibrary = true
     }
+    signingConfigs {
+        release {
+            storeFile file(SEEK_RELEASE_STORE_FILE)
+            storePassword pass
+            keyAlias SEEK_RELEASE_KEY_ALIAS
+            keyPassword pass
+        }
+    }
     splits {
         abi {
             reset()
@@ -120,6 +143,7 @@ android {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
         }
     }
     // applicationVariants are e.g. debug, release
@@ -138,6 +162,13 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-vector-icons')
+    implementation project(':realm')
+    implementation project(':react-native-svg')
+    implementation project(':react-native-maps')
+    implementation project(':react-native-image-resizer')
+    implementation project(':react-native-geocoder')
+    implementation project(':react-native-camera')
     implementation project(':realm')
     implementation project(':react-native-svg')
     implementation project(':react-native-image-resizer')

android/app/src/main/java/com/seek/MainApplication.java

@@ -4,6 +4,13 @@
 
 import io.realm.react.RealmReactPackage;
 import com.facebook.react.ReactApplication;
+import com.oblador.vectoricons.VectorIconsPackage;
+import io.realm.react.RealmReactPackage;
+import com.horcrux.svg.SvgPackage;
+import com.airbnb.android.react.maps.MapsPackage;
+import fr.bamlab.rnimageresizer.ImageResizerPackage;
+import com.devfd.RNGeocoder.RNGeocoderPackage;
+import org.reactnative.camera.RNCameraPackage;
 import com.horcrux.svg.SvgPackage;
 import fr.bamlab.rnimageresizer.ImageResizerPackage;
 import com.devfd.RNGeocoder.RNGeocoderPackage;
@@ -29,12 +36,13 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new VectorIconsPackage(),
             new RealmReactPackage(),
             new SvgPackage(),
-            new ImageResizerPackage(),
             new MapsPackage(),
-            new RNCameraPackage(),
-            new RNGeocoderPackage()
+            new ImageResizerPackage(),
+            new RNGeocoderPackage(),
+            new RNCameraPackage()
       );
     }
 

android/build.gradle

@@ -42,3 +42,14 @@ task wrapper(type: Wrapper) {
     gradleVersion = '4.4'
     distributionUrl = distributionUrl.replace("bin", "all")
 }
+
+subprojects {
+    afterEvaluate {project ->
+        if (project.hasProperty("android")) {
+            android {
+                compileSdkVersion 27
+                buildToolsVersion "27.0.3"
+            }
+        }
+    }
+}

android/gradle.properties

@@ -15,4 +15,7 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
+SEEK_RELEASE_STORE_FILE=inaturalist-android.keystore
+SEEK_RELEASE_KEY_ALIAS=inaturalist-android

android/settings.gradle

@@ -1,4 +1,18 @@
 rootProject.name = 'Seek'
+include ':react-native-vector-icons'
+project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
+include ':realm'
+project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android')
+include ':react-native-svg'
+project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
+include ':react-native-maps'
+project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
+include ':react-native-image-resizer'
+project(':react-native-image-resizer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-resizer/android')
+include ':react-native-geocoder'
+project(':react-native-geocoder').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-geocoder/android')
+include ':react-native-camera'
+project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android')
 include ':realm'
 project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android')
 include ':react-native-svg'

components/AboutTitle.js

@@ -3,6 +3,7 @@ import React from "react";
 import { View, Text, TouchableOpacity } from "react-native";
 
 import styles from "../styles/about";
+import { fonts, fontSize } from "../styles/global";
 
 type Props = {
   navigation: any
@@ -13,7 +14,9 @@ const AboutTitle = ( { navigation }: Props ) => (
     <TouchableOpacity
       onPress={() => navigation.navigate( "About" )}
     >
-      <Text>About</Text>
+      <Text style={{ fontFamily: fonts.default, fontSize: fontSize.text }}>
+        About
+      </Text>
     </TouchableOpacity>
   </View>
 );

components/BadgesScreen.js

@@ -14,6 +14,7 @@ import Realm from "realm";
 import badgeImages from "../assets/badges";
 import realmConfig from "../models/index";
 import styles from "../styles/badges";
+import { recalculateBadges } from "../utility/helpers";
 
 type Props = {
   navigation: any
@@ -29,6 +30,7 @@ class BadgesScreen extends Component {
   }
 
   componentDidMount() {
+    recalculateBadges();
     this.fetchBadges();
   }
 

components/BadgesTitle.js

@@ -4,6 +4,7 @@ import { View, Text } from "react-native";
 import Realm from "realm";
 
 import realmConfig from "../models/index";
+import { fontSize, fonts } from "../styles/global";
 
 type Props = {
   navigation: any
@@ -49,7 +50,7 @@ class BadgesTitle extends Component {
     const { title } = this.state;
     return (
       <View>
-        <Text>{title}</Text>
+        <Text style={{ fontFamily: fonts.default, fontSize: fontSize.header }}>{title}</Text>
       </View>
     );
   }