Skip to content

Added Georgian font support and fixed NDK 29 build #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MisterGatto merged 1 commit into from
Mar 17, 2026
Merged

Added Georgian font support and fixed NDK 29 build #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ android {
dataBinding = true
prefab true
}
ndkVersion = '26.1.10909125'
ndkVersion = '29.0.14206865'
namespace 'git.artdeell.skymodloader'
}

Expand Down
6 changes: 5 additions & 1 deletion app/src/main/cpp/Utils/artpatch/artpatch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
#include <string.h>
#include <android/log.h>
#include <stdbool.h>
#include <sys/user.h>
#include <sys/mman.h>
#include <unistd.h>
// PAGE_SIZE was removed from NDK 29 public headers; derive it at runtime.
#ifndef PAGE_SIZE
# define PAGE_SIZE ((size_t)sysconf(_SC_PAGESIZE))
#endif
#include "procutils.h"


Expand Down
28 changes: 28 additions & 0 deletions app/src/main/cpp/Utils/imgui_androidbk/androidbk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,34 @@ PRIVATE_API static void loadFonts(ImGuiIO& io, jfloat fontsize, AAssetManager *m
rangesEuropean.Data);
/* END */

/* GEORGIAN GLYPH MERGE — merged into the Roboto atlas above.
* Roboto does not ship Georgian glyphs; we pull them from whichever
* NotoSansGeorgian variant is present on the device (path varies by
* Android version and OEM). First successful load wins; missing files
* are silently skipped by AddFontFromFileTTF returning nullptr. */
{
static const ImWchar kGeorgianRanges[] = {
0x10A0, 0x10FF, // Georgian (Mkhedruli)
0,
};
static const char* kGeorgianFontCandidates[] = {
"/system/fonts/NotoSansGeorgian-VF.ttf", // OEM / Android 11+ (variable)
"/system/fonts/NotoSansGeorgian-Regular.ttf", // Android <= 11 (static)
"/system/fonts/NotoSansGeorgian[wdth,wght].ttf", // alternative variable naming
"/system/fonts/NotoSans-Regular.ttf", // broad fallback
nullptr,
};
ImFontConfig fcGeo;
fcGeo.MergeMode = true;
for (int gi = 0; kGeorgianFontCandidates[gi]; ++gi) {
if (io.Fonts->AddFontFromFileTTF(kGeorgianFontCandidates[gi], fontsize,
&fcGeo, kGeorgianRanges)) {
break;
}
}
}
/* END GEORGIAN */

void* fontBufferDroidSans = nullptr;

/* DROID SANS */
Expand Down
Loading