Merge branch 'develop' into #507-badge-highlight-number-with-multi-row

.eslintrc

@@ -19,8 +19,10 @@
  "objects": "always-multiline"
  }
  ],
+ "no-plusplus": ["error", { "allowForLoopAfterthoughts": true }],
  "function-paren-newline": "off",
  "implicit-arrow-linebreak": "off",
+ "import/prefer-default-export": "off",
  "indent": ["error", 2, { "SwitchCase": 1 }],
  "max-len": ["error", { "code": 100, "ignoreTemplateLiterals": true }],
  "no-confusing-arrow": "off",

.github/ISSUE_TEMPLATE/design_discussion.md

@@ -4,18 +4,22 @@ about: A template for how to discuss designing features/modules
 title: Feature/module name and concise purpose if not conveyed in name
 labels: Epic
 assignees: ''
-
 ---
 
 <!-- It's expected that this template be edited and kept up to date as discussion around the design unfolds -->
+
 ## Description
+
 <!-- Summarise the related features/module that is needed -->
 
 ### Context
+
 <!-- Describe what use case wasn't being satisfied in the current version of mSupply Mobile that the above is address -->
 
 ## Design discussion
+
 <!-- Summarise the solution. Add child issues with checkboxes if created. Delete sub sections if not applicable -->
 
 ### Architecture
+
 <!-- If any, describe design pattern decisions -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,21 +4,20 @@ about: Suggest an idea for this project
 title: Concisely the feature I want
 labels: Feature
 assignees: ''
-
 ---
 
 ## Is your feature request related to a problem? Please describe.
 
-__A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]__
+**A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]**
 
 ## Describe the solution you'd like
 
-__A clear and concise description of what you want to happen.__
+**A clear and concise description of what you want to happen.**
 
 ## Describe alternatives you've considered
 
-__A clear and concise description of any alternative solutions or features you've considered.__
+**A clear and concise description of any alternative solutions or features you've considered.**
 
 ## Additional context
 
-__Add any other context or screenshots about the feature request here.__
+**Add any other context or screenshots about the feature request here.**

android/app/build.gradle

@@ -74,7 +74,8 @@ import groovy.json.JsonSlurper
  */
 
 project.ext.react = [
- entryFile: "index.js"
+ entryFile: "index.js",
+ enableHermes: false,
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -94,6 +95,27 @@ def enableSeparateBuildPerCPUArchitecture = true
  */
 def enableProguardInReleaseBuilds = false
 
+/**
+ * The preferred build flavor of JavaScriptCore.
+ *
+ * For example, to use the international variant, you can use:
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ *
+ * The international variant includes ICU i18n library and necessary data
+ * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
+ * give correct results when using with locales other than en-US. Note that
+ * this variant is about 6MiB larger per architecture than default.
+ */
+def jscFlavor = 'org.webkit:android-jsc:+'
+/**
+ * Whether to enable the Hermes VM.
+ *
+ * This should be set on project.ext.react and mirrored here. If it is not set
+ * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
+ * and the benefits of using Hermes will therefore be sharply reduced.
+ */
+def enableHermes = project.ext.react.get("enableHermes", false);
+
 def getAppVersion() {
  def inputFile = new File("../package.json")
  def packageJson = new JsonSlurper().parseText(inputFile.text)
@@ -125,6 +147,12 @@ android {
  }
  }
  signingConfigs {
+ debug {
+ storeFile file('debug.keystore')
+ storePassword 'android'
+ keyAlias 'androiddebugkey'
+ keyPassword 'android'
+ }
  release {
  storeFile file(MYAPP_RELEASE_STORE_FILE)
  storePassword MYAPP_RELEASE_STORE_PASSWORD
@@ -141,6 +169,9 @@ android {
  }
  }
  buildTypes {
+ debug {
+ signingConfig signingConfigs.debug
+ }
  release {
  minifyEnabled enableProguardInReleaseBuilds
  proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
@@ -163,20 +194,16 @@ android {
 }
 
 dependencies {
- implementation project(':@react-native-community_async-storage')
- implementation project(':react-native-screens')
- implementation project(':react-native-gesture-handler')
- implementation project(':react-native-device-info')
- implementation project(':realm')
- implementation project(':react-native-vector-icons')
- implementation project(':react-native-localization')
- implementation project(':react-native-fs')
- implementation project(':bugsnag-react-native')
  implementation fileTree(dir: "libs", include: ["*.jar"])
  implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
  implementation "com.facebook.react:react-native:+" // From node_modules
- implementation ("com.google.android.gms:play-services-gcm:16.1.0") {
- force = true
+
+ if (enableHermes) {
+ def hermesPath = "../../node_modules/hermes-engine/android/";
+ debugImplementation files(hermesPath + "hermes-debug.aar")
+ releaseImplementation files(hermesPath + "hermes-release.aar")
+ } else {
+ implementation jscFlavor
  }
 }
 
@@ -186,3 +213,6 @@ task copyDownloadableDepsToLibs(type: Copy) {
  from configurations.compile
  into 'libs'
 }
+
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

android/app/proguard-rules.pro

@@ -8,10 +8,3 @@
 # http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}

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

@@ -2,22 +2,14 @@
 
 import android.app.Application;
 
+import android.content.Context;
+import com.facebook.react.PackageList;
+import com.facebook.react.shell.MainReactPackage;
 import com.facebook.react.ReactApplication;
-import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
-import com.swmansion.rnscreens.RNScreensPackage;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
-import com.learnium.RNDeviceInfo.RNDeviceInfo;
-import io.realm.react.RealmReactPackage;
-import com.oblador.vectoricons.VectorIconsPackage;
-import com.babisoft.ReactNativeLocalization.ReactNativeLocalizationPackage;
-import com.rnfs.RNFSPackage;
-import com.bugsnag.BugsnagReactNative;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
-
-import java.util.Arrays;
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 public class MainApplication extends Application implements ReactApplication {
@@ -30,20 +22,10 @@ public boolean getUseDeveloperSupport() {
 
  @Override
  protected List<ReactPackage> getPackages() {
- return Arrays.<ReactPackage>asList(
- new RNDeviceInfo(),
- new MainReactPackage(),
- new AsyncStoragePackage(),
- new RNScreensPackage(),
- new RNGestureHandlerPackage(),
- new RealmReactPackage(),
- new VectorIconsPackage(),
- new ReactNativeLocalizationPackage(),
- new RNFSPackage(),
- BugsnagReactNative.getPackage()
- );
+ List<ReactPackage> packages = new PackageList(this).getPackages();
+ return packages;
  }
-
+ 
  @Override
  protected String getJSMainModuleName() {
  return "index";
@@ -58,6 +40,35 @@ public ReactNativeHost getReactNativeHost() {
  @Override
  public void onCreate() {
  super.onCreate();
- SoLoader.init(this, /* native exopackage */ false);
+ SoLoader.init(this, false);
+
+ // Disabling Flipper until a point of higher understanding
+ // initializeFlipper(this);
+ }
+
+ /**
+ * Loads Flipper in React Native templates.
+ *
+ * @param context
+ */
+ private static void initializeFlipper(Context context) {
+ if (BuildConfig.DEBUG) {
+ try {
+ /*
+ We use reflection here to pick up the class that initializes Flipper,
+ since Flipper library is not available in release mode
+ */
+ Class<?> aClass = Class.forName("com.facebook.flipper.ReactNativeFlipper");
+ aClass.getMethod("initializeFlipper", Context.class).invoke(null, context);
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
  }
 }

android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.3.2'
+ classpath 'com.android.tools.build:gradle:3.5.1'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
@@ -27,13 +27,20 @@ allprojects {
  jcenter()
  maven {
  // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
- url "$rootDir/../node_modules/react-native/android"
+ url("$rootDir/../node_modules/react-native/android")
  }
+ maven {
+ // Android JSC is installed from npm
+ url("$rootDir/../node_modules/jsc-android/dist")
+ }
+ google()
+ jcenter()
+ maven { url 'https://jitpack.io' }
  }
 }
 
 
-task wrapper(type: Wrapper) {
- gradleVersion = '4.10.1'
+wrapper {
+ gradleVersion = '5.6.2'
  distributionUrl = distributionUrl.replace("bin", "all")
 }

android/gradle.properties

@@ -36,10 +36,12 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.useDeprecatedNdk=true
-
 MYAPP_RELEASE_STORE_FILE=my-release-key.keystore
 MYAPP_RELEASE_KEY_ALIAS=my-key-alias
 MYAPP_RELEASE_STORE_PASSWORD=sussolpikelets
 MYAPP_RELEASE_KEY_PASSWORD=sussolpikelets
 
+android.useAndroidX=true
+android.enableJetifier=true
+
+org.gradle.jvmargs=-XX\:MaxHeapSize\=1024m -Xmx1024m

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

android/settings.gradle

@@ -1,20 +1,3 @@
 rootProject.name = 'mSupplyMobile'
-include ':@react-native-community_async-storage'
-project(':@react-native-community_async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
-include ':react-native-screens'
-project(':react-native-screens').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-screens/android')
 include ':app'
-include ':realm'
-include ':react-native-gesture-handler'
-project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
-project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android')
-include ':react-native-vector-icons'
-project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
-include ':react-native-localization'
-project(':react-native-localization').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-localization/android')
-include ':react-native-fs'
-project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
-include ':bugsnag-react-native'
-project(':bugsnag-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/bugsnag-react-native/android')
-include ':react-native-device-info'
-project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
+apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)

dev_scripts/clean.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# mSupply Mobile
+# Sustainable Solutions (NZ) Ltd. 2019.
+#
+# Clean up react native caches.
+
+TMPDIR_PACKAGER=$TMPDIR/react-native-packager-*
+TMPDIR_METRO=$TMPDIR/metro-bundler-*
+
+echo "Cleaning up temporary files..."
+rm -rf $TMPDIR_PACKAGER $TMPDIR_METRO
+echo "Cleaning up watchman files..."
+npx watchman watch-del-all
+echo "Reinstalling node modules..."
+rm -rf node_modules/ &&
+ yarn cache clean &&
+ yarn install

dev_scripts/deploy.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# mSupply Mobile
+# Sustainable Solutions (NZ) Ltd. 2019.
+#
+# Deploy mobile app.
+
+APK_DIR="android/app/build/outputs/apk/release"
+APK_VERSION="mSupplyMobile-3_0_2-universal-release"
+PACKAGE="com.msupplymobile"
+
+echo "Rooting device..."
+adb root > /dev/null
+echo "Uninstalling mSupply mobile..."
+adb uninstall $PACKAGE > /dev/null
+echo "Installing latest .apk build..."
+adb install $APK_DIR/$APK_VERSION.apk > /dev/null