Skip to content

Commit

Permalink
Rebrand android editor to allow play store signing
Browse files Browse the repository at this point in the history
  • Loading branch information
trashguy committed Nov 8, 2024
1 parent f3096f2 commit 6d00198
Show file tree
Hide file tree
Showing 75 changed files with 169 additions and 169 deletions.
2 changes: 1 addition & 1 deletion modules/text_server_adv/gdextension_build/SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion modules/text_server_fb/gdextension_build/SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion platform/android/java/app/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platform/android/java/app/src/com/godot/game/GodotApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

package com.godot.game;

import org.godotengine.godot.GodotActivity;
import org.redotengine.godot.GodotActivity;

import android.os.Bundle;

Expand Down
4 changes: 2 additions & 2 deletions platform/android/java/editor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ 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"
applicationId "org.redotengine.editor.v4"
versionCode generateVersionCode()
versionName generateVersionName()
minSdkVersion versions.minSdk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion platform/android/java/lib/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion platform/android/java/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ android {
manifestPlaceholders = [godotLibraryVersion: getGodotLibraryVersionName()]
}

namespace = "org.godotengine.godot"
namespace = "org.redotengine.godot"

compileOptions {
sourceCompatibility versions.javaVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index a0d2779af..a8bf65f9c 100644
*/

+// -- GODOT start --
import org.godotengine.godot.BuildConfig;
import org.redotengine.godot.BuildConfig;
+// -- GODOT end --
+
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/

// -- GODOT start --
import org.godotengine.godot.BuildConfig;
import org.redotengine.godot.BuildConfig;
// -- GODOT end --

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
32 changes: 16 additions & 16 deletions platform/android/java/lib/src/org/godotengine/godot/Godot.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/

package org.godotengine.godot;
package org.redotengine.godot;

import org.godotengine.godot.plugin.GodotPlugin;
import org.godotengine.godot.utils.BenchmarkUtils;
import org.redotengine.godot.plugin.GodotPlugin;
import org.redotengine.godot.utils.BenchmarkUtils;

import android.app.Activity;
import android.app.PendingIntent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@
/* 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 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;

import android.annotation.SuppressLint;
import android.content.res.AssetManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/

package org.godotengine.godot;
package org.redotengine.godot;

import org.godotengine.godot.plugin.GodotPlugin;
import org.redotengine.godot.plugin.GodotPlugin;

import android.app.Activity;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/

package org.godotengine.godot;
package org.redotengine.godot;

import org.godotengine.godot.input.GodotEditText;
import org.redotengine.godot.input.GodotEditText;

import android.app.Activity;
import android.content.ActivityNotFoundException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/

package org.godotengine.godot;
package org.redotengine.godot;

import org.godotengine.godot.gl.GodotRenderer;
import org.godotengine.godot.io.directory.DirectoryAccessHandler;
import org.godotengine.godot.io.file.FileAccessHandler;
import org.godotengine.godot.tts.GodotTTS;
import org.godotengine.godot.utils.GodotNetUtils;
import org.redotengine.godot.gl.GodotRenderer;
import org.redotengine.godot.io.directory.DirectoryAccessHandler;
import org.redotengine.godot.io.file.FileAccessHandler;
import org.redotengine.godot.tts.GodotTTS;
import org.redotengine.godot.utils.GodotNetUtils;

import android.app.Activity;
import android.content.res.AssetManager;
Expand Down Expand Up @@ -82,7 +82,7 @@ public static native boolean initialize(Activity activity,
* @param p_surface
* @param p_width
* @param p_height
* @see org.godotengine.godot.gl.GLSurfaceView.Renderer#onSurfaceChanged(GL10, int, int)
* @see org.redotengine.godot.gl.GLSurfaceView.Renderer#onSurfaceChanged(GL10, int, int)
*/
public static native void resize(Surface p_surface, int p_width, int p_height);

Expand All @@ -99,7 +99,7 @@ public static native boolean initialize(Activity activity,

/**
* Invoked on the GL thread to draw the current frame.
* @see org.godotengine.godot.gl.GLSurfaceView.Renderer#onDrawFrame(GL10)
* @see org.redotengine.godot.gl.GLSurfaceView.Renderer#onDrawFrame(GL10)
*/
public static native boolean step();

Expand Down
Loading

0 comments on commit 6d00198

Please sign in to comment.