Rebrand android editor to allow play store signing

Co-authored-by: Spartan322 <[email protected]>
Redot-Engine · Nov 13, 2024 · 621c8c8 · 621c8c8
1 parent afc82bc
commit 621c8c8
Show file tree

Hide file tree

Showing 80 changed files with 267 additions and 267 deletions.
diff --git a/modules/text_server_adv/gdextension_build/SConstruct b/modules/text_server_adv/gdextension_build/SConstruct
@@ -767,7 +767,7 @@ if env["platform"] == "macos":
     methods.write_macos_plist(
         f'./bin/libtextserver_advanced.macos.{env["target"]}.framework',
         f'libtextserver_advanced.macos.{env["target"]}',
-        "org.godotengine.textserver_advanced",
+        "org.redotengine.textserver_advanced",
         "ICU / HarfBuzz / Graphite Text Server",
     )
     library = env.SharedLibrary(

diff --git a/modules/text_server_fb/gdextension_build/SConstruct b/modules/text_server_fb/gdextension_build/SConstruct
@@ -312,7 +312,7 @@ if env["platform"] == "macos":
     methods.write_macos_plist(
         f'./bin/libtextserver_fallback.macos.{env["target"]}.framework',
         f'libtextserver_fallback.macos.{env["target"]}',
-        "org.godotengine.textserver_fallback",
+        "org.redotengine.textserver_fallback",
         "Fallback Text Server",
     )
     library = env.SharedLibrary(

diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/AndroidManifest.xml
@@ -31,7 +31,7 @@
 
         <!-- Records the version of the Godot editor used for building -->
         <meta-data
-            android:name="org.godotengine.editor.version"
+            android:name="org.redotengine.editor.version"
             android:value="${godotEditorVersion}" />
 
         <activity

diff --git a/platform/android/java/app/src/com/godot/game/GodotApp.java b/platform/android/java/app/src/com/godot/game/GodotApp.java
@@ -32,12 +32,12 @@
 
 package com.godot.game;
 
-import org.godotengine.godot.GodotActivity;
-
 import android.os.Bundle;
 
 import androidx.core.splashscreen.SplashScreen;
 
+import org.redotengine.godot.GodotActivity;
+
 /**
  * Template activity for Godot Android builds.
  * Feel free to extend and modify this class for your custom logic.

diff --git a/platform/android/java/editor/build.gradle b/platform/android/java/editor/build.gradle
@@ -83,19 +83,19 @@ android {
     buildToolsVersion versions.buildTools
     ndkVersion versions.ndkVersion
 
-    namespace = "org.godotengine.editor"
+    namespace = "org.redotengine.editor"
 
     defaultConfig {
-        // The 'applicationId' suffix allows to install Godot 3.x(v3) and 4.x(v4) on the same device
-        applicationId "org.godotengine.editor.v4"
+        // The 'applicationId' suffix allows to install Redot 3.x(v3) and 4.x(v4) on the same device
+        applicationId "org.redotengine.editor.v4"
         versionCode generateVersionCode()
         versionName generateVersionName()
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
 
         missingDimensionStrategy 'products', 'editor'
         manifestPlaceholders += [
-            editorAppName: "Godot Editor 4",
+            editorAppName: "Redot Editor 4",
             editorBuildSuffix: ""
         ]
     }

diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorMessageDispatcher.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorMessageDispatcher.kt
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.editor
+package org.redotengine.editor
 
 import android.annotation.SuppressLint
 import android.content.Intent

diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorWindowInfo.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorWindowInfo.kt
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.editor
+package org.redotengine.editor
 
 /**
  * Specifies the policy for launches.

diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.editor
+package org.redotengine.editor
 
 import android.Manifest
 import android.app.ActivityManager
@@ -46,10 +46,10 @@ import android.widget.Toast
 import androidx.annotation.CallSuper
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.window.layout.WindowMetricsCalculator
-import org.godotengine.godot.GodotActivity
-import org.godotengine.godot.GodotLib
-import org.godotengine.godot.utils.PermissionsUtil
-import org.godotengine.godot.utils.ProcessPhoenix
+import org.redotengine.godot.GodotActivity
+import org.redotengine.godot.GodotLib
+import org.redotengine.godot.utils.PermissionsUtil
+import org.redotengine.godot.utils.ProcessPhoenix
 import java.util.*
 import kotlin.math.min
 

diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.editor
+package org.redotengine.editor
 
 import android.annotation.SuppressLint
 import android.app.PictureInPictureParams
@@ -40,7 +40,7 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import org.godotengine.godot.GodotLib
+import org.redotengine.godot.GodotLib
 
 /**
  * Drives the 'run project' window of the Godot Editor.

diff --git a/platform/android/java/lib/AndroidManifest.xml b/platform/android/java/lib/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
         <!-- Records the version of the Godot library -->
         <meta-data
-            android:name="org.godotengine.library.version"
+            android:name="org.redotengine.library.version"
             android:value="${godotLibraryVersion}" />
 
         <service android:name=".GodotDownloaderService" />

diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle
@@ -29,7 +29,7 @@ android {
         manifestPlaceholders = [godotLibraryVersion: getGodotLibraryVersionName()]
     }
 
-    namespace = "org.godotengine.godot"
+    namespace = "org.redotengine.godot"
 
     compileOptions {
         sourceCompatibility versions.javaVersion

diff --git a/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch b/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch
@@ -175,7 +175,7 @@ index e4b1b0f1c..36cd6aacf 100644
 -import com.android.vending.expansion.downloader.R;
 +// -- GODOT start --
 +//import com.android.vending.expansion.downloader.R;
-+import org.godotengine.godot.R;
++import org.redotengine.godot.R;
 +// -- GODOT end --
 
  import java.io.File;
@@ -250,7 +250,7 @@ index f1536e80e..4b214b22d 100644
 -import com.android.vending.expansion.downloader.R;
 +// -- GODOT start --
 +//import com.android.vending.expansion.downloader.R;
-+import org.godotengine.godot.R;
++import org.redotengine.godot.R;
 +// -- GODOT end --
 +
  import com.google.android.vending.expansion.downloader.DownloadProgressInfo;

diff --git a/platform/android/java/lib/patches/com.google.android.vending.licensing.patch b/platform/android/java/lib/patches/com.google.android.vending.licensing.patch
@@ -21,7 +21,7 @@ index a0d2779af..a8bf65f9c 100644
   */
 
 +// -- GODOT start --
-import org.godotengine.godot.BuildConfig;
+import org.redotengine.godot.BuildConfig;
 +// -- GODOT end --
 +
  /**

diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java
@@ -26,7 +26,7 @@
 
 // -- GODOT start --
 //import com.android.vending.expansion.downloader.R;
-import org.godotengine.godot.R;
+import org.redotengine.godot.R;
 // -- GODOT end --
 
 import java.io.File;

diff --git a/...va/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java b/...va/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
@@ -18,7 +18,7 @@
 
 // -- GODOT start --
 //import com.android.vending.expansion.downloader.R;
-import org.godotengine.godot.R;
+import org.redotengine.godot.R;
 // -- GODOT end --
 
 import com.google.android.vending.expansion.downloader.DownloadProgressInfo;

diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java b/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java
@@ -32,7 +32,7 @@
  */
 
 // -- GODOT start --
-import org.godotengine.godot.BuildConfig;
+import org.redotengine.godot.BuildConfig;
 // -- GODOT end --
 
 /**

diff --git a/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java b/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot;
+package org.redotengine.godot;
 
 import java.util.HashMap;
 import java.util.Set;

diff --git a/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java b/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot;
+package org.redotengine.godot;
 
 /**
  * Base abstract activity for Android apps intending to use Godot as the primary screen.

diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot
+package org.redotengine.godot
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -54,21 +54,21 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsAnimationCompat
 import androidx.core.view.WindowInsetsCompat
 import com.google.android.vending.expansion.downloader.*
-import org.godotengine.godot.input.GodotEditText
-import org.godotengine.godot.io.directory.DirectoryAccessHandler
-import org.godotengine.godot.io.file.FileAccessHandler
-import org.godotengine.godot.plugin.GodotPluginRegistry
-import org.godotengine.godot.tts.GodotTTS
-import org.godotengine.godot.utils.CommandLineFileParser
-import org.godotengine.godot.utils.GodotNetUtils
-import org.godotengine.godot.utils.PermissionsUtil
-import org.godotengine.godot.utils.PermissionsUtil.requestPermission
-import org.godotengine.godot.utils.beginBenchmarkMeasure
-import org.godotengine.godot.utils.benchmarkFile
-import org.godotengine.godot.utils.dumpBenchmark
-import org.godotengine.godot.utils.endBenchmarkMeasure
-import org.godotengine.godot.utils.useBenchmark
-import org.godotengine.godot.xr.XRMode
+import org.redotengine.godot.input.GodotEditText
+import org.redotengine.godot.io.directory.DirectoryAccessHandler
+import org.redotengine.godot.io.file.FileAccessHandler
+import org.redotengine.godot.plugin.GodotPluginRegistry
+import org.redotengine.godot.tts.GodotTTS
+import org.redotengine.godot.utils.CommandLineFileParser
+import org.redotengine.godot.utils.GodotNetUtils
+import org.redotengine.godot.utils.PermissionsUtil
+import org.redotengine.godot.utils.PermissionsUtil.requestPermission
+import org.redotengine.godot.utils.beginBenchmarkMeasure
+import org.redotengine.godot.utils.benchmarkFile
+import org.redotengine.godot.utils.dumpBenchmark
+import org.redotengine.godot.utils.endBenchmarkMeasure
+import org.redotengine.godot.utils.useBenchmark
+import org.redotengine.godot.xr.XRMode
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream

diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot
+package org.redotengine.godot
 
 import android.app.Activity
 import android.content.Intent
@@ -40,8 +40,8 @@ import android.util.Log
 import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.FragmentActivity
-import org.godotengine.godot.utils.PermissionsUtil
-import org.godotengine.godot.utils.ProcessPhoenix
+import org.redotengine.godot.utils.PermissionsUtil
+import org.redotengine.godot.utils.ProcessPhoenix
 
 /**
  * Base abstract activity for Android apps intending to use Godot as the primary screen.

diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot;
+package org.redotengine.godot;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot;
+package org.redotengine.godot;
 
 import android.content.Context;
 import android.content.SharedPreferences;

diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java b/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java
@@ -30,10 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot;
-
-import org.godotengine.godot.plugin.GodotPlugin;
-import org.godotengine.godot.utils.BenchmarkUtils;
+package org.redotengine.godot;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -72,6 +69,9 @@
 import java.util.Locale;
 import java.util.Set;
 
+import org.redotengine.godot.plugin.GodotPlugin;
+import org.redotengine.godot.utils.BenchmarkUtils;
+
 /**
  * Base fragment for Android apps intending to use Godot for part of the app's UI.
  */

diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java b/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java
@@ -30,18 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot;
-
-import org.godotengine.godot.gl.GLSurfaceView;
-import org.godotengine.godot.gl.GodotRenderer;
-import org.godotengine.godot.input.GodotInputHandler;
-import org.godotengine.godot.xr.XRMode;
-import org.godotengine.godot.xr.ovr.OvrConfigChooser;
-import org.godotengine.godot.xr.ovr.OvrContextFactory;
-import org.godotengine.godot.xr.ovr.OvrWindowSurfaceFactory;
-import org.godotengine.godot.xr.regular.RegularConfigChooser;
-import org.godotengine.godot.xr.regular.RegularContextFactory;
-import org.godotengine.godot.xr.regular.RegularFallbackConfigChooser;
+package org.redotengine.godot;
 
 import android.annotation.SuppressLint;
 import android.content.res.AssetManager;
@@ -60,6 +49,17 @@
 
 import java.io.InputStream;
 
+import org.redotengine.godot.gl.GLSurfaceView;
+import org.redotengine.godot.gl.GodotRenderer;
+import org.redotengine.godot.input.GodotInputHandler;
+import org.redotengine.godot.xr.XRMode;
+import org.redotengine.godot.xr.ovr.OvrConfigChooser;
+import org.redotengine.godot.xr.ovr.OvrContextFactory;
+import org.redotengine.godot.xr.ovr.OvrWindowSurfaceFactory;
+import org.redotengine.godot.xr.regular.RegularConfigChooser;
+import org.redotengine.godot.xr.regular.RegularContextFactory;
+import org.redotengine.godot.xr.regular.RegularFallbackConfigChooser;
+
 /**
  * A simple GLSurfaceView sub-class that demonstrate how to perform
  * OpenGL ES 2.0 rendering into a GL Surface. Note the following important

diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java b/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java
@@ -30,16 +30,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot;
-
-import org.godotengine.godot.plugin.GodotPlugin;
+package org.redotengine.godot;
 
 import android.app.Activity;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import org.redotengine.godot.plugin.GodotPlugin;
+
 /**
  * Denotate a component (e.g: Activity, Fragment) that hosts the {@link Godot} engine.
  */

diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java b/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java
@@ -30,9 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-package org.godotengine.godot;
-
-import org.godotengine.godot.input.GodotEditText;
+package org.redotengine.godot;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -57,6 +55,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.redotengine.godot.input.GodotEditText;
+
 // Wrapper for native library
 
 public class GodotIO {