forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android support fixes; add fullscreen mode; #119

This commit is contained in:
Vadim Lopatin 2016-04-21 14:04:42 +03:00
parent 806eb393b9
commit 21b3a2591f
7 changed files with 73 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/android/android_native_app_glue_impl.d vendored
View File

@ -253,8 +253,9 @@ void* android_app_entry(void* param) {
static android_app* android_app_create(ANativeActivity* activity,
void* savedState, size_t savedStateSize) {
android_app* android_app = cast(android_app*)malloc(android_app.sizeof);
memset(android_app, 0, android_app.sizeof);
size_t sz = android_app.sizeof;
android_app* android_app = cast(android_app*)malloc(sz);
memset(android_app, 0, sz);
android_app.activity = activity;
pthread_mutex_init(&android_app.mutex, null);

3
3rdparty/android/log.d vendored
View File

@ -39,6 +39,9 @@ void LOGE(S...)(const(char) * fmt, S args) {
void LOGW(S...)(const(char) * fmt, S args) {
__android_log_print(android_LogPriority.ANDROID_LOG_WARN, ANDROID_LOG_TAG, fmt, args);
}
void LOGD(S...)(const(char) * fmt, S args) {
__android_log_print(android_LogPriority.ANDROID_LOG_DEBUG, ANDROID_LOG_TAG, fmt, args);
}
void LOGV(S...)(const(char) * fmt, S args) {
debug __android_log_print(android_LogPriority.ANDROID_LOG_VERBOSE, ANDROID_LOG_TAG, fmt, args);
}

4
android/android_ldc_armv7a.mk
View File

@ -13,7 +13,7 @@ TARGET="libs/$PLATFORM_DIR/lib$LOCAL_MODULE.so"
OBJFILE="build/$PLATFORM_DIR/lib$LOCAL_MODULE.o"
LIBS="\
-L$NDK/platforms/android-19/arch-arm/usr/lib \
-L$NDK/platforms/$ANDROID_TARGET/arch-arm/usr/lib \
$LDC/lib/libphobos2-ldc.a \
$LDC/lib/libdruntime-ldc.a \
$LOCAL_LDLIBS \
@ -23,7 +23,7 @@ $DLANGUI_LDLIBS \
LINK_OPTIONS="\
-Wl,-soname,libnative-activity.so \
-shared \
--sysroot=$NDK/platforms/android-19/arch-arm \
--sysroot=$NDK/platforms/$ANDROID_TARGET/arch-arm \
-gcc-toolchain $NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-$NDK_ARCH \
-no-canonical-prefixes \
-target armv7-none-linux-androideabi \

12
examples/android/AndroidManifest.xml
View File

@ -8,16 +8,22 @@
<!-- This is the platform API where NativeActivity was introduced. -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-sdk android:minSdkVersion="19" />
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19"/>
<!-- This .apk has no Java code itself, so set hasCode to false. -->
<application android:label="@string/app_name" android:hasCode="false">
<application android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:hasCode="false">
<!-- Our activity is the built-in NativeActivity framework class.
This will take care of integrating with our NDK code. -->
<activity android:name="android.app.NativeActivity"
android:label="@string/app_name"
android:configChanges="orientation|keyboardHidden">
android:configChanges="orientation|keyboardHidden|locale|screenSize|screenLayout|locale"
android:launchMode="singleTask"
android:windowSoftInputMode="stateHidden"
android:screenOrientation="portrait"
>
<!-- Tell NativeActivity the name of or .so -->
<meta-data android:name="android.app.lib_name"
android:value="dlangui-activity" />

3
examples/android/android_app.mk
View File

@ -10,3 +10,6 @@ jni/app.d \
# Additional libraries to link
LOCAL_LDLIBS=""
# Android SDK target
ANDROID_TARGET="android-19"

2
examples/android/build_apk.sh
View File

@ -33,7 +33,7 @@ die () {
echo "Updating ant project..."
#=========================================================
$SDK/tools/android update project -p . -s --target 1 || die 3 "Android Project update is failed"
$SDK/tools/android update project -p . -s --target $ANDROID_TARGET || die 3 "Android Project update is failed"
echo "Building APK..."
#=========================================================

59
src/dlangui/platforms/android/androidapp.d
View File

@ -89,17 +89,20 @@ class AndroidPlatform : Platform {
protected int _height;
this(android_app* state) {
Log.d("AndroidPlatform.this()");
_appstate = state;
memset(&_engine, 0, engine.sizeof);
Log.d("AndroidPlatform.this() - setting handlers");
state.userData = cast(void*)this;
state.onAppCmd = &engine_handle_cmd;
state.onInputEvent = &engine_handle_input;
if (state.savedState != null) {
// We are starting with a previous saved state; restore from it.
_engine.state = *cast(saved_state*)state.savedState;
}
//Log.d("AndroidPlatform.this() - restoring saved state");
//if (state.savedState != null) {
// // We are starting with a previous saved state; restore from it.
// _engine.state = *cast(saved_state*)state.savedState;
//}
Log.d("AndroidPlatform.this() - done");
}
~this() {
@ -221,15 +224,19 @@ class AndroidPlatform : Platform {
* Process the next main command.
*/
void handle_cmd(int cmd) {
Log.i("handle cmd=", cmd);
if (_appstate.destroyRequested != 0) {
Log.w("handle_cmd: destroyRequested is set!!!");
}
switch (cmd) {
case APP_CMD_SAVE_STATE:
Log.d("APP_CMD_SAVE_STATE");
// The system has asked us to save our current state. Do so.
_appstate.savedState = malloc(saved_state.sizeof);
*(cast(saved_state*)_appstate.savedState) = _engine.state;
_appstate.savedStateSize = saved_state.sizeof;
break;
case APP_CMD_INIT_WINDOW:
Log.d("APP_CMD_INIT_WINDOW");
// The window is being shown, get it ready.
if (_appstate.window != null) {
initDisplay();
@ -237,20 +244,57 @@ class AndroidPlatform : Platform {
}
break;
case APP_CMD_TERM_WINDOW:
Log.d("APP_CMD_TERM_WINDOW");
// The window is being hidden or closed, clean it up.
termDisplay();
break;
case APP_CMD_GAINED_FOCUS:
Log.d("APP_CMD_GAINED_FOCUS");
// When our app gains focus
break;
case APP_CMD_LOST_FOCUS:
Log.d("APP_CMD_LOST_FOCUS");
// When our app loses focus
// This is to avoid consuming battery while not being used.
// Also stop animating.
_engine.animating = 0;
drawWindow();
break;
case APP_CMD_INPUT_CHANGED:
Log.d("APP_CMD_INPUT_CHANGED");
break;
case APP_CMD_WINDOW_RESIZED:
Log.d("APP_CMD_WINDOW_RESIZED");
break;
case APP_CMD_WINDOW_REDRAW_NEEDED:
Log.d("APP_CMD_WINDOW_REDRAW_NEEDED");
break;
case APP_CMD_CONTENT_RECT_CHANGED:
Log.d("APP_CMD_CONTENT_RECT_CHANGED");
break;
case APP_CMD_CONFIG_CHANGED:
Log.d("APP_CMD_CONFIG_CHANGED");
break;
case APP_CMD_LOW_MEMORY:
Log.d("APP_CMD_LOW_MEMORY");
break;
case APP_CMD_START:
Log.d("APP_CMD_START");
break;
case APP_CMD_RESUME:
Log.d("APP_CMD_RESUME");
break;
case APP_CMD_PAUSE:
Log.d("APP_CMD_PAUSE");
break;
case APP_CMD_STOP:
Log.d("APP_CMD_STOP");
break;
case APP_CMD_DESTROY:
Log.d("APP_CMD_DESTROY");
break;
default:
Log.i("unknown APP_CMD_XXX=", cmd);
break;
}
}
@ -330,7 +374,7 @@ class AndroidPlatform : Platform {
eglSwapBuffers(_display, _surface);
}
/**
* Starts application message loop.
*
@ -371,6 +415,7 @@ class AndroidPlatform : Platform {
// Check if we are exiting.
if (_appstate.destroyRequested != 0) {
Log.w("destroyRequested is set: exiting message loop");
return 0;
}
}