Merge branch 'master' into '150-apply-design-to-chart'

# Conflicts:
#   components/calendar.js
#   components/chart/y-axis.js

.gitignore

@@ -54,3 +54,10 @@ buck-out/
 
 # Bundle artifact
 *.jsbundle
+
+# RN android release 
+android/app/bin/
+android/app/release/
+android/app/src/main/assets/index.android.bundle
+android/.project
+android/app/.project

README.md

@@ -25,3 +25,6 @@ You can run the tests with `npm test`.
 ## Debugging
 When running into an old version of the app try to run the following command first:
 `react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res`
+
+## NFP rules
+More information about how the app calculates fertility status and bleeding predictions in the [wiki on Gitlab](https://gitlab.com/bloodyhealth/drip/wikis/home)

android/app/build.gradle

@@ -108,6 +108,16 @@ android {
             abiFilters "armeabi-v7a", "x86"
         }
     }
+    signingConfigs {
+        release {
+            if (project.hasProperty('DRIP_RELEASE_STORE_FILE')) {
+                storeFile file(DRIP_RELEASE_STORE_FILE)
+                storePassword DRIP_RELEASE_STORE_PASSWORD
+                keyAlias DRIP_RELEASE_KEY_ALIAS
+                keyPassword DRIP_RELEASE_KEY_PASSWORD
+            }
+        }
+    }
     splits {
         abi {
             reset()
@@ -120,6 +130,7 @@ android {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
         }
     }
     // applicationVariants are e.g. debug, release