@@ -24,6 +24,7 @@

  *               Fix thumb aspect ratio.

  *      20250311 Fix bug because of stray CloseWindow() call.

  *               Add show using all window with right button.

+ *      20250316 Add android target support.

  *

  * Author: Dario Rodriguez dario@darionomono.com

  * (c) Dario Rodriguez 2025

@@ -41,23 +42,40 @@

 #include "raylib.h"

 #include "roboto_regular.c"

-#define DEFAULTWIDTH 1280

-#define DEFAULTHEIGHT 768

-

 #define UTF8DOWNARROW "\xe2\x86\x86" /* U+2186 in UTF-8 */

+#define SIMANDROID

+

+#if defined(ANDROID) || defined(SIMANDROID)

+#define ROOTDIR "/sdcard/"

+#define DEFAULTWIDTH 2400

+#define DEFAULTHEIGHT 1080

+#define LEFTSIZE 1600

+#define DEFAULTDIRDATAHEIGHT 520

+#define DEFAULTDIRDATATRIANGLEW 100

+#define LEFTIMAGESIDELEN 326

+#define FONTSIZE 64

+#define FONTBIGSIZE 96

+#define FONTHUGESIZE 128

+#else

+#define ROOTDIR "/var/www/default/animeshot/"

+#define DEFAULTWIDTH 1280

+#define DEFAULTHEIGHT 768

 #define LEFTSIZE 720

 #define DEFAULTDIRDATAHEIGHT 150

 #define DEFAULTDIRDATATRIANGLEW 35

 #define LEFTIMAGESIDELEN 125

-

 #define FONTSIZE 18

 #define FONTBIGSIZE 32

 #define FONTHUGESIZE 48

+#endif

-#define WHEELSTEP LEFTIMAGESIDELEN

-

+#if defined(SIMANDROID)

+#undef ROOTDIR

 #define ROOTDIR "/var/www/default/animeshot/"

+#endif

+

+#define WHEELSTEP LEFTIMAGESIDELEN

 #define SEP "/"

@@ -85,7 +103,7 @@

 #define UNROLLWHXY(xywh) (xywh).w,(xywh).h,(xywh).x,(xywh).y

 #endif

-#ifndef __linux__

+#if !defined(__linux__) && !defined(ANDROID)

 /* the old raylib used in the windows build lacks this function */

 bool IsImageValid(Image image)

 {

@@ -235,10 +253,11 @@ int imutil_submenu_count(char *menus);

 char *imutil_submenu_get(char *menus, int targetn, int *len);

 char *imutil_strduplen(char *str, int len);

 int is_imutil_insidexywh(Vector2 pos, xywh_t *xywh, int margin);

-int im_util_aspectmaximize(int w, int h, int maxw, int maxh, int *neww, int *newh);

+int imutil_aspectmaximize(int w, int h, int maxw, int maxh, int *neww, int *newh);

 int menudata_pos2option(menudata_t *menudata, Vector2 pos);

 int *getcodepoints(int *sizecodepoints);

 int is_imagefilename(char *filename);

+Image imutil_loadimage(const char *filename);

 int

 main(int argc, char *argv[])

@@ -935,7 +954,7 @@ DrawRectangle(UNROLLXYWH(body->backxywh),((Color){ 0,255,0,255 })); /* hit zone

                                                 char fullpath[2048];

                                                 snprintf(fullpath,sizeof(fullpath),"%s/%s/%s",body->rootdir,dirdata->dirname,elem->name+1);

                                                 fullpath[sizeof(fullpath)-1]='\0';

-                                                im=LoadImage(fullpath);

+                                                im=imutil_loadimage(fullpath);

                                                 if(IsImageValid(im)) {

                                                         int neww,newh;

                                                         Image im2,impixel;

@@ -945,7 +964,7 @@ fprintf(stderr,"Loaded %s\n",fullpath);

 int oldw=im.width,oldh=im.height;

 #endif

                                                         im2=GenImageColor(sidelen,sidelen,(Color){0,0,0,255});

-                                                        im_util_aspectmaximize(im.width,im.height,sidelen,sidelen,&neww,&newh);

+                                                        imutil_aspectmaximize(im.width,im.height,sidelen,sidelen,&neww,&newh);

                                                         ImageResize(&im,neww,newh);

                                                         impixel=ImageCopy(im);

                                                         ImageResize(&impixel,1,1);

@@ -1079,9 +1098,9 @@ texture_load(texture_t *texture, char *fullpath, int maxw, int maxh)

                 texture->has_failedload=0;

         }

         texture->currentpath[0]='\0';

-        im=LoadImage(fullpath);

+        im=imutil_loadimage(fullpath);

         if(IsImageValid(im)) {

-                im_util_aspectmaximize(im.width,im.height,maxw,maxh,&neww,&newh);

+                imutil_aspectmaximize(im.width,im.height,maxw,maxh,&neww,&newh);

                 ImageResize(&im,neww,newh);

                 texture->texture=LoadTextureFromImage(im);

                 UnloadImage(im);

@@ -1239,7 +1258,7 @@ is_imutil_insidexywh(Vector2 pos, xywh_t *xywh, int margin)

 }

 int

-im_util_aspectmaximize(int w, int h, int maxw, int maxh, int *neww, int *newh)

+imutil_aspectmaximize(int w, int h, int maxw, int maxh, int *neww, int *newh)

 {

         if(neww==NULL || newh==NULL || w==0 || h==0 || maxw==0 || maxh==0)

                 return(-1);

@@ -1529,3 +1548,39 @@ is_imagefilename(char *filename)

         return(0); /* not in the knownext list */

 }

+#ifdef ANDROID

+Image

+imutil_loadimage(const char *filename)

+{

+        unsigned char *filedata=NULL;

+        FILE *f=NULL;

+        struct stat st;

+        Image img;

+        char *ext;

+        if((f=fopen(filename,"r"))==NULL

+          || fstat(fileno(f),&st)!=0

+          || st.st_size<=0

+          || (filedata=(unsigned char *)malloc(st.st_size))==NULL

+          || fread(filedata,1,st.st_size,f)!=st.st_size

+        ) {

+                if(f!=NULL)

+                        fclose(f),f=NULL;

+                if(filedata!=NULL)

+                        free(filedata),filedata=NULL;

+                return((Image){0});

+        }

+        fclose(f);

+        ext=strchr(filename,'.');

+        ext=(ext==NULL)?filename+strlen(filename):ext;

+        img=LoadImageFromMemory(ext,filedata,st.st_size);

+        free(filedata),filedata=NULL;

+        return(img);

+}

+#else

+Image

+imutil_loadimage(const char *filename)

+{

+        return(LoadImage(filename));

+}

+#endif

+