diff --git a/packages/engine-rn-tvos/templates/platforms/androidtv/app/src/main/java/rnv_template/SplashActivity.java.tpl b/packages/engine-rn-tvos/templates/platforms/androidtv/app/src/main/java/rnv_template/SplashActivity.java.tpl new file mode 100644 index 0000000000..4e33b1275c --- /dev/null +++ b/packages/engine-rn-tvos/templates/platforms/androidtv/app/src/main/java/rnv_template/SplashActivity.java.tpl @@ -0,0 +1,26 @@ +package {{APPLICATION_ID}}; + +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +{{PLUGIN_SPLASH_ACTIVITY_IMPORTS}} + +public class SplashActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + Intent fcmIntent = getIntent(); + // Bundle bundle = fcmIntent.getExtras(); + + // Start the main activity + Intent intent = new Intent(this, MainActivity.class); + intent.putExtras(fcmIntent); + startActivity(intent); + + if (!isTaskRoot()) { + finish(); + } + } +} \ No newline at end of file diff --git a/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle b/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle index 9ab8ee584c..bd5bcf03f1 100644 --- a/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle +++ b/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle @@ -8,7 +8,7 @@ buildscript { targetSdkVersion = {{TARGET_SDK_VERSION}} // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. - ndkVersion = {{NDK_VERSION}} + ndkVersion = '{{NDK_VERSION}}' } repositories { google() diff --git a/packages/engine-rn-tvos/templates/platforms/androidtv/settings.gradle b/packages/engine-rn-tvos/templates/platforms/androidtv/settings.gradle index 2ddbc2032e..3462cf789b 100644 --- a/packages/engine-rn-tvos/templates/platforms/androidtv/settings.gradle +++ b/packages/engine-rn-tvos/templates/platforms/androidtv/settings.gradle @@ -1,4 +1,4 @@ rootProject.name = "testRNProject" -apply from: file("../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) +apply from: file("{{RN_CLI_LOCATION}}/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' -includeBuild('../../../../node_modules/@react-native/gradle-plugin') +includeBuild('{{RN_GRADLE_PLUGIN_LOCATION}}') diff --git a/packages/engine-rn/templates/platforms/androidwear/app/src/main/java/rnv_template/SplashActivity.java.tpl b/packages/engine-rn/templates/platforms/androidwear/app/src/main/java/rnv_template/SplashActivity.java.tpl new file mode 100644 index 0000000000..4e33b1275c --- /dev/null +++ b/packages/engine-rn/templates/platforms/androidwear/app/src/main/java/rnv_template/SplashActivity.java.tpl @@ -0,0 +1,26 @@ +package {{APPLICATION_ID}}; + +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +{{PLUGIN_SPLASH_ACTIVITY_IMPORTS}} + +public class SplashActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + Intent fcmIntent = getIntent(); + // Bundle bundle = fcmIntent.getExtras(); + + // Start the main activity + Intent intent = new Intent(this, MainActivity.class); + intent.putExtras(fcmIntent); + startActivity(intent); + + if (!isTaskRoot()) { + finish(); + } + } +} \ No newline at end of file diff --git a/packages/engine-rn/templates/platforms/androidwear/build.gradle b/packages/engine-rn/templates/platforms/androidwear/build.gradle index 34ea718194..bd5bcf03f1 100644 --- a/packages/engine-rn/templates/platforms/androidwear/build.gradle +++ b/packages/engine-rn/templates/platforms/androidwear/build.gradle @@ -2,13 +2,13 @@ buildscript { ext { - buildToolsVersion = "33.0.0" - minSdkVersion = 21 - compileSdkVersion = 33 - targetSdkVersion = 33 + buildToolsVersion = '{{BUILD_TOOLS_VERSION}}' + minSdkVersion = {{MIN_SDK_VERSION}} + compileSdkVersion = {{COMPILE_SDK_VERSION}} + targetSdkVersion = {{TARGET_SDK_VERSION}} // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. - ndkVersion = "23.1.7779620" + ndkVersion = '{{NDK_VERSION}}' } repositories { google() diff --git a/packages/engine-rn/templates/platforms/androidwear/settings.gradle b/packages/engine-rn/templates/platforms/androidwear/settings.gradle index 2ddbc2032e..3462cf789b 100644 --- a/packages/engine-rn/templates/platforms/androidwear/settings.gradle +++ b/packages/engine-rn/templates/platforms/androidwear/settings.gradle @@ -1,4 +1,4 @@ rootProject.name = "testRNProject" -apply from: file("../../../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) +apply from: file("{{RN_CLI_LOCATION}}/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' -includeBuild('../../../../node_modules/@react-native/gradle-plugin') +includeBuild('{{RN_GRADLE_PLUGIN_LOCATION}}')