Merge pull request #169 from tooot-app/main

Test expo 43

android/app/build.gradle

@@ -78,13 +78,11 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    enableHermes: (findProperty('expo.jsEngine') ?: "jsc") == "hermes"
+    enableHermes: (findProperty('expo.jsEngine') ?: "jsc") == "hermes",
+    cliPath: new File(["node", "--print", "require.resolve('react-native/package.json')"].execute().text.trim(), "../cli.js")
 ]
 
-apply from: '../../node_modules/react-native-unimodules/gradle.groovy'
-apply from: "../../node_modules/react-native/react.gradle"
-apply from: "../../node_modules/expo-constants/scripts/get-app-config-android.gradle"
-apply from: "../../node_modules/expo-updates/scripts/create-manifest-android.gradle"
+apply from: new File(["node", "--print", "require.resolve('react-native/package.json')"].execute().text.trim(), "../react.gradle")
 
 /**
  * Set this to true to create two separate APKs instead of one:
@@ -193,6 +191,32 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
+
+    def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true";
+    def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true";
+    def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true";
+
+    // If your app supports Android versions before Ice Cream Sandwich (API level 14)
+    // All fresco packages should use the same version
+    if (isGifEnabled || isWebpEnabled) {
+        implementation 'com.facebook.fresco:fresco:2.0.0'
+        implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.0.0'
+    }
+
+    if (isGifEnabled) {
+        // For animated gif support
+        implementation 'com.facebook.fresco:animated-gif:2.0.0'
+    }
+
+    if (isWebpEnabled) {
+        // For webp support
+        implementation 'com.facebook.fresco:webpsupport:2.0.0'
+        if (isWebpAnimatedEnabled) {
+            // Animated webp support
+            implementation 'com.facebook.fresco:animated-webp:2.0.0'
+        }
+    }
+
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
       exclude group:'com.facebook.fbjni'
@@ -204,12 +228,10 @@ dependencies {
     debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'
     }
-    addUnimodulesDependencies()
 
     if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
-        debugImplementation files(hermesPath + "hermes-debug.aar")
-        releaseImplementation files(hermesPath + "hermes-release.aar")
+        debugImplementation files(new File(["node", "--print", "require.resolve('hermes-engine/package.json')"].execute().text.trim(), "../android/hermes-debug.aar"))
+        releaseImplementation files(new File(["node", "--print", "require.resolve('hermes-engine/package.json')"].execute().text.trim(), "../android/hermes-release.aar"))
     } else {
         implementation jscFlavor
     }
@@ -222,6 +244,7 @@ task copyDownloadableDepsToLibs(type: Copy) {
     into 'libs'
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute().text.trim(), "../native_modules.gradle");
+applyNativeModulesAppBuildGradle(project)
 
 apply plugin: 'com.google.gms.google-services'

android/app/src/main/java/com/xmflsct/app/tooot/MainActivity.java

@@ -1,7 +1,4 @@
 package com.xmflsct.app.tooot;
-import android.content.res.Configuration;
-import android.content.Intent;
-
 import android.os.Bundle;
 
 import com.facebook.react.ReactActivity;
@@ -9,30 +6,14 @@ import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
-import expo.modules.splashscreen.singletons.SplashScreen;
-import expo.modules.splashscreen.SplashScreenImageResizeMode;
-
+import expo.modules.ReactActivityDelegateWrapper;
 
 public class MainActivity extends ReactActivity {
-
-    // Added automatically by Expo Config
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        Intent intent = new Intent("onConfigurationChanged");
-        intent.putExtra("newConfig", newConfig);
-        sendBroadcast(intent);
-    }
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(null);
-    // SplashScreen.show(...) has to be called after super.onCreate(...)
-    // Below line is handled by '@expo/configure-splash-screen' command and it's discouraged to modify it manually
-    SplashScreen.show(this, SplashScreenImageResizeMode.CONTAIN, ReactRootView.class, false);
   }
 
-
     /**
      * Returns the name of the main component registered from JavaScript.
      * This is used to schedule rendering of the component.
@@ -44,11 +25,14 @@ public class MainActivity extends ReactActivity {
 
     @Override
     protected ReactActivityDelegate createReactActivityDelegate() {
-        return new ReactActivityDelegate(this, getMainComponentName()) {
-            @Override
-            protected ReactRootView createRootView() {
-                return new RNGestureHandlerEnabledRootView(MainActivity.this);
+        return new ReactActivityDelegateWrapper(
+            this,
+            new ReactActivityDelegate(this, getMainComponentName()) {
+                @Override
+                protected ReactRootView createRootView() {
+                    return new RNGestureHandlerEnabledRootView(MainActivity.this);
+                }
             }
-        };
+        );
     }
 }

android/app/src/main/java/com/xmflsct/app/tooot/MainApplication.java

@@ -2,7 +2,8 @@ package com.xmflsct.app.tooot;
 
 import android.app.Application;
 import android.content.Context;
-import android.net.Uri;
+import android.content.res.Configuration;
+import androidx.annotation.NonNull;
 
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
@@ -13,30 +14,26 @@ import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 import com.xmflsct.app.tooot.generated.BasePackageList;
 
-import org.unimodules.adapters.react.ReactAdapterPackage;
-import org.unimodules.adapters.react.ModuleRegistryAdapter;
-import org.unimodules.adapters.react.ReactModuleRegistryProvider;
-import org.unimodules.core.interfaces.Package;
-import org.unimodules.core.interfaces.SingletonModule;
-import expo.modules.constants.ConstantsPackage;
+import expo.modules.ApplicationLifecycleDispatcher;
+import expo.modules.ReactNativeHostWrapper;
 import expo.modules.permissions.PermissionsPackage;
 import expo.modules.filesystem.FileSystemPackage;
 import expo.modules.updates.UpdatesController;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 
-  import com.facebook.react.bridge.JSIModulePackage; // <- react-native-reanimated-v2
-  import com.swmansion.reanimated.ReanimatedJSIModulePackage; // <- react-native-reanimated-v2
+import com.facebook.react.bridge.JSIModulePackage; // <- react-native-reanimated-v2
+import com.swmansion.reanimated.ReanimatedJSIModulePackage; // <- react-native-reanimated-v2
 
 public class MainApplication extends Application implements ReactApplication {
   private final ReactModuleRegistryProvider mModuleRegistryProvider = new ReactModuleRegistryProvider(
     new BasePackageList().getPackageList()
   );
 
-  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+  private final ReactNativeHost mReactNativeHost = new ReactNativeHostWrapper(
+    this,
+    new ReactNativeHost(this) {
     @Override
     public boolean getUseDeveloperSupport() {
       return BuildConfig.DEBUG;
@@ -44,8 +41,10 @@ public class MainApplication extends Application implements ReactApplication {
 
     @Override
     protected List<ReactPackage> getPackages() {
+      @SuppressWarnings("UnnecessaryLocalVariable")
       List<ReactPackage> packages = new PackageList(this).getPackages();
-      packages.add(new ModuleRegistryAdapter(mModuleRegistryProvider));
+      // Packages that cannot be autolinked yet can be added manually here, for example:
+      // packages.add(new MyReactNativePackage());
       return packages;
     }
 
@@ -58,24 +57,6 @@ public class MainApplication extends Application implements ReactApplication {
     protected JSIModulePackage getJSIModulePackage() {
       return new ReanimatedJSIModulePackage();
     }
-
-    @Override
-    protected @Nullable String getJSBundleFile() {
-      if (BuildConfig.DEBUG) {
-        return super.getJSBundleFile();
-      } else {
-        return UpdatesController.getInstance().getLaunchAssetFile();
-      }
-    }
-
-    @Override
-    protected @Nullable String getBundleAssetName() {
-      if (BuildConfig.DEBUG) {
-        return super.getBundleAssetName();
-      } else {
-        return UpdatesController.getInstance().getBundleAssetName();
-      }
-    }
   };
 
   @Override
@@ -88,11 +69,14 @@ public class MainApplication extends Application implements ReactApplication {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
 
-    if (!BuildConfig.DEBUG) {
-      UpdatesController.initialize(this);
-    }
-
     initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    ApplicationLifecycleDispatcher.onApplicationCreate(this);
+  }
+
+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig);
   }
 
   /**

android/build.gradle

@@ -10,6 +10,7 @@ buildscript {
     }
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
     dependencies {
@@ -26,14 +27,15 @@ allprojects {
         mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
+            url(new File(["node", "--print", "require.resolve('react-native/package.json')"].execute().text.trim(), "../android"))
         }
         maven {
             // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
+            url(new File(["node", "--print", "require.resolve('jsc-android/package.json')"].execute().text.trim(), "../dist"))
         }
 
         google()
+        mavenCentral()
         jcenter()
         maven { url 'https://www.jitpack.io' }
     }

android/gradle.properties

@@ -35,4 +35,12 @@ org.gradle.configureondemand=true
 
 # The hosted JavaScript engine
 # Supported values: expo.jsEngine = "hermes" | "jsc"
-expo.jsEngine=hermes
+expo.jsEngine=hermes
+
+# Enable GIF support in React Native images (~200 B increase)
+expo.gif.enabled=true
+# Enable webp support in React Native images (~85 KB increase)
+expo.webp.enabled=true
+# Enable animated webp support (~3.4 MB increase)
+# Disabled by default because iOS doesn't support animated webp
+expo.webp.animated=false

android/settings.gradle

@@ -1,9 +1,9 @@
 rootProject.name = 'tooot'
 
-apply from: '../node_modules/react-native-unimodules/gradle.groovy'
-includeUnimodulesProjects()
+apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute().text.trim(), "../scripts/autolinking.gradle");
+useExpoModules()
 
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle");
+apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute().text.trim(), "../native_modules.gradle");
 applyNativeModulesSettingsGradle(settings)
 
 include ':app'

app.config.ts

@@ -9,7 +9,6 @@ export default (): ExpoConfig => ({
   description: 'tooot for Mastodon',
   slug: 'tooot',
   version: toootVersion,
-  sdkVersion: versions.expo,
   privacy: 'hidden',
   assetBundlePatterns: ['assets/*'],
   extra: {
@@ -30,11 +29,11 @@ export default (): ExpoConfig => ({
       }
     ]
   },
+  jsEngine: 'hermes',
   ios: {
     bundleIdentifier: 'com.xmflsct.app.tooot'
   },
   android: {
-    jsEngine: 'hermes',
     package: 'com.xmflsct.app.tooot',
     googleServicesFile: './configs/google-services.json',
     permissions: ['CAMERA', 'VIBRATE']

fastlane/metadata/en-US/release_notes.txt

@@ -1,2 +1,4 @@
-Added translation option, translation service is provided by various providers
-When updating profile, now avatar and banner can be uploaded
+🍎
+Support version from iOS 12
+🤖️
+Support APNG animation

fastlane/metadata/zh-Hans/release_notes.txt

@@ -1,2 +1,4 @@
-加入翻译嘟文支持，翻译服务由多个服务商提供
-修改个人信息里可以上传头像及横幅
+🍎
+最低版本支持升级至iOS 12
+🤖️
+支持APNG动画

ios/Podfile

@@ -1,17 +1,19 @@
-require_relative '../node_modules/react-native/scripts/react_native_pods'
-require_relative '../node_modules/react-native-unimodules/cocoapods.rb'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
+require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
+require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules")
 
-platform :ios, '11.0'
+platform :ios, '12.0'
+
+require 'json'
+podfile_properties = JSON.parse(File.read('./Podfile.properties.json')) rescue {}
 
 target 'tooot' do
-  use_unimodules!
+  use_expo_modules!
   config = use_native_modules!
 
   use_react_native!(
     :path => config[:reactNativePath],
-    # to enable hermes on iOS, change `false` to `true` and then install pods
-    :hermes_enabled => false
+    :hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes'
   )
 
   # Enables Flipper.
@@ -22,5 +24,17 @@ target 'tooot' do
 
   post_install do |installer|
     react_native_post_install(installer)
+
+    # Workaround `Cycle inside FBReactNativeSpec` error for react-native 0.64
+    # Reference: https://github.com/software-mansion/react-native-screens/issues/842#issuecomment-812543933
+    installer.pods_project.targets.each do |target|
+      if (target.name&.eql?('FBReactNativeSpec'))
+        target.build_phases.each do |build_phase|
+          if (build_phase.respond_to?(:name) && build_phase.name.eql?('[CP-User] Generate Specs'))
+            target.build_phases.move(build_phase, 0)
+          end
+        end
+      end
+    end
   end
 end

ios/Podfile.properties.json

@@ -0,0 +1,3 @@
+{
+  "expo.jsEngine": "jsc"
+}

ios/tooot.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		96905EF65AED1B983A6B3ABC /* libPods-tooot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-tooot.a */; };
 		BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
 		DA8B5B7F0DED488CAC0FF169 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B96B72E5384D44A7B240B27E /* GoogleService-Info.plist */; };
+		E3BC22F5F8ABE515E14CF199 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D878F932AF7A9974E06E461 /* ExpoModulesProvider.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -37,6 +38,7 @@
 		5EE44DD52600124E00A9BCED /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
 		6C2E3173556A471DD304B334 /* Pods-tooot.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-tooot.debug.xcconfig"; path = "Target Support Files/Pods-tooot/Pods-tooot.debug.xcconfig"; sourceTree = "<group>"; };
 		7A4D352CD337FB3A3BF06240 /* Pods-tooot.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-tooot.release.xcconfig"; path = "Target Support Files/Pods-tooot/Pods-tooot.release.xcconfig"; sourceTree = "<group>"; };
+		9D878F932AF7A9974E06E461 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-tooot/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
 		AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = tooot/SplashScreen.storyboard; sourceTree = "<group>"; };
 		B96B72E5384D44A7B240B27E /* GoogleService-Info.plist */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "tooot/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = "<group>"; };
@@ -75,6 +77,14 @@
 			name = tooot;
 			sourceTree = "<group>";
 		};
+		1568DA5289D5AE7A39201A34 /* tooot */ = {
+			isa = PBXGroup;
+			children = (
+				9D878F932AF7A9974E06E461 /* ExpoModulesProvider.swift */,
+			);
+			name = tooot;
+			sourceTree = "<group>";
+		};
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -85,6 +95,14 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		2FFEB4B0D00502D5425CDDC2 /* ExpoModulesProviders */ = {
+			isa = PBXGroup;
+			children = (
+				1568DA5289D5AE7A39201A34 /* tooot */,
+			);
+			name = ExpoModulesProviders;
+			sourceTree = "<group>";
+		};
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
@@ -102,6 +120,7 @@
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
 				D65327D7A22EEC0BE12398D9 /* Pods */,
 				5EE44DD42600124E00A9BCED /* tooot-Bridging-Header.h */,
+				2FFEB4B0D00502D5425CDDC2 /* ExpoModulesProviders */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -253,10 +272,14 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-tooot/Pods-tooot-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/EXUpdates.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXUpdates.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -293,6 +316,7 @@
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
 				5EE44DD62600124E00A9BCED /* File.swift in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
+				E3BC22F5F8ABE515E14CF199 /* ExpoModulesProvider.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -338,7 +362,7 @@
 					"FB_SONARKIT_ENABLED=1",
 				);
 				INFOPLIST_FILE = tooot/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -369,7 +393,7 @@
 				DEVELOPMENT_TEAM = 8EGBLQ2MA6;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = tooot/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -435,7 +459,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
@@ -490,7 +514,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",

ios/tooot/AppDelegate.h

@@ -1,10 +1,9 @@
 #import <Foundation/Foundation.h>
-#import <EXUpdates/EXUpdatesAppController.h>
 #import <React/RCTBridgeDelegate.h>
 #import <UIKit/UIKit.h>
 
-#import <UMCore/UMAppDelegateWrapper.h>
+#import <Expo/Expo.h>
 
-@interface AppDelegate : UMAppDelegateWrapper <RCTBridgeDelegate, EXUpdatesAppControllerDelegate>
+@interface AppDelegate : EXAppDelegateWrapper <RCTBridgeDelegate>
 
 @end

ios/tooot/AppDelegate.m

@@ -4,12 +4,7 @@
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
 #import <React/RCTLinkingManager.h>
-
-#import <UMCore/UMModuleRegistry.h>
-#import <UMReactNativeAdapter/UMNativeModulesProxy.h>
-#import <UMReactNativeAdapter/UMModuleRegistryAdapter.h>
-#import <EXSplashScreen/EXSplashScreenService.h>
-#import <UMCore/UMModuleRegistryProvider.h>
+#import <React/RCTConvert.h>
 
 #if defined(FB_SONARKIT_ENABLED) && __has_include(<FlipperKit/FlipperClient.h>)
 #import <FlipperKit/FlipperClient.h>
@@ -19,8 +14,6 @@
 #import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
 #import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
 
-#import <React/RCTLinkingManager.h>
-
 // iOS 9.x or newer
 - (BOOL)application:(UIApplication *)application
             openURL:(NSURL *)url
@@ -50,13 +43,6 @@ static void InitializeFlipper(UIApplication *application) {
 }
 #endif
 
-@interface AppDelegate () <RCTBridgeDelegate>
-
-@property (nonatomic, strong) UMModuleRegistryAdapter *moduleRegistryAdapter;
-@property (nonatomic, strong) NSDictionary *launchOptions;
-
-@end
-
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -65,57 +51,40 @@ static void InitializeFlipper(UIApplication *application) {
   InitializeFlipper(application);
 #endif
   
-  self.moduleRegistryAdapter = [[UMModuleRegistryAdapter alloc] initWithModuleRegistryProvider:[[UMModuleRegistryProvider alloc] init]];
-  self.launchOptions = launchOptions;
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
+  if (rootViewBackgroundColor != nil) {
+    rootView.backgroundColor = [RCTConvert UIColor:rootViewBackgroundColor];
+  } else {
+    rootView.backgroundColor = [UIColor whiteColor];
+  }
+
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  #ifdef DEBUG
-    [self initializeReactNativeApp];
-  #else
-    EXUpdatesAppController *controller = [EXUpdatesAppController sharedInstance];
-    controller.delegate = self;
-    [controller startAndShowLaunchScreen:self.window];
-  #endif
+  UIViewController *rootViewController = [UIViewController new];
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
 
   [super application:application didFinishLaunchingWithOptions:launchOptions];
 
   return YES;
 }
 
-- (RCTBridge *)initializeReactNativeApp
-{
-  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:self.launchOptions];
-  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
-  rootView.backgroundColor = [UIColor colorNamed:@"Background"];
-
-  UIViewController *rootViewController = [UIViewController new];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
-  [self.window makeKeyAndVisible];
-
-  return bridge;
- }
-
 - (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
 {
-  NSArray<id<RCTBridgeModule>> *extraModules = [_moduleRegistryAdapter extraModulesForBridge:bridge];
   // If you'd like to export some custom RCTBridgeModules that are not Expo modules, add them here!
-  return extraModules;
+  return @[];
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
  #ifdef DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
  #else
-  return [[EXUpdatesAppController sharedInstance] launchAssetUrl];
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
  #endif
 }
 
-- (void)appController:(EXUpdatesAppController *)appController didStartWithSuccess:(BOOL)success {
-  appController.bridge = [self initializeReactNativeApp];
-  EXSplashScreenService *splashScreenService = (EXSplashScreenService *)[UMModuleRegistryProvider getSingletonModuleForClass:[EXSplashScreenService class]];
-  [splashScreenService showSplashScreenFor:self.window.rootViewController];
-}
-
 // Linking API
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
   return [RCTLinkingManager application:application openURL:url options:options];

ios/tooot/noop-file.swift

@@ -0,0 +1,4 @@
+//
+// @generated
+// A blank Swift file must be created for native modules with Swift files to work correctly.
+//

package.json

@@ -1,11 +1,10 @@
 {
   "name": "tooot",
   "versions": {
-    "native": "210916",
-    "major": 2,
-    "minor": 2,
-    "patch": 0,
-    "expo": "42.0.0"
+    "native": "211024",
+    "major": 3,
+    "minor": 0,
+    "patch": 0
   },
   "description": "tooot app for Mastodon",
   "author": "xmflsct <me@xmflsct.com>",
@@ -20,53 +19,57 @@
     "ios": "react-native run-ios",
     "app:build": "bundle exec fastlane build",
     "release": "scripts/release.sh",
-    "clean": "react-native-clean-project"
+    "clean": "react-native-clean-project",
+    "postinstall": "patch-package"
   },
   "dependencies": {
-    "@expo/react-native-action-sheet": "3.11.0",
+    "@expo/react-native-action-sheet": "3.12.0",
     "@neverdull-agency/expo-unlimited-secure-store": "1.0.10",
-    "@react-native-async-storage/async-storage": "1.15.8",
+    "@react-native-async-storage/async-storage": "1.15.9",
     "@react-native-community/blur": "3.6.0",
-    "@react-native-community/cameraroll": "4.0.4",
-    "@react-native-community/netinfo": "6.0.2",
+    "@react-native-community/cameraroll": "4.1.2",
+    "@react-native-community/netinfo": "6.0.4",
     "@react-native-community/segmented-control": "2.2.2",
-    "@react-navigation/bottom-tabs": "6.0.7",
-    "@react-navigation/native": "6.0.4",
-    "@react-navigation/native-stack": "6.2.2",
-    "@react-navigation/stack": "6.0.9",
-    "@reduxjs/toolkit": "1.6.1",
-    "@sentry/react-native": "2.6.2",
+    "@react-navigation/bottom-tabs": "6.0.9",
+    "@react-navigation/native": "6.0.6",
+    "@react-navigation/native-stack": "6.2.5",
+    "@react-navigation/stack": "6.0.11",
+    "@reduxjs/toolkit": "1.6.2",
+    "@sentry/react-native": "3.1.1",
     "@sharcoux/slider": "5.5.2",
-    "axios": "0.22.0",
-    "expo": "42.0.4",
-    "expo-auth-session": "3.3.1",
-    "expo-av": "9.2.3",
-    "expo-crypto": "9.2.0",
-    "expo-device": "^3.3.0",
-    "expo-firebase-analytics": "4.1.0",
-    "expo-haptics": "10.1.0",
-    "expo-image-manipulator": "9.2.2",
-    "expo-image-picker": "10.2.3",
-    "expo-linking": "2.3.1",
-    "expo-localization": "10.2.0",
-    "expo-notifications": "0.12.3",
-    "expo-permissions": "^12.1.1",
-    "expo-random": "11.2.0",
-    "expo-screen-capture": "3.2.0",
-    "expo-secure-store": "10.2.0",
-    "expo-splash-screen": "0.11.4",
-    "expo-status-bar": "1.0.4",
-    "expo-store-review": "4.1.0",
-    "expo-updates": "^0.8.5",
-    "expo-video-thumbnails": "^5.2.1",
-    "expo-web-browser": "9.2.0",
+    "axios": "0.23.0",
+    "expo": "43.0.0",
+    "expo-auth-session": "3.4.2",
+    "expo-av": "10.1.2",
+    "expo-constants": "^12.1.3",
+    "expo-crypto": "10.0.3",
+    "expo-device": "4.0.3",
+    "expo-file-system": "^13.0.3",
+    "expo-firebase-analytics": "5.0.3",
+    "expo-haptics": "11.0.3",
+    "expo-image-manipulator": "10.1.2",
+    "expo-image-picker": "11.0.3",
+    "expo-linking": "2.4.2",
+    "expo-localization": "11.0.0",
+    "expo-media-library": "^13.0.3",
+    "expo-notifications": "0.13.3",
+    "expo-permissions": "13.0.3",
+    "expo-random": "12.0.0",
+    "expo-screen-capture": "4.0.3",
+    "expo-secure-store": "11.0.3",
+    "expo-splash-screen": "0.13.4",
+    "expo-status-bar": "1.1.0",
+    "expo-store-review": "5.0.3",
+    "expo-updates": "0.10.5",
+    "expo-video-thumbnails": "6.0.3",
+    "expo-web-browser": "10.0.3",
     "i18next": "20.6.1",
     "li": "1.3.0",
     "lodash": "4.17.21",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-i18next": "11.12.0",
-    "react-native": "0.64.2",
+    "react-native": "0.66.1",
     "react-native-animated-spinkit": "1.5.2",
     "react-native-blurhash": "1.1.5",
     "react-native-fast-image": "8.5.11",
@@ -74,34 +77,32 @@
     "react-native-flash-message": "0.2.0",
     "react-native-gesture-handler": "1.10.3",
     "react-native-htmlview": "0.16.0",
-    "react-native-pager-view": "5.4.6",
-    "react-native-reanimated": "2.2.2",
-    "react-native-safe-area-context": "3.2.0",
+    "react-native-pager-view": "5.4.7",
+    "react-native-reanimated": "2.3.0-beta.3",
+    "react-native-safe-area-context": "3.3.2",
     "react-native-screens": "3.8.0",
     "react-native-svg": "12.1.1",
     "react-native-swipe-list-view": "3.2.9",
     "react-native-tab-view": "3.1.1",
-    "react-native-unimodules": "0.14.8",
-    "react-query": "3.25.1",
+    "react-query": "3.28.0",
     "react-redux": "7.2.5",
     "react-timeago": "6.2.1",
     "redux-persist": "6.0.0",
     "rn-placeholder": "3.0.3",
-    "sentry-expo": "4.0.1",
+    "sentry-expo": "4.0.3",
     "tslib": "2.3.1",
     "valid-url": "1.0.9"
   },
   "devDependencies": {
-    "@babel/core": "7.15.5",
+    "@babel/core": "7.15.8",
     "@babel/plugin-proposal-optional-chaining": "7.14.5",
     "@babel/preset-typescript": "7.15.0",
-    "@expo/config": "6.0.0",
-    "@types/lodash": "4.14.175",
-    "@types/react": "17.0.27",
-    "@types/react-dom": "17.0.9",
-    "@types/react-native": "0.64.13",
-    "@types/react-navigation": "3.4.0",
-    "@types/react-redux": "7.1.18",
+    "@expo/config": "6.0.6",
+    "@types/lodash": "4.14.176",
+    "@types/react": "17.0.31",
+    "@types/react-dom": "17.0.10",
+    "@types/react-native": "0.66.0",
+    "@types/react-redux": "7.1.20",
     "@types/react-timeago": "4.1.3",
     "@types/valid-url": "1.0.3",
     "@welldone-software/why-did-you-render": "6.2.1",
@@ -109,7 +110,9 @@
     "babel-plugin-transform-remove-console": "6.9.4",
     "chalk": "4.1.2",
     "dotenv": "10.0.0",
+    "patch-package": "6.4.7",
+    "postinstall-postinstall": "2.1.0",
     "react-native-clean-project": "3.6.7",
-    "typescript": "4.4.3"
+    "typescript": "4.4.4"
   }
 }

patches/react-native-fast-image+8.5.11.patch

@@ -0,0 +1,10 @@
+diff --git a/node_modules/react-native-fast-image/android/build.gradle b/node_modules/react-native-fast-image/android/build.gradle
+index 5b21cd5..19d82f8 100644
+--- a/node_modules/react-native-fast-image/android/build.gradle
++++ b/node_modules/react-native-fast-image/android/build.gradle
+@@ -65,4 +65,5 @@ dependencies {
+     implementation "com.github.bumptech.glide:glide:${glideVersion}"
+     implementation "com.github.bumptech.glide:okhttp3-integration:${glideVersion}"
+     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
++    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.12.0'
+ }

src/api/general.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import chalk from 'chalk'
-import { Constants } from 'react-native-unimodules'
+import Constants from 'expo-constants'
 import * as Sentry from 'sentry-expo'
 
 const ctx = new chalk.Instance({ level: 3 })

src/api/instance.ts

@@ -1,8 +1,8 @@
 import { RootState } from '@root/store'
 import axios, { AxiosRequestConfig } from 'axios'
 import chalk from 'chalk'
+import Constants from 'expo-constants'
 import li from 'li'
-import { Constants } from 'react-native-unimodules'
 
 const ctx = new chalk.Instance({ level: 3 })
 

src/api/tooot.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import chalk from 'chalk'
-import { Constants } from 'react-native-unimodules'
+import Constants from 'expo-constants'
 import * as Sentry from 'sentry-expo'
 
 const ctx = new chalk.Instance({ level: 3 })

src/screens/Compose.tsx

@@ -55,20 +55,18 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
 
   const [hasKeyboard, setHasKeyboard] = useState(false)
   useEffect(() => {
-    Keyboard.addListener('keyboardWillShow', _keyboardDidShow)
-    Keyboard.addListener('keyboardWillHide', _keyboardDidHide)
+    const keyboardShown = Keyboard.addListener('keyboardWillShow', () =>
+      setHasKeyboard(true)
+    )
+    const keyboardHidden = Keyboard.addListener('keyboardWillHide', () =>
+      setHasKeyboard(false)
+    )
 
     return () => {
-      Keyboard.removeListener('keyboardWillShow', _keyboardDidShow)
-      Keyboard.removeListener('keyboardWillHide', _keyboardDidHide)
+      keyboardShown.remove()
+      keyboardHidden.remove()
     }
   }, [])
-  const _keyboardDidShow = () => {
-    setHasKeyboard(true)
-  }
-  const _keyboardDidHide = () => {
-    setHasKeyboard(false)
-  }
 
   const localAccount = useSelector(getInstanceAccount, (prev, next) =>
     prev?.preferences && next?.preferences

src/screens/ImageViewer/save.ts

@@ -2,11 +2,12 @@ import haptics from '@components/haptics'
 import { displayMessage } from '@components/Message'
 import CameraRoll from '@react-native-community/cameraroll'
 import { RootStackParamList } from '@utils/navigation/navigators'
+import * as FileSystem from 'expo-file-system'
+import * as MediaLibrary from 'expo-media-library'
 import i18next from 'i18next'
 import { RefObject } from 'react'
 import { Platform } from 'react-native'
 import FlashMessage from 'react-native-flash-message'
-import { FileSystem, Permissions } from 'react-native-unimodules'
 
 type CommonProps = {
   messageRef: RefObject<FlashMessage>
@@ -60,17 +61,15 @@ const saveIos = async ({ messageRef, mode, image }: CommonProps) => {
 
 const saveAndroid = async ({ messageRef, mode, image }: CommonProps) => {
   const fileUri: string = `${FileSystem.documentDirectory}${image.id}.jpg`
-  const downloadedFile: FileSystem.FileSystemDownloadResult = await FileSystem.downloadAsync(
-    image.url,
-    fileUri
-  )
+  const downloadedFile: FileSystem.FileSystemDownloadResult =
+    await FileSystem.downloadAsync(image.url, fileUri)
 
   if (downloadedFile.status != 200) {
     console.warn('error!')
   }
 
-  const perm = await Permissions.askAsync(Permissions.MEDIA_LIBRARY)
-  if (perm.status != 'granted') {
+  const perm = await MediaLibrary.requestPermissionsAsync()
+  if (!perm.granted) {
     return
   }
 

src/screens/Tabs/Me/Settings/Analytics.tsx

@@ -5,10 +5,10 @@ import {
 } from '@utils/slices/settingsSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import { useTheme } from '@utils/styles/ThemeManager'
+import Constants from 'expo-constants'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text } from 'react-native'
-import { Constants } from 'react-native-unimodules'
 import { useDispatch, useSelector } from 'react-redux'
 
 const SettingsAnalytics: React.FC = () => {

src/startup/sentry.ts

@@ -1,5 +1,5 @@
+import Constants from 'expo-constants'
 import * as Updates from 'expo-updates'
-import { Constants } from 'react-native-unimodules'
 import * as Sentry from 'sentry-expo'
 import log from './log'
 

src/utils/slices/versionSlice.ts

@@ -1,7 +1,7 @@
 import apiGeneral from '@api/general'
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'
 import { RootState } from '@root/store'
-import { Constants } from 'react-native-unimodules'
+import Constants from 'expo-constants'
 
 export const retriveVersionLatest = createAsyncThunk(
   'version/latest',