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

Merge pull request #589 from Superbelko/android-wip 

Android wip
This commit is contained in:
Vadim Lopatin 2019-08-09 11:52:42 +03:00 committed by GitHub
parent edb42f5008 9e831ea0aa
commit 1822edb88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 495 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
android/android_ldc_armv7a.mk
View File

@ -2,9 +2,16 @@ PLATFORM_DIR=armeabi-v7a
echo "\nLOCAL_MODULE: $LOCAL_MODULE" echo "\nLOCAL_MODULE: $LOCAL_MODULE"
OS_TYPE="unknown"
case "$OSTYPE" in
msys*|cygwin*) OS_TYPE="windows" ;;
linux*) OS_TYPE="linux" ;;
esac
LDC_PARAMS="-mtriple=armv7-none-linux-androideabi -relocation-model=pic " LDC_PARAMS="-mtriple=armv7-none-linux-androideabi -relocation-model=pic "
export LD=$NDK/toolchains/llvm/prebuilt/linux-$NDK_ARCH/bin/llvm-link export LD=$NDK/toolchains/llvm/prebuilt/$OS_TYPE-$NDK_ARCH/bin/llvm-link
export CC=$NDK/toolchains/llvm/prebuilt/linux-$NDK_ARCH/bin/clang export CC=$NDK/toolchains/llvm/prebuilt/$OS_TYPE-$NDK_ARCH/bin/clang
SOURCES="$LOCAL_SRC_FILES $DLANGUI_SOURCES" SOURCES="$LOCAL_SRC_FILES $DLANGUI_SOURCES"
SOURCE_PATHS="-I./jni $DLANGUI_SOURCE_PATHS $DLANGUI_IMPORT_PATHS" SOURCE_PATHS="-I./jni $DLANGUI_SOURCE_PATHS $DLANGUI_IMPORT_PATHS"
@ -24,7 +31,7 @@ LINK_OPTIONS="\
-Wl,-soname,libnative-activity.so \ -Wl,-soname,libnative-activity.so \
-shared \ -shared \
--sysroot=$NDK/platforms/$ANDROID_TARGET/arch-arm \ --sysroot=$NDK/platforms/$ANDROID_TARGET/arch-arm \
-gcc-toolchain $NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-$NDK_ARCH \ -gcc-toolchain $NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/$OS_TYPE-$NDK_ARCH \
-no-canonical-prefixes \ -no-canonical-prefixes \
-target armv7-none-linux-androideabi \ -target armv7-none-linux-androideabi \
-Wl,--fix-cortex-a8 \ -Wl,--fix-cortex-a8 \

29
android/android_project/README.md
View File

@ -23,11 +23,13 @@ android_build_config.mk
Update paths to Android NDK, SDK, DlangUI source directory. Update paths to Android NDK, SDK, DlangUI source directory.
Default values: Default values:
```
export DLANGUI_DIR=$HOME/src/d/dlangui export DLANGUI_DIR=$HOME/src/d/dlangui
export NDK=$HOME/android-ndk-r11c export NDK=$HOME/android-ndk-r11c
export SDK=$HOME/android-sdk-linux export SDK=$HOME/android-sdk-linux
export LDC=$HOME/ldc2-android-arm-0.17.0-alpha2-linux-x86_64 export LDC=$HOME/ldc2-android-arm-0.17.0-alpha2-linux-x86_64
export NDK_ARCH=x86_64 export NDK_ARCH=x86_64
```
Use LDC cross compiler for armv7a build according instructions Use LDC cross compiler for armv7a build according instructions
@ -35,6 +37,33 @@ Use LDC cross compiler for armv7a build according instructions
https://wiki.dlang.org/Build_LDC_for_Android#Build_a_sample_OpenGL_Android_app_ported_to_D https://wiki.dlang.org/Build_LDC_for_Android#Build_a_sample_OpenGL_Android_app_ported_to_D
Dependencies
============
FreeType dependency is needed for dlangui, as well as D runtime for android
1\) Build D runtime with LDC
(should this be done inside LDC install folder?)
For this and the next tasks ninja and cmake build systems is needed,
refer to https://wiki.dlang.org/Build_D_for_Android for more info
```
set CC %ANDROID_HOME%\ndk-bundle\prebuilt\windows-x86_64\bin\clang.exe
ldc-build-runtime --ninja --targetPreset=Android-arm --dFlags="-w;-mcpu=cortex-a8" --buildDir=droid32
```
2\) Download and build FreeType
on Windows just run ./get_ft.ps1 && ./build_ft.bat
currently there is no scripts for Linux so you have to adapt those manually
then copy the binaries to your project android libs/ folder
Building Building
======== ========

7
android/android_project/compile_ft.bat Normal file
View File

@ -0,0 +1,7 @@
cd freetype-2.9.1
mkdir build-arm
cd build-arm
set CC=%NDK%\prebuilt\windows-x86_64\bin\clang
set NDK=%ANDROID_HOME%\ndk-bundle
cmake .. -G"Ninja" -DCMAKE_TOOLCHAIN_FILE=%NDK%\build\cmake\android.toolchain.cmake -DCMAKE_SYSTEM_NAME="Android" -DANDROID_NDK=%NDK% -DANDROID_TOOLCHAIN=clang -DANDROID_PLATFORM=android-21 -DBUILD_SHARED_LIBS=ON
cmake --build . --config Release

4
android/android_project/get_ft.ps1 Normal file
View File

@ -0,0 +1,4 @@
wget https://download.savannah.gnu.org/releases/freetype/ft291.zip -OutFile ./ft291.zip
Remove-Item -Path "freetype-2.9.1" -Recurse -Force
Expand-Archive -Path ft291.zip -DestinationPath .
cmd compile_ft.bat

1
android/dlangui_source_files.mk
View File

@ -4,6 +4,7 @@
DLANGUI_SOURCES="\ DLANGUI_SOURCES="\
$DLANGUI_DIR/src/dlangui/platforms/android/androidapp.d \ $DLANGUI_DIR/src/dlangui/platforms/android/androidapp.d \
$DLANGUI_DIR/src/dlangui/platforms/android/imm.d \
$DLANGUI_DIR/src/dlangui/platforms/common/startup.d \ $DLANGUI_DIR/src/dlangui/platforms/common/startup.d \
$DLANGUI_DIR/src/dlangui/platforms/common/platform.d \ $DLANGUI_DIR/src/dlangui/platforms/common/platform.d \
$DLANGUI_DIR/src/dlangui/dialogs/filedlg.d \ $DLANGUI_DIR/src/dlangui/dialogs/filedlg.d \

7
examples/android/.gitignore vendored Normal file
View File

@ -0,0 +1,7 @@
/local.properties
/.idea
/.gradle
/build
/*.iml
/libs
/app/*.iml

4
examples/android/android_build_config.mk
View File

@ -3,9 +3,9 @@
#========================================================================= #=========================================================================
# Modify this file to specify DLANGUI, Android NDK, SDK and LDC2 locations. # Modify this file to specify DLANGUI, Android NDK, SDK and LDC2 locations.
export DLANGUI_DIR=/media/toshiba/dev/ernomon export DLANGUI_DIR=$DLANGUI_DIR
export NDK=$NDK export NDK=$NDK
export SDK=$ANDROID_HOME export SDK=$ANDROID_HOME
export LDC=$LDC export LDC=$LDC
export NDK_ARCH=x86_64 export NDK_ARCH=x86_64
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ export JAVA_HOME=$JAVA_HOME

138
examples/android/app/app.iml
View File

@ -1,138 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.android.support:support-media-compat-26.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
<orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-3.0.1" level="project" />
<orderEntry type="library" name="com.android.support:support-fragment-26.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-vector-drawable-26.1.0" level="project" />
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
<orderEntry type="library" name="com.android.support:appcompat-v7-26.1.0" level="project" />
<orderEntry type="library" name="com.android.support:support-annotations:26.1.0@jar" level="project" />
<orderEntry type="library" name="com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-core-utils-26.1.0" level="project" />
<orderEntry type="library" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
<orderEntry type="library" name="com.android.support:support-core-ui-26.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test:runner-1.0.1" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test:rules-1.0.1" level="project" />
<orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-3.0.1" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-compat-26.1.0" level="project" />
<orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-v4-26.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
<orderEntry type="library" name="com.android.support:animated-vector-drawable-26.1.0" level="project" />
</component>
</module>

6
examples/android/app/build.gradle
View File

@ -38,7 +38,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0' implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2'
testImplementation 'junit:junit:4.12' //testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1' //androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' //androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
} }

2
examples/android/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.android.tools.build:gradle:3.3.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

1
examples/android/build/android-profile/profile-2017-11-06-22-03-30-739.json
View File

File diff suppressed because one or more lines are too long

BIN
examples/android/build/android-profile/profile-2017-11-06-22-03-30-739.rawproto
View File

Binary file not shown.

9
examples/android/build_apk.sh
View File

@ -35,8 +35,15 @@ die () {
#========================================================= #=========================================================
#$SDK/tools/android update project -p . -s --target $ANDROID_TARGET || die 3 "Android Project update is failed" #$SDK/tools/android update project -p . -s --target $ANDROID_TARGET || die 3 "Android Project update is failed"
# This is not necessary, even in the docs gradle recommend to build with wrapper but I find it annoying to
# download all that versions for all projects, so that's what this check is for
GRADLE=gradlew
if gradle --version >/dev/null 2>&1; then
GRADLE=gradle
fi
echo "Building APK..." echo "Building APK..."
#========================================================= #=========================================================
./gradlew assembleDebug || die 4 "Android APK creation is failed" GRADLE assembleDebug || die 4 "Android APK creation is failed"
echo "Successful." echo "Successful."

19
examples/android/example.iml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="example" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

BIN
examples/android/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

3
examples/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,5 @@
#Mon Nov 06 21:19:18 EET 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

100
examples/android/gradlew vendored
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env sh
############################################################################## ##############################################################################
## ##
@ -6,42 +6,6 @@
## ##
############################################################################## ##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
echo "$*"
}
die ( ) {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac
# Attempt to set APP_HOME # Attempt to set APP_HOME
# Resolve links: $0 may be a link # Resolve links: $0 may be a link
PRG="$0" PRG="$0"
@ -60,6 +24,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`" APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
@ -85,7 +89,7 @@ location of your Java installation."
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n` MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@ -150,11 +154,19 @@ if $cygwin ; then
esac esac
fi fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules # Escape application args
function splitJvmOpts() { save () {
JVM_OPTS=("$@") for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
} }
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS APP_ARGS=$(save "$@")
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" # Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@"

14
examples/android/gradlew.bat vendored
View File

@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell @rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail goto fail
:init :init
@rem Get command-line arguments, handling Windowz variants @rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args :win9xME_args
@rem Slurp the command line arguments. @rem Slurp the command line arguments.
@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%* set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute :execute
@rem Setup the command line @rem Setup the command line

12
examples/android/local.properties
View File

@ -1,12 +0,0 @@
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Mon Nov 06 21:25:18 EET 2017
ndk.dir=/media/erno/TOSHIBA_ISO/Android/Sdk/ndk-bundle
sdk.dir=/media/erno/TOSHIBA_ISO/Android/Sdk

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

@ -16,6 +16,7 @@ import dlangui.platforms.common.platform;
import android.input, android.looper : ALooper_pollAll; import android.input, android.looper : ALooper_pollAll;
import android.native_window : ANativeWindow_setBuffersGeometry; import android.native_window : ANativeWindow_setBuffersGeometry;
import android.configuration; import android.configuration;
import android.keycodes;
import android.log, android.android_native_app_glue; import android.log, android.android_native_app_glue;
/** /**
@ -139,6 +140,8 @@ class AndroidWindow : Window {
* Process the next input event. * Process the next input event.
*/ */
int handle_input(AInputEvent* event) { int handle_input(AInputEvent* event) {
import imm = dlangui.platforms.android.imm;
import std.conv : to;
Log.i("handle input, event=", AInputEvent_getType(event)); Log.i("handle input, event=", AInputEvent_getType(event));
auto et = AInputEvent_getType(event); auto et = AInputEvent_getType(event);
if (et == AINPUT_EVENT_TYPE_MOTION) { if (et == AINPUT_EVENT_TYPE_MOTION) {
@ -173,7 +176,37 @@ class AndroidWindow : Window {
return 1; return 1;
} else if (et == AINPUT_EVENT_TYPE_KEY) { } else if (et == AINPUT_EVENT_TYPE_KEY) {
Log.d("AINPUT_EVENT_TYPE_KEY"); Log.d("AINPUT_EVENT_TYPE_KEY");
return 0; KeyEvent evt;
auto app = (cast(AndroidPlatform)platform)._appstate;
int _keyFlags = AKeyEvent_getMetaState(event).toKeyFlag();
int sysKeyCode = AKeyEvent_getKeyCode(event);
int sysMeta = AKeyEvent_getMetaState(event);
int keyCode = androidKeyMap.get(sysKeyCode, KeyCode.init);
auto action = toKeyAction(AKeyEvent_getAction(event));
int char_ = imm.GetUnicodeChar(app, action, sysKeyCode, sysMeta);
dchar[] text;
if (!isTextEditControl(sysKeyCode)) {
if (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_MULTIPLE) {
// it's a string from IME
if (sysKeyCode == AKEYCODE_UNKNOWN) {
text = cast(dchar[]) to!dstring(imm.GetUnicodeString(app, event));
action = KeyAction.Text;
}
// else repeat character AKeyEvent_getRepeatCount() times
}
else if (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_DOWN && (char_ || isASCIIChar(sysKeyCode))) {
text ~= cast(dchar)(char_ == 0 ? sysKeyCode : char_);
action = KeyAction.Text;
}
}
Log.d("ACTION: ", action, " syskeyCode: ", sysKeyCode, " sysMeta: ", sysMeta, "meta: ", _keyFlags, " char '", cast(dchar)char_, "' str:", cast(dstring)text);
if (action == KeyAction.Text)
evt = new KeyEvent(KeyAction.Text, 0, 0, cast(dstring)text);
else
evt = new KeyEvent(action, keyCode, _keyFlags);
if (evt && dispatchKeyEvent(evt))
update();
return 1;
} }
return 0; return 0;
} }
@ -225,6 +258,12 @@ class AndroidPlatform : Platform {
} }
void showSoftKeyboard(bool shouldShow) {
import imm = dlangui.platforms.android.imm;
imm.showSoftKeyboard(_appstate, shouldShow);
}
/** /**
* Initialize an EGL context for the current display. * Initialize an EGL context for the current display.
*/ */
@ -706,3 +745,82 @@ extern (C) void android_main(android_app* state) {
} }
private KeyAction toKeyAction(int androidKeyAction) {
switch(androidKeyAction) {
case AKEY_EVENT_ACTION_DOWN: return KeyAction.KeyDown;
case AKEY_EVENT_ACTION_UP: return KeyAction.KeyUp;
case AKEY_EVENT_ACTION_MULTIPLE: return KeyAction.Repeat; // can also be text
default:
assert(0, "should never reach this");
}
}
private bool isASCIIChar(int ch) {
return 31 < ch && ch < 127;
}
// Text editor controls such as move caret or (de)select
private bool isTextEditControl(int keyCode) {
switch (keyCode){
case AKEYCODE_DEL: // backspace ("DEL" or "<x" arrow on soft keyboard)
case 112: // delete
case 59: // lshift
case 60: // rshift
case 113: // lcontrol
case 114: // rcontrol
case 57: // lalt
case 58: // ralt
case 19: // up arrow
case 20: // down arrow
case 21: // left arrow
case 22: // right arrow
case 92: // page up?
case 93: // page down?
case 122: // home
case 123: // end
case 124: // insert
return true;
static foreach(fn; 131..143) // f1-f12
case fn: return true;
default:
return false;
}
}
private int toKeyFlag(int keyMeta) {
int state;
if (keyMeta & AMETA_ALT_ON) state |= KeyFlag.Alt;
if (keyMeta & AMETA_SHIFT_ON) state |= KeyFlag.Shift;
return state;
}
/// Android to dlangui key mapping
private static immutable KeyCode[int] androidKeyMap;
static this() {
import std.conv : text;
androidKeyMap = [
AKEYCODE_DEL: KeyCode.BACK, // Delete(key code 67) on Android seems to work as backspace(key 112)
AKEYCODE_BACK: KeyCode.BACK,
AKEYCODE_SPACE: KeyCode.SPACE,
AKEYCODE_ENTER: KeyCode.RETURN,
AKEYCODE_TAB: KeyCode.TAB,
AKEYCODE_DPAD_LEFT: KeyCode.LEFT,
AKEYCODE_DPAD_RIGHT: KeyCode.RIGHT,
AKEYCODE_DPAD_UP: KeyCode.UP,
AKEYCODE_DPAD_DOWN: KeyCode.DOWN,
AKEYCODE_PAGE_UP: KeyCode.PAGEUP,
AKEYCODE_PAGE_DOWN: KeyCode.PAGEDOWN,
112: KeyCode.DEL,
122: KeyCode.HOME,
123: KeyCode.END,
];
static foreach(n; 0..10) // keys 0-9
androidKeyMap[mixin("AKEYCODE_" ~ n.text)] = mixin("KeyCode.KEY_" ~ n.text);
static foreach(char n; 'A'..'Z'+1) // A-Z
androidKeyMap[mixin("AKEYCODE_" ~ n)] = mixin("KeyCode.KEY_" ~ n);
}

221
src/dlangui/platforms/android/imm.d Normal file
View File

@ -0,0 +1,221 @@
module dlangui.platforms.android.imm;
version(Android):
import jni;
import android.android_native_app_glue;
import android.input;
import dlangui.core.logger;
alias IMMResult = int;
// values from InputMethodManager.java
private enum : IMMResult
{
RESULT_UNCHANGED_SHOWN = 0,
RESULT_UNCHANGED_HIDDEN = 1,
RESULT_SHOWN = 2,
RESULT_HIDDEN = 3,
}
alias IMMFlags = int;
// values from InputMethodManager.java
private enum : IMMFlags
{
SHOW_IMPLICIT = 0x0001,
SHOW_FORCED = 0x0002,
HIDE_IMPLICIT_ONLY = 0x0001,
HIDE_NOT_ALWAYS = 0x0002,
}
/**
* JNI wrapper used with native actitiy to show/hide software keyboard
* It relies on java reflection and it might be slow.
*/
void showSoftKeyboard(android_app* app, bool shouldShow)
{
// The code is based on https://stackoverflow.com/questions/5864790/how-to-show-the-soft-keyboard-on-native-activity
// Attaches the current thread to the JVM.
jint result;
IMMFlags flags;
auto javaVM = app.activity.vm;
auto env = app.activity.env;
JavaVMAttachArgs attachArgs;
attachArgs.version_ = JNI_VERSION_1_6;
attachArgs.name = "NativeThread";
attachArgs.group = null;
if ((*javaVM).AttachCurrentThread(javaVM, &env, &attachArgs) == JNI_ERR)
{
Log.e("showSoftKeyboard Unable to attach to JVM");
return;
}
// Retrieves NativeActivity.
jobject nativeActivity = app.activity.clazz;
jclass nativeActivityClass = (*env).GetObjectClass(env, nativeActivity);
// Retrieves Context.INPUT_METHOD_SERVICE.
jclass contextClass = (*env).FindClass(env, "android/content/Context");
jfieldID FieldINPUT_METHOD_SERVICE =
(*env).GetStaticFieldID(env, contextClass,
"INPUT_METHOD_SERVICE", "Ljava/lang/String;");
jobject INPUT_METHOD_SERVICE =
(*env).GetStaticObjectField(env, contextClass, FieldINPUT_METHOD_SERVICE);
//jniCheck(INPUT_METHOD_SERVICE);
// Runs getSystemService(Context.INPUT_METHOD_SERVICE).
jclass immClass = (*env).FindClass(
env, "android/view/inputmethod/InputMethodManager");
jmethodID MethodGetSystemService = (*env).GetMethodID(
env, nativeActivityClass, "getSystemService",
"(Ljava/lang/String;)Ljava/lang/Object;");
jobject imm = (*env).CallObjectMethod(
env, nativeActivity, MethodGetSystemService,
INPUT_METHOD_SERVICE);
// Runs getWindow().getDecorView().
jmethodID MethodGetWindow = (*env).GetMethodID(
env, nativeActivityClass, "getWindow", "()Landroid/view/Window;");
jobject window = (*env).CallObjectMethod(
env, nativeActivity, MethodGetWindow);
jclass windowClass = (*env).FindClass(
env, "android/view/Window");
jmethodID MethodGetDecorView = (*env).GetMethodID(
env, windowClass, "getDecorView", "()Landroid/view/View;");
jobject decorView = (*env).CallObjectMethod(
env, window, MethodGetDecorView);
if (shouldShow) {
// Runs imm.showSoftInput(...).
jmethodID MethodShowSoftInput = (*env).GetMethodID(
env, immClass, "showSoftInput", "(Landroid/view/View;I)Z");
jboolean res = (*env).CallBooleanMethod(
env, imm, MethodShowSoftInput, decorView, flags);
} else {
// Runs lWindow.getViewToken()
jclass viewClass = (*env).FindClass(
env, "android/view/View");
jmethodID MethodGetWindowToken = (*env).GetMethodID(
env, viewClass, "getWindowToken", "()Landroid/os/IBinder;");
jobject binder = (*env).CallObjectMethod(
env, decorView, MethodGetWindowToken);
// lInputMethodManager.hideSoftInput(...).
jmethodID MethodHideSoftInput = (*env).GetMethodID(
env, immClass, "hideSoftInputFromWindow",
"(Landroid/os/IBinder;I)Z");
jboolean res = (*env).CallBooleanMethod(
env, imm, MethodHideSoftInput, binder, flags);
}
// Finished with the JVM.
(*javaVM).DetachCurrentThread(javaVM);
}
int GetUnicodeChar(android_app* app, int eventType, int keyCode, int metaState)
{
auto javaVM = app.activity.vm;
auto env = app.activity.env;
JavaVMAttachArgs attachArgs;
attachArgs.version_ = JNI_VERSION_1_6;
attachArgs.name = "NativeThread";
attachArgs.group = null;
if ((*javaVM).AttachCurrentThread(javaVM, &env, &attachArgs) == JNI_ERR)
return 0;
jclass class_key_event = (*env).FindClass(env, "android/view/KeyEvent");
int unicodeKey;
if(metaState == 0)
{
jmethodID method_get_unicode_char = (*env).GetMethodID(env, class_key_event, "getUnicodeChar", "()I");
jmethodID eventConstructor = (*env).GetMethodID(env, class_key_event, "<init>", "(II)V");
jobject eventObj = (*env).NewObject(env, class_key_event, eventConstructor, eventType, keyCode);
unicodeKey = (*env).CallIntMethod(env, eventObj, method_get_unicode_char);
}
else
{
jmethodID method_get_unicode_char = (*env).GetMethodID(env, class_key_event, "getUnicodeChar", "(I)I");
jmethodID eventConstructor = (*env).GetMethodID(env, class_key_event, "<init>", "(II)V");
jobject eventObj = (*env).NewObject(env, class_key_event, eventConstructor, eventType, keyCode);
unicodeKey = (*env).CallIntMethod(env, eventObj, method_get_unicode_char, metaState);
}
(*javaVM).DetachCurrentThread(javaVM);
return unicodeKey;
}
// Issue: native app glue seems to mess up the input.
// It is clearly seen in debugger that initally key event do have real input,
// but second time it is called it is all messed up
string GetUnicodeString(android_app* app, AInputEvent* event)
{
string str;
auto javaVM = app.activity.vm;
auto env = app.activity.env;
JavaVMAttachArgs attachArgs;
attachArgs.version_ = JNI_VERSION_1_6;
attachArgs.name = "NativeThread";
attachArgs.group = null;
if ((*javaVM).AttachCurrentThread(javaVM, &env, &attachArgs) == JNI_ERR)
{
Log.e("showSoftKeyboard Unable to attach to JVM");
return null;
}
jclass class_key_event = (*env).FindClass(env, "android/view/KeyEvent");
jmethodID eventConstructor = (*env).GetMethodID(env, class_key_event, "<init>", "(JJIIIIIIII)V");
jobject eventObj = (*env).NewObject(env, class_key_event, eventConstructor,
AKeyEvent_getDownTime(event),
AKeyEvent_getEventTime(event),
AKeyEvent_getAction(event),
AKeyEvent_getKeyCode(event),
AKeyEvent_getRepeatCount(event),
AKeyEvent_getMetaState(event),
AInputEvent_getDeviceId(event),
AKeyEvent_getScanCode(event),
AKeyEvent_getFlags(event),
AInputEvent_getSource(event)
);
// this won't work because characters is a member passed on construction and getCharacter() is just a getter
jmethodID method_get_characters = (*env).GetMethodID(env, class_key_event, "getCharacters", "()Ljava/lang/String;");
if (auto jstr = (*env).CallObjectMethod(env, eventObj, method_get_characters)) {
str.length = (*env).GetStringUTFLength(env, jstr);
(*env).GetStringUTFRegion(env, jstr, 0, str.length, cast(char*)str.ptr);
}
{
jmethodID method_get_unicode_char = (*env).GetMethodID(env, class_key_event, "getUnicodeChar", "()I");
int unicodeKey = (*env).CallIntMethod(env, eventObj, method_get_unicode_char);
if (str.length == 0) {
import std.conv : to;
dchar[] tmp;
tmp ~= unicodeKey;
str = to!string(tmp);
}
}
(*javaVM).DetachCurrentThread(javaVM);
return str;
}

4
src/dlangui/widgets/editors.d
View File

@ -345,8 +345,10 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
/// sets focus to this widget or suitable focusable child, returns previously focused widget /// sets focus to this widget or suitable focusable child, returns previously focused widget
override Widget setFocus(FocusReason reason = FocusReason.Unspecified) { override Widget setFocus(FocusReason reason = FocusReason.Unspecified) {
Widget res = super.setFocus(reason); Widget res = super.setFocus(reason);
if (focused) if (focused) {
showSoftKeyboard();
handleEditorStateChange(); handleEditorStateChange();
}
return res; return res;
} }

19
src/dlangui/widgets/widget.d
View File

@ -1099,6 +1099,7 @@ public:
// try to find focusable child // try to find focusable child
return window.focusedWidget; return window.focusedWidget;
} }
hideSoftKeyboard();
return window.setFocus(this, reason); return window.setFocus(this, reason);
} }
/// searches children for first focusable item, returns null if not found /// searches children for first focusable item, returns null if not found
@ -1116,6 +1117,24 @@ public:
return null; return null;
} }
///
final void hideSoftKeyboard() {
version(Android) {
import dlangui.platforms.android.androidapp;
if (auto androidPlatform = cast(AndroidPlatform)platform)
androidPlatform.showSoftKeyboard(false);
}
}
/// Shows system virtual keyabord where applicable
final void showSoftKeyboard() {
version(Android) {
import dlangui.platforms.android.androidapp;
if (auto androidPlatform = cast(AndroidPlatform)platform)
androidPlatform.showSoftKeyboard(true);
}
}
// ======================================================= // =======================================================
// Events // Events