-
-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into chore/ts-coverage
* main: fix/androidwear and androidtv gradle settings Bump @babel/traverse from 7.22.20 to 7.23.2
- Loading branch information
Showing
7 changed files
with
98 additions
and
19 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
...tvos/templates/platforms/androidtv/app/src/main/java/rnv_template/SplashActivity.java.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
packages/engine-rn-tvos/templates/platforms/androidtv/settings.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}}') |
26 changes: 26 additions & 0 deletions
26
...rn/templates/platforms/androidwear/app/src/main/java/rnv_template/SplashActivity.java.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
packages/engine-rn/templates/platforms/androidwear/settings.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}}') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters