Major January 2021 update (#25)

See PR for details.

Author: pmusaraj

.gitattributes

@@ -1 +1,4 @@
 *.pbxproj -text
+
+# specific for windows script files
+*.bat text eol=crlf

.gitignore

@@ -42,20 +42,17 @@ yarn-error.log
 buck-out/
 \.buckd/
 *.keystore
+!debug.keystore
 
 # fastlane
-#
-# 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://docs.fastlane.tools/best-practices/source-control/
-
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+fastlane/.env.*
+!fastlane/.env.default
+!fastlane/.env.example1
+fastlane/**/
+!fastlane/example1/
 
 # Bundle artifact
 *.jsbundle
-	
+
 # CocoaPods
 /ios/Pods/

README.md

@@ -1,107 +1,91 @@
-Discourse Mobile App for a Single Site (with support for Push Notifications)
---- 
+## Discourse Mobile App for a Single Site (with support for Push Notifications)
 
-Whitelisted iOS app for a single Discourse site that supports Push Notifications via OneSignal. 
+Whitelisted iOS/Android app for a single Discourse site that supports push notifications via OneSignal.
 
-Built with React Native. Inspired by [DiscourseMobile](https://github.com/discourse/DiscourseMobile).
-
-For a demonstration check out SWAPD or TekInvestor on the App Store or Google Play. 
-
-### Do not use this for Android, use web notifications instead
-
-As of September 2018, this app's support for Android will be deprecated. There is now a better way to have notifications in Android from your Discourse site directly. In your Discourse instance, enable the `push notifications prompt` admin setting. This will now let users of your site in applicable browsers (incl. Chrome for Android) see a bar prompting them to enable notifications. And done!
-
-Android-specific instructions below are now outdated. 
+For a demonstration check out SWAPD or TekInvestor on the App Store or Google Play.
 
 ### Getting Started
 
-1. Install React Native.
-```
-npm install -g react-native-cli
-```
+1. Install your packages:
 
-2. Install your packages:
-```
-npm install
+```bash
+yarn install
 ```
 
-3. Copy the contents of `default.variables.js` to `app.variables.js` to set your app's variables (site URL, app name, colors, marketing text, etc.). 
+2. Link the iOS libraries via
 
-4. In the `ios` folder (`cd ios`, run 
+```bash
+cd ios && pod install
 ```
-pod install
-```
-This will link the libraries in xCode. 
 
-5. To run the app locally use:
+3. And run the app in the simulator using:
 
-```
+```bash
 react-native run-ios
+# or
+react-native run-android
 ```
 
-See the [React Native](https://facebook.github.io/react-native/docs/getting-started.html) docs for more details. 
+See the [React Native](https://facebook.github.io/react-native/docs/getting-started.html) docs for more details.
 
 ### OneSignal setup
 
-You need to open an account at OneSignal to be able to send Push Notifications (PNs) from your Discourse site, and receive them in the app. Steps: 
+You need to open an account at OneSignal to be able to send Push Notifications (PNs) from your Discourse site, and receive them in the app. Steps:
 
 - Register an App ID on the Apple portal (developer.apple.com)
-- Open an account with [OneSignal](https://www.onesignal.com) (free), create a new app, and generate certificates for iOS and Android
-- Create the provisioning profiles on the Apple portal. You need a distribution profile for pushing to TestFlight and the App Store, and likely an ad-hoc profile for testing quickly on your device. (Note that you may also need a development certificate for testing the app on your device. Step 2 above creates only the production certificate.)
-- Create an iCloud container and associate it with your App ID.
-
-#### OneSignal Discourse Setup
-
+- Open an account with [OneSignal](https://www.onesignal.com) (free), create a new app, and generate certificates for iOS and Android (see Onesignal documentation for steps on each platform)
 - Add the [discourse-onesignal](https://github.com/pmusaraj/discourse-onesignal/) plugin to your Discourse instance and configure it: enable notifications, add your OneSignal App ID and the OneSignal REST API key.
-- In your Discourse settings, add your site's home URL to `allowed user api auth redirects` (the app will redirect to your home URL once the user authorizes access for the app in Discourse). 
-- ~And add the OneSignal API Endpoint `https://onesignal.com/api/v1/notifications` to `allowed user api push urls`.~ This step is no longer needed, because it causes Discourse to send a second request to OneSignal (which fails). If you have previously added this to your configuration, you should remove it once your app has been updated to include [this commit](https://github.com/pmusaraj/discourse-mobile-single-site-app/commit/c98ab1468ffb03030ff9793d17fe43af99d995a6).
+- in your app's `app.variables.js` file, add the OneSignal App ID
 
-#### OneSignal updates to native code
+### Build and release using Fastlane
 
-In your app code for either iOS or Android, you need to replace the placeholder OneSignal App ID with your app's OneSignal App ID. 
+To simplify managing your app and keeping up with changes in the repo, you can use the included Fastlane scripts.
 
-- For iOS, look for `ONESIGNAL_APP_ID` in `ios/DiscoSingle/AppDelegate.m`. 
-- For Android, look for `DISCOSINGLE_ONESIGNAL_APP_ID` and `DISCOSINGLE_GOOGLE_PROJECT_NUMBER` in `android/app/build.gradle`. (You will get the Google Project Number while setting up OneSignal for your Android app.) 
+#### Initial setup
 
-You should now be ready to build and test the app. Note that in iOS, Push Notifications can only be tested on a real device, but the OneSignal console will show attempts to enable Push Notifications from a simulator.
+- Create a private git repository that Fastlane's `match` script uses to generate and update your app's certificates.
+- Copy the `fastlane/example1` folder and the `.env.example1` file and rename them using your app's name (for this guide, we will assume the copied items are `fastlane/yourapp` and `.env.yourapp`).
+- Update the variables in the folder and the ENV file, as well as the logo.png and splash.png images.
+- **iOS**: Create an App Store Connect API Key and follow the instructions in https://docs.fastlane.tools/app-store-connect-api/, and update the `fastlane/yourapp/key.json` file with the key
+  details.
+- **Android**: generate or copy over your app's keystore and secrets in the respective files in `fastlane/yourapp`.
 
-### Helpful Tools
+You should now be ready to run Fastlane scripts for your app's environment. by appending `--env yourapp` to any Fastlane commands.
 
-#### Generating assets
-Use [generator-rn-toolbox](https://github.com/bamlab/generator-rn-toolbox) to setup icons and splash screens for the app: 
+To update the app name and assets, run:
 
 ```
-npm install -g yo generator-rn-toolbox
-
-yo rn-toolbox:assets --icon icon.png
-yo rn-toolbox:assets --splash splash.png --android
-yo rn-toolbox:assets --splash splash.png --ios
+cd fastlane
+fastlane switch --env yourapp
 ```
 
-#### Logo for login screen
-The logo file for the login screen is under `js/logo.png`. Replace it with your logo.  
+To generate (or update) iOS certificates, run:
 
-#### Android build using Gradle
-Follow the [official React Native](https://facebook.github.io/react-native/docs/signed-apk-android.html) instructions on generating a key and an APK for release. Then run
 ```
-cd android && ./gradlew assembleRelease
+cd fastlane
+fastlane ios certificates --env yourapp
 ```
-and find your release file under `android/app/build/outputs/apk/app-release.apk`. 
-
-#### Renaming your App
 
-You can rename the app using `react-native-rename`. This is necessary for Android, because it's the only way to change the bundle ID. 
+To build your app for iOS, run:
 
 ```
-npm install react-native-rename -g
-react-native-rename "NewName" -b com.yourco.yourappid
+cd fastlane
+fastlane ios install --env yourapp
+# will install the app on a connected device or simulator
+
+fastlane ios release --env yourapp
+# will build and upload the app to TestFlight
+
 ```
 
-(The bundle name specified by `-b` above only applies to Android, to change your iOS bundle ID, use Xcode.)
+To build your app for Android, run:
 
-After renaming the app, you need to manually edit some files in subfolders under `android/app/src/main/java`, and replace `com.discosingle;` at the beginning of every file with your new bundle ID. The rename script does it for `MainActivity.java` and `MainApplication.java`, you need to manually do this for the remaining files. 
+```
+cd fastlane
+fastlane android apk --env yourapp
+# will build an apk in android/app/build/outputs/apk/
 
-### Troubleshooting
+fastlane android release --env yourapp
+# will create a bundle android/app/build/outputs/bundle/
 
-- Android file uploads may fail. The app uses https://github.com/dahjelle/react-native-android-webview-file-image-upload to enable file uploads in WebView, but it's not tested with all versions of Android.
-- If you have already checked out the project, and renamed the app, you may run into a variety of file conflicts if you pull updates. This is especially the case if the React Native version in the project has been updated. This is normal, and a better course of action is to check out a fresh copy, and reapply your changes and the rename. 
+```

android/app/BUCK android/app/_BUCK

@@ -1,9 +1,9 @@
 buildscript {
     repositories {
-        maven { url 'https://plugins.gradle.org/m2/' } // Gradle Plugin Portal 
+        maven { url 'https://plugins.gradle.org/m2/' } // Gradle Plugin Portal
     }
     dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.1, 0.99.99]'
+        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.9, 0.99.99]'
     }
 }
 
@@ -138,13 +138,12 @@ android {
      }
 
     defaultConfig {
-        applicationId "com.discosingle"
+        applicationId ANDROID_APP_ID
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
-        manifestPlaceholders = [onesignal_app_id: "DISCOSINGLE_ONESIGNAL_APP_ID",
-                                onesignal_google_project_number: "DISCOSINGLE_GOOGLE_PROJECT_NUMBER"]
+        versionCode 37
+        versionName "1.6"
+        multiDexEnabled true
     }
     splits {
         abi {
@@ -161,6 +160,12 @@ android {
             keyAlias 'androiddebugkey'
             keyPassword 'android'
         }
+        release {
+            storeFile file(MYAPP_RELEASE_STORE_FILE)
+            storePassword MYAPP_RELEASE_STORE_PASSWORD
+            keyAlias MYAPP_RELEASE_KEY_ALIAS
+            keyPassword MYAPP_RELEASE_KEY_PASSWORD
+        }
     }
     buildTypes {
         debug {
@@ -169,7 +174,7 @@ android {
         release {
             // Caution! In production, you need to generate your own keystore file.
             // see https://facebook.github.io/react-native/docs/signed-apk-android.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
@@ -189,26 +194,34 @@ android {
         }
     }
 
-    packagingOptions {
-        pickFirst '**/armeabi-v7a/libc++_shared.so'
-        pickFirst '**/x86/libc++_shared.so'
-        pickFirst '**/arm64-v8a/libc++_shared.so'
-        pickFirst '**/x86_64/libc++_shared.so'
-        pickFirst '**/x86/libjsc.so'
-        pickFirst '**/armeabi-v7a/libjsc.so'
-    }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation 'com.android.support:multidex:1.0.3'
+
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+      exclude group:'com.facebook.fbjni'
+    }
+
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
+    }
+
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
 
     if (enableHermes) {
-      def hermesPath = "../../node_modules/hermesvm/android/";
-      debugImplementation files(hermesPath + "hermes-debug.aar")
-      releaseImplementation files(hermesPath + "hermes-release.aar")
+        def hermesPath = "../../node_modules/hermes-engine/android/";
+        debugImplementation files(hermesPath + "hermes-debug.aar")
+        releaseImplementation files(hermesPath + "hermes-release.aar")
     } else {
-      implementation jscFlavor
+        implementation jscFlavor
     }
 }
 
@@ -219,4 +232,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
     into 'libs'
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

android/app/build.gradle

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.rndiffapp;
+
+import android.content.Context;
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.android.utils.FlipperUtils;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
+import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.network.NetworkingModule;
+import okhttp3.OkHttpClient;
+
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    if (FlipperUtils.shouldEnableFlipper(context)) {
+      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+
+      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new ReactFlipperPlugin());
+      client.addPlugin(new DatabasesFlipperPlugin(context));
+      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+      client.addPlugin(CrashReporterPlugin.getInstance());
+
+      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+      NetworkingModule.setCustomClientBuilder(
+          new NetworkingModule.CustomClientBuilder() {
+            @Override
+            public void apply(OkHttpClient.Builder builder) {
+              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+            }
+          });
+      client.addPlugin(networkFlipperPlugin);
+      client.start();
+
+      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+      // Hence we run if after all native modules have been initialized
+      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+      if (reactContext == null) {
+        reactInstanceManager.addReactInstanceEventListener(
+            new ReactInstanceManager.ReactInstanceEventListener() {
+              @Override
+              public void onReactContextInitialized(ReactContext reactContext) {
+                reactInstanceManager.removeReactInstanceEventListener(this);
+                reactContext.runOnNativeModulesQueueThread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
+              }
+            });
+      } else {
+        client.addPlugin(new FrescoFlipperPlugin());
+      }
+    }
+  }
+}

android/app/debug.keystore

@@ -17,9 +17,9 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:windowSoftInputMode="adjustResize"
-        android:launchMode="singleTop">
+        android:launchMode="singleTask">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />

android/app/src/debug/java/com/discosingle/ReactNativeFlipper.java

@@ -1,9 +1,13 @@
 package com.discosingle;
 
+import android.os.Bundle;
 import com.facebook.react.ReactActivity;
 
 public class MainActivity extends ReactActivity {
-
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
     /**
      * Returns the name of the main component registered from JavaScript.
      * This is used to schedule rendering of the component.