Dependency updates

.flowconfig

@@ -12,33 +12,40 @@
 ; For RN Apps installed via npm, "Libraries" folder is inside
 ; "node_modules/react-native" but in the source repo it is in the root
 .*/Libraries/react-native/React.js
-.*/Libraries/react-native/ReactNative.js
+
+; Ignore polyfills
+.*/Libraries/polyfills/.*
+
+; Ignore metro
+.*/node_modules/metro/.*
 
 [include]
 
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow
-flow/
+node_modules/react-native/flow/
+node_modules/react-native/flow-github/
 
 [options]
 module.system=haste
 
-experimental.strict_type_args=true
-
 munge_underscores=true
 
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
+module.file_ext=.js
+module.file_ext=.jsx
+module.file_ext=.json
+module.file_ext=.native.js
+
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
-suppress_type=$FixMe
+suppress_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
-unsafe.enable_getters_and_setters=true
-
 [version]
-^0.37.0
+^0.65.0

.gitignore

@@ -54,8 +54,8 @@ android/app/libs
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/
 
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
+*/fastlane/report.xml
+*/fastlane/Preview.html
+*/fastlane/screenshots

.travis.yml

@@ -14,13 +14,13 @@ matrix:
       env:
         - NAME=iOS
       os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.2
       script:
         - brew update
         - brew install nvm
         - nvm install 8.4.0
         - npm install
-        - cd ios && xcodebuild -scheme Buttercup -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.3.1' build test
+        - cd ios && xcodebuild -scheme Buttercup -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' build test | xcpretty -c
     - language: android
       sudo: required
       env:

android/app/build.gradle

@@ -33,6 +33,13 @@ import com.android.build.OutputFile
  *   // bundleInPaidRelease: true,
  *   // bundleInBeta: true,
  *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
  *   // the root of your project, i.e. where "package.json" lives
  *   root: "../../",
  *
@@ -65,6 +72,10 @@ import com.android.build.OutputFile
  * ]
  */
 
+project.ext.react = [
+    entryFile: "index.android.js"
+]
+
 apply from: "../../node_modules/react-native/react.gradle"
 
 /**

android/app/src/main/AndroidManifest.xml

@@ -6,9 +6,9 @@
 
     <application
       android:name=".MainApplication"
-      android:allowBackup="true"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"

android/app/src/main/java/com/buttercup/CryptoPackage.java

@@ -12,11 +12,6 @@
 
 public class CryptoPackage implements ReactPackage {
 
-    @Override
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Collections.emptyList();

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

@@ -40,15 +40,19 @@ protected List<ReactPackage> getPackages() {
         }
     };
 
-    @Override
-    public ReactNativeHost getReactNativeHost() {
-        return mReactNativeHost;
-    }
-
     @Override
     public void onCreate() {
         super.onCreate();
         SoLoader.init(this, /* native exopackage */ false);
     }
 
+//    @Override
+//    protected String getJSMainModuleName() {
+//      return "index";
+//    }
+
+    @Override
+    public ReactNativeHost getReactNativeHost() {
+        return mReactNativeHost;
+    }
 }

index.shared.js

@@ -1,7 +1,8 @@
 import "./shim.js";
-import React, { Component } from "react";
+import React, { Component, Fragment } from "react";
 import { AppRegistry } from "react-native";
 import { Provider } from "react-redux";
+import DropdownAlert from "react-native-dropdownalert";
 import * as Buttercup from "buttercup-web";
 import { createWebDAVAdapter } from "@buttercup/mobile-compat";
 import "./source/compat/DropboxDatasource.js";
@@ -10,6 +11,7 @@ import { getSharedArchiveManager } from "./source/library/buttercup.js";
 import { smartFetch } from "./source/library/network.js";
 import store from "./source/store.js";
 import App from "./source/routing.js";
+import { setNotificationFunction } from "./source/global/notify.js";
 
 export default class ButtercupShared extends Component {
     constructor(...args) {
@@ -23,12 +25,21 @@ export default class ButtercupShared extends Component {
         Buttercup.vendor.webdavFS.setFetchMethod(smartFetch);
         // Initialise the manager
         getSharedArchiveManager().rehydrate();
+        // Setup notifications
+        setNotificationFunction((type, title, message) => {
+            if (this.dropdown) {
+                this.dropdown.alertWithType(type, title, message);
+            }
+        });
     }
 
     render() {
         return (
             <Provider store={store}>
-                <App />
+                <Fragment>
+                    <App />
+                    <DropdownAlert ref={ref => (this.dropdown = ref)} />
+                </Fragment>
             </Provider>
         );
     }