Apply Rebel Branding to Android platform

.clang-format

@@ -185,5 +185,5 @@ ObjCBlockIndentWidth: 4
 ### Java specific config ###
 Language:        Java
 # BreakAfterJavaFieldAnnotations: false
-JavaImportGroups: ['org.godotengine', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
+JavaImportGroups: ['com.rebeltoolbox', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
 ...

.github/workflows/android_builds.yml

@@ -54,10 +54,10 @@ jobs:
           target: release
           tools: false
 
-      - name: Generate templates
+      - name: Create Android templates
         run: |
           cd platform/android/java
-          ./gradlew generateGodotTemplates
+          ./gradlew createAndroidTemplates
           cd ../../..
           ls -l bin/
 

copyright

@@ -73,8 +73,8 @@ Files: ./platform/android/java/lib/aidl/com/android/vending/licensing/
  ./platform/android/java/lib/res/layout/status_bar_ongoing_event_progress_bar.xml
  ./platform/android/java/lib/src/com/google/android/vending/expansion/downloader/
  ./platform/android/java/lib/src/com/google/android/vending/licensing/
- ./platform/android/java/lib/src/org/godotengine/godot/input/InputManagerCompat.java
- ./platform/android/java/lib/src/org/godotengine/godot/input/InputManagerV16.java
+ ./platform/android/java/lib/src/com/rebeltoolbox/rebelengine/input/InputManagerCompat.java
+ ./platform/android/java/lib/src/com/rebeltoolbox/rebelengine/input/InputManagerV16.java
 Comment: The Android Open Source Project
 Copyright: 2008-2013, The Android Open Source Project
 License: Apache-2.0

misc/scripts/clang_format.sh

@@ -31,7 +31,7 @@ while IFS= read -rd '' f; do
                 continue 2
             elif [[ "$f" == *"theme_data.h" ]]; then
                 continue 2
-            elif [[ "$f" == "platform/android/java/lib/src/org/godotengine/godot/input/InputManager"* ]]; then
+            elif [[ "$f" == "platform/android/java/lib/src/com/rebeltoolbox/rebelengine/input/InputManager"* ]]; then
                 continue 2
             fi
             python misc/scripts/copyright_headers.py "$f"

platform/android/api/api.cpp

@@ -42,7 +42,7 @@ void register_android_api() {
 #if !defined(ANDROID_ENABLED)
 	// On Android platforms, the `java_class_wrapper` instantiation and the
 	// `JNISingleton` registration occurs in
-	// `platform/android/java_godot_lib_jni.cpp#Java_org_godotengine_godot_GodotLib_setup`
+	// `platform/android/java_godot_lib_jni.cpp#Java_com_rebeltoolbox_rebelengine_RebelEngine_setup`
 	java_class_wrapper = memnew(JavaClassWrapper); // Dummy
 	ClassDB::register_class<JNISingleton>();
 #endif

platform/android/export/export_plugin.cpp

@@ -1405,8 +1405,8 @@ void EditorExportPlatformAndroid::_fix_resources(const Ref<EditorExportPreset> &
 
 		String str = _parse_string(&r_manifest[offset], string_flags & UTF8_FLAG);
 
-		if (str.begins_with("godot-project-name")) {
-			if (str == "godot-project-name") {
+		if (str.begins_with("project-name")) {
+			if (str == "project-name") {
 				//project name
 				str = get_project_name(package_name);
 
@@ -1985,7 +1985,7 @@ Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset,
 	args.push_back("-a");
 	args.push_back("android.intent.action.MAIN");
 	args.push_back("-n");
-	args.push_back(get_package_name(package_name) + "/com.godot.game.GodotApp");
+	args.push_back(get_package_name(package_name) + "/com.rebeltoolbox.rebelapp.RebelApp");
 
 	output.clear();
 	err = OS::get_singleton()->execute(adb, args, true, nullptr, &output, &rv, true);
@@ -2957,9 +2957,9 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		String zipalign_flag = "true";
 
 		Vector<PluginConfigAndroid> enabled_plugins = get_enabled_plugins(p_preset);
-		String local_plugins_binaries = PluginConfigAndroid::get_plugins_binaries(PluginConfigAndroid::BINARY_TYPE_LOCAL, enabled_plugins);
-		String remote_plugins_binaries = PluginConfigAndroid::get_plugins_binaries(PluginConfigAndroid::BINARY_TYPE_REMOTE, enabled_plugins);
-		String custom_maven_repos = PluginConfigAndroid::get_plugins_custom_maven_repos(enabled_plugins);
+		String plugins_local_dependencies = PluginConfigAndroid::get_plugins_dependencies(PluginConfigAndroid::BINARY_TYPE_LOCAL, enabled_plugins);
+		String plugins_remote_dependencies = PluginConfigAndroid::get_plugins_dependencies(PluginConfigAndroid::BINARY_TYPE_REMOTE, enabled_plugins);
+		String plugins_maven_repos = PluginConfigAndroid::get_plugins_maven_repos(enabled_plugins);
 		bool clean_build_required = is_clean_build_required(enabled_plugins);
 
 		List<String> cmdline;
@@ -2984,12 +2984,12 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		cmdline.push_back("-Pexport_version_min_sdk=" + min_sdk_version); // argument to specify the min sdk.
 		cmdline.push_back("-Pexport_version_target_sdk=" + target_sdk_version); // argument to specify the target sdk.
 		cmdline.push_back("-Pexport_enabled_abis=" + enabled_abi_string); // argument to specify enabled ABIs.
-		cmdline.push_back("-Pplugins_local_binaries=" + local_plugins_binaries); // argument to specify the list of plugins local dependencies.
-		cmdline.push_back("-Pplugins_remote_binaries=" + remote_plugins_binaries); // argument to specify the list of plugins remote dependencies.
-		cmdline.push_back("-Pplugins_maven_repos=" + custom_maven_repos); // argument to specify the list of custom maven repos for the plugins dependencies.
+		cmdline.push_back("-Pplugins_local_dependencies=" + plugins_local_dependencies); // argument to specify the list of plugins local dependencies.
+		cmdline.push_back("-Pplugins_remote_dependencies=" + plugins_remote_dependencies); // argument to specify the list of plugins remote dependencies.
+		cmdline.push_back("-Pplugins_maven_repos=" + plugins_maven_repos); // argument to specify the list of custom maven repos for the plugins dependencies.
 		cmdline.push_back("-Pperform_zipalign=" + zipalign_flag); // argument to specify whether the build should be zipaligned.
 		cmdline.push_back("-Pperform_signing=" + sign_flag); // argument to specify whether the build should be signed.
-		cmdline.push_back("-Pgodot_editor_version=" + String(VERSION_FULL_CONFIG));
+		cmdline.push_back("-Peditor_version=" + String(VERSION_FULL_CONFIG));
 
 		// NOTE: The release keystore is not included in the verbose logging
 		// to avoid accidentally leaking sensitive information when sharing verbose logs for troubleshooting.

platform/android/export/godot_plugin_config.cpp

@@ -152,7 +152,7 @@ PluginConfigAndroid PluginConfigAndroid::load_plugin_config(Ref<ConfigFile> conf
 				}
 
 				plugin_config.remote_dependencies = config_file->get_value(PluginConfigAndroid::DEPENDENCIES_SECTION, PluginConfigAndroid::DEPENDENCIES_REMOTE_KEY, Vector<String>());
-				plugin_config.custom_maven_repos = config_file->get_value(PluginConfigAndroid::DEPENDENCIES_SECTION, PluginConfigAndroid::DEPENDENCIES_CUSTOM_MAVEN_REPOS_KEY, Vector<String>());
+				plugin_config.maven_repos = config_file->get_value(PluginConfigAndroid::DEPENDENCIES_SECTION, PluginConfigAndroid::DEPENDENCIES_CUSTOM_MAVEN_REPOS_KEY, Vector<String>());
 			}
 
 			plugin_config.valid_config = is_plugin_config_valid(plugin_config);
@@ -163,36 +163,36 @@ PluginConfigAndroid PluginConfigAndroid::load_plugin_config(Ref<ConfigFile> conf
 	return plugin_config;
 }
 
-String PluginConfigAndroid::get_plugins_binaries(String type, Vector<PluginConfigAndroid> plugins_configs) {
-	String plugins_binaries;
+String PluginConfigAndroid::get_plugins_dependencies(String type, Vector<PluginConfigAndroid> plugins_configs) {
+	String plugins_dependencies;
 	if (!plugins_configs.empty()) {
-		Vector<String> binaries;
+		Vector<String> dependencies;
 		for (int i = 0; i < plugins_configs.size(); i++) {
 			PluginConfigAndroid config = plugins_configs[i];
 			if (!config.valid_config) {
 				continue;
 			}
 
 			if (config.binary_type == type) {
-				binaries.push_back(config.binary);
+				dependencies.push_back(config.binary);
 			}
 
 			if (type == PluginConfigAndroid::BINARY_TYPE_LOCAL) {
-				binaries.append_array(config.local_dependencies);
+				dependencies.append_array(config.local_dependencies);
 			}
 
 			if (type == PluginConfigAndroid::BINARY_TYPE_REMOTE) {
-				binaries.append_array(config.remote_dependencies);
+				dependencies.append_array(config.remote_dependencies);
 			}
 		}
 
-		plugins_binaries = String(PluginConfigAndroid::PLUGIN_VALUE_SEPARATOR).join(binaries);
+		plugins_dependencies = String(PluginConfigAndroid::PLUGIN_VALUE_SEPARATOR).join(dependencies);
 	}
 
-	return plugins_binaries;
+	return plugins_dependencies;
 }
 
-String PluginConfigAndroid::get_plugins_custom_maven_repos(Vector<PluginConfigAndroid> plugins_configs) {
+String PluginConfigAndroid::get_plugins_maven_repos(Vector<PluginConfigAndroid> plugins_configs) {
 	String maven_repos;
 	if (!plugins_configs.empty()) {
 		Vector<String> repos_urls;
@@ -202,7 +202,7 @@ String PluginConfigAndroid::get_plugins_custom_maven_repos(Vector<PluginConfigAn
 				continue;
 			}
 
-			repos_urls.append_array(config.custom_maven_repos);
+			repos_urls.append_array(config.maven_repos);
 		}
 
 		maven_repos = String(PluginConfigAndroid::PLUGIN_VALUE_SEPARATOR).join(repos_urls);

platform/android/export/godot_plugin_config.h

@@ -47,7 +47,7 @@
 The `dependencies` section and fields are optional and defined as follow:
 - **local**: contains a list of local `.aar` binary files the plugin depends on. The local binary dependencies must also be located in the `res://android/plugins` directory.
 - **remote**: contains a list of remote binary gradle dependencies for the plugin.
-- **custom_maven_repos**: contains a list of urls specifying custom maven repos required for the plugin's dependencies.
+- **maven_repos**: contains a list of urls specifying custom maven repos required for the plugin's dependencies.
 
  See https://github.com/godotengine/godot/issues/38157#issuecomment-618773871
  */
@@ -82,7 +82,7 @@ struct PluginConfigAndroid {
 	// Optional dependencies section
 	Vector<String> local_dependencies;
 	Vector<String> remote_dependencies;
-	Vector<String> custom_maven_repos;
+	Vector<String> maven_repos;
 
 	static String resolve_local_dependency_path(String plugin_config_dir, String dependency_path);
 
@@ -96,9 +96,9 @@ struct PluginConfigAndroid {
 
 	static PluginConfigAndroid load_plugin_config(Ref<ConfigFile> config_file, const String &path);
 
-	static String get_plugins_binaries(String type, Vector<PluginConfigAndroid> plugins_configs);
+	static String get_plugins_dependencies(String type, Vector<PluginConfigAndroid> plugins_configs);
 
-	static String get_plugins_custom_maven_repos(Vector<PluginConfigAndroid> plugins_configs);
+	static String get_plugins_maven_repos(Vector<PluginConfigAndroid> plugins_configs);
 
 	static String get_plugins_names(Vector<PluginConfigAndroid> plugins_configs);
 };

platform/android/export/gradle_export_util.cpp

@@ -147,8 +147,8 @@ String _android_xml_escape(const String &p_string) {
 Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &project_name) {
 	print_verbose("Creating strings resources for supported locales for project " + project_name);
 	// Stores the string into the default values directory.
-	String processed_default_xml_string = vformat(godot_project_name_xml_string, _android_xml_escape(project_name));
-	store_string_at_path("res://android/build/res/values/godot_project_name_string.xml", processed_default_xml_string);
+	String processed_default_xml_string = vformat(project_name_xml_string, _android_xml_escape(project_name));
+	store_string_at_path("res://android/build/res/values/project_name_string.xml", processed_default_xml_string);
 
 	// Searches the Gradle project res/ directory to find all supported locales
 	DirAccessRef da = DirAccess::open("res://android/build/res");
@@ -170,10 +170,10 @@ Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset
 		}
 		String locale = file.replace("values-", "").replace("-r", "_");
 		String property_name = "application/config/name_" + locale;
-		String locale_directory = "res://android/build/res/" + file + "/godot_project_name_string.xml";
+		String locale_directory = "res://android/build/res/" + file + "/project_name_string.xml";
 		if (ProjectSettings::get_singleton()->has_setting(property_name)) {
 			String locale_project_name = ProjectSettings::get_singleton()->get(property_name);
-			String processed_xml_string = vformat(godot_project_name_xml_string, _android_xml_escape(locale_project_name));
+			String processed_xml_string = vformat(project_name_xml_string, _android_xml_escape(locale_project_name));
 			print_verbose("Storing project name for locale " + locale + " under " + locale_directory);
 			store_string_at_path(locale_directory, processed_xml_string);
 		} else {
@@ -240,7 +240,7 @@ String _get_instrumentation_tag(const Ref<EditorExportPreset> &p_preset) {
 			"        tools:node=\"replace\"\n"
 			"        android:name=\".GodotInstrumentation\"\n"
 			"        android:icon=\"@mipmap/icon\"\n"
-			"        android:label=\"@string/godot_project_name_string\"\n"
+			"        android:label=\"@string/project_name_string\"\n"
 			"        android:targetPackage=\"%s\" />\n",
 			package_name);
 	return manifest_instrumentation_text;
@@ -252,7 +252,7 @@ String _get_activity_tag(const Ref<EditorExportPreset> &p_preset) {
 	String orientation = _get_android_orientation_label(
 			OS::get_singleton()->get_screen_orientation_from_string(GLOBAL_GET("display/window/handheld/orientation")));
 	String manifest_activity_text = vformat(
-			"        <activity android:name=\"com.godot.game.GodotApp\" "
+			"        <activity android:name=\"com.rebeltoolbox.rebelapp.RebelApp\" "
 			"tools:replace=\"android:screenOrientation,android:excludeFromRecents\" "
 			"android:excludeFromRecents=\"%s\" "
 			"android:screenOrientation=\"%s\">\n",
@@ -271,7 +271,7 @@ String _get_application_tag(const Ref<EditorExportPreset> &p_preset, bool p_has_
 	int xr_mode_index = (int)(p_preset->get("xr_features/xr_mode"));
 	bool uses_xr = xr_mode_index == XR_MODE_OVR || xr_mode_index == XR_MODE_OPENXR;
 	String manifest_application_text = vformat(
-			"    <application android:label=\"@string/godot_project_name_string\"\n"
+			"    <application android:label=\"@string/project_name_string\"\n"
 			"        android:allowBackup=\"%s\"\n"
 			"        android:isGame=\"%s\"\n"
 			"        android:hasFragileUserData=\"%s\"\n"

platform/android/export/gradle_export_util.h

@@ -37,15 +37,15 @@
 #include "core/os/os.h"
 #include "editor/editor_export.h"
 
-const String godot_project_name_xml_string = R"(<?xml version="1.0" encoding="utf-8"?>
+const String project_name_xml_string = R"(<?xml version="1.0" encoding="utf-8"?>
 <!--WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
-	<string name="godot_project_name_string">%s</string>
+	<string name="project_name_string">%s</string>
 </resources>
 )";
 
 // Supported XR modes.
-// This should match the entries in 'platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java'
+// This should match the entries in 'platform/android/java/lib/src/com/rebeltoolbox/rebelengine/xr/XRMode.java'
 static const int XR_MODE_REGULAR = 0;
 static const int XR_MODE_OVR = 1;
 static const int XR_MODE_OPENXR = 2;

platform/android/java/app/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.godot.game"
+    package="com.rebeltoolbox.rebelapp"
     android:versionCode="1"
     android:versionName="1.0"
     android:installLocation="auto" >
@@ -28,14 +28,14 @@
     <!-- If you want to add tags manually, do before it. -->
     <!-- WARNING: This should stay on a single line until the parsing code is improved. See GH-32414. -->
     <!-- TODO: Remove the 'requestLegacyExternalStorage' attribute when https://github.com/godotengine/godot/issues/38913 is resolved -->
-    <application android:label="@string/godot_project_name_string" android:allowBackup="false" android:isGame="true" android:hasFragileUserData="false" android:requestLegacyExternalStorage="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@mipmap/icon" >
+    <application android:label="@string/project_name_string" android:allowBackup="false" android:isGame="true" android:hasFragileUserData="false" android:requestLegacyExternalStorage="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@mipmap/icon" >
 
-        <!-- Records the version of the Godot editor used for building -->
+        <!-- Records the version of the editor used for building -->
         <meta-data
-            android:name="org.godotengine.editor.version"
-            android:value="${godotEditorVersion}" />
+            android:name="com.rebeltoolbox.rebeleditor.version"
+            android:value="${editorVersion}" />
 
-        <!-- The following metadata values are replaced when Godot exports, modifying them here has no effect. -->
+        <!-- The following metadata values are replaced when the game is exported, modifying them here has no effect. -->
         <!-- Do these changes in the export preset. Adding new ones is fine. -->
 
         <!-- XR mode metadata. This is modified by the exporter based on the selected xr mode. DO NOT CHANGE the values here. -->
@@ -64,9 +64,9 @@
             android:value="all" />
 
         <activity
-            android:name=".GodotApp"
-            android:label="@string/godot_project_name_string"
-            android:theme="@style/GodotAppSplashTheme"
+            android:name=".RebelApp"
+            android:label="@string/project_name_string"
+            android:theme="@style/SplashTheme"
             android:launchMode="singleTask"
             android:excludeFromRecents="false"
             android:exported="true"

platform/android/java/app/build.gradle

@@ -1,4 +1,4 @@
-// Gradle build config for Godot Engine's Android port.
+// Gradle build config for Rebel Engine's Android port.
 //
 // Do not remove/modify comments ending with BEGIN/END, they are used to inject
 // addon-specific configuration.
@@ -30,8 +30,8 @@ allprojects {
 //CHUNK_ALLPROJECTS_REPOSITORIES_BEGIN
 //CHUNK_ALLPROJECTS_REPOSITORIES_END
 
-        // Godot user plugins custom maven repos
-        String[] mavenRepos = getGodotPluginsMavenRepos()
+        // User plugins' Maven repos
+        String[] mavenRepos = getPluginsMavenRepos()
         if (mavenRepos != null && mavenRepos.size() > 0) {
             for (String repoUrl : mavenRepos) {
                 maven {
@@ -57,18 +57,18 @@ dependencies {
         releaseImplementation fileTree(dir: 'libs/release', include: ['*.jar', '*.aar'])
     }
 
-    // Godot user plugins remote dependencies
-    String[] remoteDeps = getGodotPluginsRemoteBinaries()
-    if (remoteDeps != null && remoteDeps.size() > 0) {
-        for (String dep : remoteDeps) {
-            implementation dep
+    // User plugins' remote dependencies
+    String[] remoteDependencies = getPluginsRemoteDependencies()
+    if (remoteDependencies != null && remoteDependencies.size() > 0) {
+        for (String dependency : remoteDependencies) {
+            implementation dependency
         }
     }
 
-    // Godot user plugins local dependencies
-    String[] pluginsBinaries = getGodotPluginsLocalBinaries()
-    if (pluginsBinaries != null && pluginsBinaries.size() > 0) {
-        implementation files(pluginsBinaries)
+    // User plugins' local dependencies
+    String[] localDependencies = getPluginsLocalDependencies()
+    if (localDependencies != null && localDependencies.size() > 0) {
+        implementation files(localDependencies)
     }
 
 //CHUNK_DEPENDENCIES_BEGIN
@@ -87,7 +87,8 @@ android {
     assetPacks = [":assetPacks:installTime"]
 
     defaultConfig {
-        // The default ignore pattern for the 'assets' directory includes hidden files and directories which are used by Godot projects.
+        // The default ignore pattern for the 'assets' directory includes hidden files and
+        // directories that are used by Rebel projects.
         aaptOptions {
             ignoreAssetsPattern "!.svn:!.git:!.gitignore:!.ds_store:!*.scc:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
         }
@@ -97,7 +98,7 @@ android {
             abiFilters export_abi_list
         }
 
-        manifestPlaceholders = [godotEditorVersion: getGodotEditorVersion()]
+        manifestPlaceholders = [editorVersion: getEditorVersion()]
 
         // Feel free to modify the application id to your own.
         applicationId getExportPackageName()