summaryrefslogtreecommitdiff
path: root/Android
diff options
context:
space:
mode:
Diffstat (limited to 'Android')
-rw-r--r--Android/HelloAndroid/README.md4
-rw-r--r--Android/HelloAndroid/app/src/main/cpp/HelloAndroid.cxx41
-rw-r--r--Android/HelloAndroid/gradlew.bat90
-rw-r--r--Android/HelloAndroid/gradlew.zipbin0 -> 1127 bytes
4 files changed, 16 insertions, 119 deletions
diff --git a/Android/HelloAndroid/README.md b/Android/HelloAndroid/README.md
index fdd6cf930..73bbbc4e9 100644
--- a/Android/HelloAndroid/README.md
+++ b/Android/HelloAndroid/README.md
@@ -15,6 +15,10 @@ Getting Started
1. Open the AndroidStudio project by loading the HelloAndroid directory.
1. Click *Run/Run 'app'*.
+Micrososft Windows Users
+------------------------
+The file 'gradlew.zip' must be unzipped before you can use AndroidStudio. It contains the required file 'gradlew.bat'. This was neccessary because some svn setups block anything that looks like an executable file, including files that end in .bat .
+
Support
-------
If you've found an error in these samples, please [file an issue](http://www.fltk.org/str.php). Patches are encouraged, and may be submitted via the same FLTK Bug & Feature system.
diff --git a/Android/HelloAndroid/app/src/main/cpp/HelloAndroid.cxx b/Android/HelloAndroid/app/src/main/cpp/HelloAndroid.cxx
index 120f85596..6209a1217 100644
--- a/Android/HelloAndroid/app/src/main/cpp/HelloAndroid.cxx
+++ b/Android/HelloAndroid/app/src/main/cpp/HelloAndroid.cxx
@@ -21,7 +21,7 @@
#include <FL/Fl_Window.H>
#include <FL/Fl_Button.H>
-
+#include <FL/Enumerations.H>
Fl_Window *win;
Fl_Button *btn;
@@ -52,29 +52,14 @@ struct engine {
struct engine engine = { 0 };
-ANativeWindow_Buffer* gAGraphicsBuffer = 0;
-
-static int64_t start_ms;
static void engine_draw_frame()
{
- if (Fl_Android_Application::get_native_window() == NULL) {
- // No window.
- return;
- }
-
- ANativeWindow_Buffer buffer;
- if (ANativeWindow_lock(Fl_Android_Application::get_native_window(), &buffer, NULL) < 0) {
- LOGW("Unable to lock window buffer");
- return;
- }
-
- gAGraphicsBuffer = &buffer;
+ //if (Fl_Android_Application::lock_screen()) {
Fl::damage(FL_DAMAGE_ALL);
win->redraw();
Fl::flush();
-
- ANativeWindow_unlockAndPost(Fl_Android_Application::get_native_window());
- gAGraphicsBuffer = 0L;
+ // Fl_Android_Application::unlock_and_post_screen();
+ //}
}
static void engine_term_display() {
@@ -84,8 +69,8 @@ static void engine_term_display() {
static int32_t engine_handle_input(AInputEvent* event) {
if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) {
engine.animating = 1;
- Fl::e_x = Fl::e_x_root = AMotionEvent_getX(event, 0) * 600 / ANativeWindow_getWidth(Fl_Android_Application::get_native_window());
- Fl::e_y = Fl::e_y_root = AMotionEvent_getY(event, 0) * 800 / ANativeWindow_getHeight(Fl_Android_Application::get_native_window());
+ Fl::e_x = Fl::e_x_root = AMotionEvent_getX(event, 0) * 600 / ANativeWindow_getWidth(Fl_Android_Application::native_window());
+ Fl::e_y = Fl::e_y_root = AMotionEvent_getY(event, 0) * 800 / ANativeWindow_getHeight(Fl_Android_Application::native_window());
Fl::e_state = FL_BUTTON1;
Fl::e_keysym = FL_Button+1;
if (AMotionEvent_getAction(event)==AMOTION_EVENT_ACTION_DOWN) {
@@ -113,10 +98,10 @@ static void engine_handle_cmd(int32_t cmd) {
static int32_t format = WINDOW_FORMAT_RGB_565;
switch (cmd) {
case APP_CMD_INIT_WINDOW:
- if (Fl_Android_Application::get_native_window() != NULL) {
+ if (Fl_Android_Application::native_window() != NULL) {
// fill_plasma() assumes 565 format, get it here
- format = ANativeWindow_getFormat(Fl_Android_Application::get_native_window());
- ANativeWindow_setBuffersGeometry(Fl_Android_Application::get_native_window(),
+ format = ANativeWindow_getFormat(Fl_Android_Application::native_window());
+ ANativeWindow_setBuffersGeometry(Fl_Android_Application::native_window(),
#if 1
600, //ANativeWindow_getWidth(app->window),
800, //ANativeWindow_getHeight(app->window),
@@ -130,7 +115,7 @@ static void engine_handle_cmd(int32_t cmd) {
break;
case APP_CMD_TERM_WINDOW:
engine_term_display();
- ANativeWindow_setBuffersGeometry(Fl_Android_Application::get_native_window(),
+ ANativeWindow_setBuffersGeometry(Fl_Android_Application::native_window(),
#if 1
600, //ANativeWindow_getWidth(app->window),
800, //ANativeWindow_getHeight(app->window),
@@ -157,12 +142,9 @@ int main(int argc, char **argv)
Fl_Android_Application::set_on_app_cmd(engine_handle_cmd);
Fl_Android_Application::set_on_input_event(engine_handle_input);
- struct timespec now;
- clock_gettime(CLOCK_MONOTONIC, &now);
- start_ms = (((int64_t)now.tv_sec)*1000000000LL + now.tv_nsec)/1000000;
-
win = new Fl_Window(10, 10, 600, 400, "Hallo");
btn = new Fl_Button(190, 200, 280, 35, "Hello, Android!");
+ btn->color(FL_LIGHT2);
win->show();
@@ -192,6 +174,7 @@ int main(int argc, char **argv)
return 0;
}
}
+ //Fl::flush();
if (engine.animating) {
engine_draw_frame();
diff --git a/Android/HelloAndroid/gradlew.bat b/Android/HelloAndroid/gradlew.bat
deleted file mode 100644
index aec99730b..000000000
--- a/Android/HelloAndroid/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-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
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/Android/HelloAndroid/gradlew.zip b/Android/HelloAndroid/gradlew.zip
new file mode 100644
index 000000000..699ec0b66
--- /dev/null
+++ b/Android/HelloAndroid/gradlew.zip
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-09 07:17:51 +0000