Merge branch 'develop' into @skylar/turn-on-i18n

rainbow-me · Oct 12, 2023 · 8fd3d42 · 8fd3d42
2 parents 78b2be9 + 4fba49e
commit 8fd3d42
Show file tree

Hide file tree

Showing 17 changed files with 464 additions and 309 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,40 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "android",
+            "request": "launch",
+            "name": "Launch App",
+            "preLaunchTask": "run build",
+            "appSrcRoot": "${workspaceRoot}/android/app/src/main",
+            "apkFile": "${workspaceRoot}/android/app/build/outputs/apk/debug/app-debug.apk",
+            "adbSocket": "localhost:5037",
+            "autoStartADB": true,
+            "staleBuild": "warn",
+            "targetDevice": "",
+            "manifestFile": "${workspaceRoot}/android/app/src/main/AndroidManifest.xml",
+            "pmInstallArgs": ["-r"],
+            "launchActivity": ".MainActivity",
+            "postLaunchPause": 1000,
+            "trace": false
+        },
+        {
+            "type": "android",
+            "request": "launch",
+            "name": "Sync gradle files",
+            "preLaunchTask": "run sync"
+        },
+        {
+            "type": "android",
+            "request": "launch",
+            "name": "Gradle clean",
+            "preLaunchTask": "run clean"
+        },
+        {
+            "type": "android",
+            "request": "launch",
+            "name": "Gradle invalidate",
+            "preLaunchTask": "run invalidate"
+        }
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,15 @@
+{
+  "i18n-ally.localesPaths": [
+    "src/languages",
+    "ios/Pods/Flipper-Folly/folly/lang",
+    "ios/Pods/Flipper-Boost-iOSX/boost/locale",
+    "ios/Pods/RCT-Folly/folly/lang",
+    "ios/Pods/boost/boost/locale",
+    "ios/Pods/Flipper-Boost-iOSX/boost/predef/language",
+    "ios/Pods/boost/boost/predef/language",
+    "ios/Pods/Headers/Private/Flipper-Folly/folly/lang",
+    "ios/Pods/Headers/Private/RCT-Folly/folly/lang",
+    "ios/Pods/Headers/Public/Flipper-Folly/folly/lang",
+    "ios/Pods/Headers/Public/RCT-Folly/folly/lang"
+  ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,77 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "run build",
+            "type": "shell",
+            "command": "cd ${workspaceFolder}/android && ./gradlew assembleDebug",
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "run clean",
+            "type": "shell",
+            "command": "cd ${workspaceFolder}/android && ./gradlew clean",
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "run sync",
+            "type": "shell",
+            "command": "cd ${workspaceFolder}/android && ./gradlew --refresh-dependencies",
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "run invalidate",
+            "type": "shell",
+            "command": " rm -rf ~/.gradle/caches && rm -rf ~/.gradle && cd ${workspaceFolder}/android && ./gradlew --stop",
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false
+            },
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -247,11 +247,6 @@
       <!-- Branch init -->
       <meta-data android:name="io.branch.sdk.BranchKey" android:value="${BRANCH_KEY}" />
       <meta-data android:name="io.branch.sdk.TestMode" android:value="false" />
-      <receiver android:name="io.branch.referral.InstallListener" android:exported="true">
-        <intent-filter>
-          <action android:name="com.android.vending.INSTALL_REFERRER" />
-        </intent-filter>
-      </receiver>
     </application>
 
 </manifest>
diff --git a/android/app/src/main/java/me/rainbow/MainActivity.java b/android/app/src/main/java/me/rainbow/MainActivity.java
@@ -10,7 +10,6 @@
 import me.rainbow.NativeModules.RNBackHandler.RNBackHandlerPackage;
 import me.rainbow.NativeModules.Internals.*;
 import android.webkit.WebView;
-import com.facebook.react.ReactActivityDelegate;
 import com.zoontek.rnbootsplash.RNBootSplash;
 
 import android.content.Intent;
@@ -19,7 +18,7 @@ public class MainActivity extends ReactActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-      super.onCreate(savedInstanceState);
+      super.onCreate(null);
       WebView.setWebContentsDebuggingEnabled(false);
   }
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     ext {
         buildToolsVersion = "33.0.0"
-        minSdkVersion = 30
+        minSdkVersion = 21
         compileSdkVersion = 33
         targetSdkVersion = 33
         ndkVersion = "23.1.7779620"