From 94d4f13a28384d674f4e11ee5cd7598748b8ca91 Mon Sep 17 00:00:00 2001 From: Loewy Date: Fri, 26 Jan 2024 11:06:11 -0800 Subject: [PATCH 1/2] get android running in nix shell --- .gitignore | 41 +++++++++++++++++++ android/app/build.gradle | 4 +- .../railbird/app}/ReactNativeFlipper.java | 2 +- android/app/src/main/AndroidManifest.xml | 3 +- .../railbird/app}/MainActivity.java | 2 +- .../railbird/app}/MainApplication.java | 2 +- android/app/src/main/res/values/strings.xml | 2 +- .../railbird/app}/ReactNativeFlipper.java | 2 +- android/gradle.properties | 2 +- android/settings.gradle | 2 +- app.json | 3 +- index.js | 8 ++++ ios/Podfile.lock | 2 +- metro.config.js | 7 ++++ 14 files changed, 70 insertions(+), 12 deletions(-) rename android/app/src/debug/java/{com/anonymous/DummyApp => android/railbird/app}/ReactNativeFlipper.java (99%) rename android/app/src/main/java/{com/anonymous/DummyApp => android/railbird/app}/MainActivity.java (98%) rename android/app/src/main/java/{com/anonymous/DummyApp => android/railbird/app}/MainApplication.java (98%) rename android/app/src/release/java/{com/anonymous/DummyApp => android/railbird/app}/ReactNativeFlipper.java (95%) create mode 100644 index.js create mode 100644 metro.config.js diff --git a/.gitignore b/.gitignore index 4e7793b..6ec55f8 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,44 @@ yarn-error.* #direnv .direnv + +# @generated expo-cli sync-b5df6a44d8735348b729920a7406b633cfb74d4c +# The following patterns were generated by expo-cli + +# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files + +# dependencies +node_modules/ + +# Expo +.expo/ +dist/ +web-build/ + +# Native +*.orig.* +*.jks +*.p8 +*.p12 +*.key +*.mobileprovision + +# Metro +.metro-health-check* + +# debug +npm-debug.* +yarn-debug.* +yarn-error.* + +# macOS +.DS_Store +*.pem + +# local env files +.env*.local + +# typescript +*.tsbuildinfo + +# @end expo-cli \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 3304265..bcb313f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,9 +81,9 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion - namespace 'com.anonymous.DummyApp' + namespace 'android.railbird.app' defaultConfig { - applicationId 'com.anonymous.DummyApp' + applicationId 'android.railbird.app' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/android/app/src/debug/java/com/anonymous/DummyApp/ReactNativeFlipper.java b/android/app/src/debug/java/android/railbird/app/ReactNativeFlipper.java similarity index 99% rename from android/app/src/debug/java/com/anonymous/DummyApp/ReactNativeFlipper.java rename to android/app/src/debug/java/android/railbird/app/ReactNativeFlipper.java index 86436fb..2e952df 100644 --- a/android/app/src/debug/java/com/anonymous/DummyApp/ReactNativeFlipper.java +++ b/android/app/src/debug/java/android/railbird/app/ReactNativeFlipper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.anonymous.DummyApp; +package android.railbird.app; import android.content.Context; import com.facebook.flipper.android.AndroidFlipperClient; diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 38f06aa..72ac973 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + @@ -26,6 +26,7 @@ + diff --git a/android/app/src/main/java/com/anonymous/DummyApp/MainActivity.java b/android/app/src/main/java/android/railbird/app/MainActivity.java similarity index 98% rename from android/app/src/main/java/com/anonymous/DummyApp/MainActivity.java rename to android/app/src/main/java/android/railbird/app/MainActivity.java index 54ba21a..082ee15 100644 --- a/android/app/src/main/java/com/anonymous/DummyApp/MainActivity.java +++ b/android/app/src/main/java/android/railbird/app/MainActivity.java @@ -1,4 +1,4 @@ -package com.anonymous.DummyApp; +package android.railbird.app; import android.os.Build; import android.os.Bundle; diff --git a/android/app/src/main/java/com/anonymous/DummyApp/MainApplication.java b/android/app/src/main/java/android/railbird/app/MainApplication.java similarity index 98% rename from android/app/src/main/java/com/anonymous/DummyApp/MainApplication.java rename to android/app/src/main/java/android/railbird/app/MainApplication.java index 9d67be3..38f84b5 100644 --- a/android/app/src/main/java/com/anonymous/DummyApp/MainApplication.java +++ b/android/app/src/main/java/android/railbird/app/MainApplication.java @@ -1,4 +1,4 @@ -package com.anonymous.DummyApp; +package android.railbird.app; import android.app.Application; import android.content.res.Configuration; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 5cef61b..9b4c8b3 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - DummyApp + Railbird contain false \ No newline at end of file diff --git a/android/app/src/release/java/com/anonymous/DummyApp/ReactNativeFlipper.java b/android/app/src/release/java/android/railbird/app/ReactNativeFlipper.java similarity index 95% rename from android/app/src/release/java/com/anonymous/DummyApp/ReactNativeFlipper.java rename to android/app/src/release/java/android/railbird/app/ReactNativeFlipper.java index 7b7d4c0..bdb758c 100644 --- a/android/app/src/release/java/com/anonymous/DummyApp/ReactNativeFlipper.java +++ b/android/app/src/release/java/android/railbird/app/ReactNativeFlipper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.anonymous.DummyApp; +package android.railbird.app; import android.content.Context; import com.facebook.react.ReactInstanceManager; diff --git a/android/gradle.properties b/android/gradle.properties index e7cd192..4ba6b1d 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -54,4 +54,4 @@ expo.webp.animated=false # Enable network inspector EX_DEV_CLIENT_NETWORK_INSPECTOR=true -android.aapt2FromMavenOverride=/nix/store/6nrdbhdcmrig3vr80sc7qf9lna5cs1gb-android-sdk-env/share/android-sdk/build-tools/33.0.0/aapt2 +android.aapt2FromMavenOverride=/nix/store/byfv81hvdjqslk28s3pnwnjm4f03m901-android-sdk-env/share/android-sdk/build-tools/33.0.0/aapt2 \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index 417d540..2998473 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'DummyApp' +rootProject.name = 'Railbird' apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle"); useExpoModules() diff --git a/app.json b/app.json index 520e5a5..4683198 100644 --- a/app.json +++ b/app.json @@ -35,7 +35,8 @@ "adaptiveIcon": { "foregroundImage": "./assets/adaptive-icon.png", "backgroundColor": "#ffffff" - } + }, + "package": "android.railbird.app" }, "web": { "favicon": "./assets/favicon.png" diff --git a/index.js b/index.js new file mode 100644 index 0000000..1d6e981 --- /dev/null +++ b/index.js @@ -0,0 +1,8 @@ +import { registerRootComponent } from 'expo'; + +import App from './App'; + +// registerRootComponent calls AppRegistry.registerComponent('main', () => App); +// It also ensures that whether you load the app in Expo Go or in a native build, +// the environment is set up appropriately +registerRootComponent(App); diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 405da56..6515cb5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -734,4 +734,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: fe3da96ed9108818e45f85fdade1623742df3ab2 -COCOAPODS: 1.12.0 +COCOAPODS: 1.14.3 diff --git a/metro.config.js b/metro.config.js new file mode 100644 index 0000000..07c9fce --- /dev/null +++ b/metro.config.js @@ -0,0 +1,7 @@ +// Learn more https://docs.expo.io/guides/customizing-metro +const { getDefaultConfig } = require('expo/metro-config'); + +/** @type {import('expo/metro-config').MetroConfig} */ +const config = getDefaultConfig(__dirname); + +module.exports = config; From 9f170c1186106ccfaf5c53bf3bd5a15f95571333 Mon Sep 17 00:00:00 2001 From: Loewy Date: Sat, 27 Jan 2024 14:21:02 -0800 Subject: [PATCH 2/2] revert the nix/store hash on gradle.properties --- android/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/gradle.properties b/android/gradle.properties index 4ba6b1d..987607f 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -54,4 +54,4 @@ expo.webp.animated=false # Enable network inspector EX_DEV_CLIENT_NETWORK_INSPECTOR=true -android.aapt2FromMavenOverride=/nix/store/byfv81hvdjqslk28s3pnwnjm4f03m901-android-sdk-env/share/android-sdk/build-tools/33.0.0/aapt2 \ No newline at end of file +android.aapt2FromMavenOverride=/nix/store/6nrdbhdcmrig3vr80sc7qf9lna5cs1gb-android-sdk-env/share/android-sdk/build-tools/33.0.0/aapt2 \ No newline at end of file