Skip to content

Commit 28c0088

Browse files
authored
Merge pull request #39558 from m4gr3d/godot_fragment_3_2
[3.2] Enable the ability to use Godot as a subview within an Android app
2 parents 34c5133 + 9206395 commit 28c0088

16 files changed

+342
-228
lines changed

platform/android/java/app/src/com/godot/game/GodotApp.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030

3131
package com.godot.game;
3232

33-
import org.godotengine.godot.Godot;
33+
import org.godotengine.godot.FullScreenGodotApp;
3434

3535
/**
3636
* Template activity for Godot Android custom builds.
3737
* Feel free to extend and modify this class for your custom logic.
3838
*/
39-
public class GodotApp extends Godot {
39+
public class GodotApp extends FullScreenGodotApp {
4040
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/godot_fragment_container"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent" />
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/*************************************************************************/
2+
/* FullScreenGodotApp.java */
3+
/*************************************************************************/
4+
/* This file is part of: */
5+
/* GODOT ENGINE */
6+
/* https://godotengine.org */
7+
/*************************************************************************/
8+
/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */
9+
/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */
10+
/* */
11+
/* Permission is hereby granted, free of charge, to any person obtaining */
12+
/* a copy of this software and associated documentation files (the */
13+
/* "Software"), to deal in the Software without restriction, including */
14+
/* without limitation the rights to use, copy, modify, merge, publish, */
15+
/* distribute, sublicense, and/or sell copies of the Software, and to */
16+
/* permit persons to whom the Software is furnished to do so, subject to */
17+
/* the following conditions: */
18+
/* */
19+
/* The above copyright notice and this permission notice shall be */
20+
/* included in all copies or substantial portions of the Software. */
21+
/* */
22+
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
23+
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
24+
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
25+
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
26+
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
27+
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
28+
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
29+
/*************************************************************************/
30+
31+
package org.godotengine.godot;
32+
33+
import android.content.Intent;
34+
import android.os.Bundle;
35+
import android.view.KeyEvent;
36+
37+
import androidx.fragment.app.FragmentActivity;
38+
39+
/**
40+
* Base activity for Android apps intending to use Godot as the primary and only screen.
41+
*
42+
* It's also a reference implementation for how to setup and use the {@link Godot} fragment
43+
* within an Android app.
44+
*/
45+
public abstract class FullScreenGodotApp extends FragmentActivity {
46+
47+
protected Godot godotFragment;
48+
49+
@Override
50+
public void onCreate(Bundle savedInstanceState) {
51+
super.onCreate(savedInstanceState);
52+
setContentView(R.layout.godot_app_layout);
53+
godotFragment = new Godot();
54+
getSupportFragmentManager().beginTransaction().replace(R.id.godot_fragment_container, godotFragment).setPrimaryNavigationFragment(godotFragment).commitNowAllowingStateLoss();
55+
}
56+
57+
@Override
58+
public void onNewIntent(Intent intent) {
59+
if (godotFragment != null) {
60+
godotFragment.onNewIntent(intent);
61+
}
62+
}
63+
64+
@Override
65+
public void onBackPressed() {
66+
if (godotFragment != null) {
67+
godotFragment.onBackPressed();
68+
} else {
69+
super.onBackPressed();
70+
}
71+
}
72+
73+
@Override
74+
public boolean onKeyMultiple(final int inKeyCode, int repeatCount, KeyEvent event) {
75+
if (godotFragment != null && godotFragment.onKeyMultiple(inKeyCode, repeatCount, event)) {
76+
return true;
77+
}
78+
return super.onKeyMultiple(inKeyCode, repeatCount, event);
79+
}
80+
}

0 commit comments

Comments
 (0)