[android] jni.hpp 4.0.0

This commit is contained in:
John Firebaugh
2018-08-22 12:27:43 -07:00
parent 5911e3b13f
commit 79bf0e8af6
156 changed files with 1765 additions and 2161 deletions

View File

@@ -16,20 +16,20 @@ void Collator::registerNative(jni::JNIEnv& env) {
jni::Class<Collator>::Singleton(env);
}
jni::Object<Collator> Collator::getInstance(jni::JNIEnv& env, jni::Object<Locale> locale) {
static auto javaClass = jni::Class<Collator>::Singleton(env);
jni::Local<jni::Object<Collator>> Collator::getInstance(jni::JNIEnv& env, const jni::Object<Locale>& locale) {
static auto& javaClass = jni::Class<Collator>::Singleton(env);
static auto method = javaClass.GetStaticMethod<jni::Object<Collator> (jni::Object<Locale>)>(env, "getInstance");
return javaClass.Call(env, method, locale);
}
void Collator::setStrength(jni::JNIEnv& env, jni::Object<Collator> collator, jni::jint strength) {
static auto javaClass = jni::Class<Collator>::Singleton(env);
void Collator::setStrength(jni::JNIEnv& env, const jni::Object<Collator>& collator, jni::jint strength) {
static auto& javaClass = jni::Class<Collator>::Singleton(env);
static auto method = javaClass.GetMethod<void (jni::jint)>(env, "setStrength");
collator.Call(env, method, strength);
}
jni::jint Collator::compare(jni::JNIEnv& env, jni::Object<Collator> collator, jni::String lhs, jni::String rhs) {
static auto javaClass = jni::Class<Collator>::Singleton(env);
jni::jint Collator::compare(jni::JNIEnv& env, const jni::Object<Collator>& collator, const jni::String& lhs, const jni::String& rhs) {
static auto& javaClass = jni::Class<Collator>::Singleton(env);
auto static method = javaClass.GetMethod<jni::jint (jni::String, jni::String)>(env, "compare");
return collator.Call(env, method, lhs, rhs);
}
@@ -54,32 +54,32 @@ jni::String Locale::toLanguageTag(jni::JNIEnv& env, jni::Object<Locale> locale)
}
*/
jni::String Locale::getLanguage(jni::JNIEnv& env, jni::Object<Locale> locale) {
static auto javaClass = jni::Class<Locale>::Singleton(env);
jni::Local<jni::String> Locale::getLanguage(jni::JNIEnv& env, const jni::Object<Locale>& locale) {
static auto& javaClass = jni::Class<Locale>::Singleton(env);
static auto method = javaClass.GetMethod<jni::String ()>(env, "getLanguage");
return locale.Call(env, method);
}
jni::String Locale::getCountry(jni::JNIEnv& env, jni::Object<Locale> locale) {
static auto javaClass = jni::Class<Locale>::Singleton(env);
jni::Local<jni::String> Locale::getCountry(jni::JNIEnv& env, const jni::Object<Locale>& locale) {
static auto& javaClass = jni::Class<Locale>::Singleton(env);
static auto method = javaClass.GetMethod<jni::String ()>(env, "getCountry");
return locale.Call(env, method);
}
jni::Object<Locale> Locale::getDefault(jni::JNIEnv& env) {
static auto javaClass = jni::Class<Locale>::Singleton(env);
jni::Local<jni::Object<Locale>> Locale::getDefault(jni::JNIEnv& env) {
static auto& javaClass = jni::Class<Locale>::Singleton(env);
static auto method = javaClass.GetStaticMethod<jni::Object<Locale> ()>(env, "getDefault");
return javaClass.Call(env, method);
}
jni::Object<Locale> Locale::New(jni::JNIEnv& env, jni::String language) {
static auto javaClass = jni::Class<Locale>::Singleton(env);
jni::Local<jni::Object<Locale>> Locale::New(jni::JNIEnv& env, const jni::String& language) {
static auto& javaClass = jni::Class<Locale>::Singleton(env);
static auto constructor = javaClass.GetConstructor<jni::String>(env);
return javaClass.New(env, constructor, language);
}
jni::Object<Locale> Locale::New(jni::JNIEnv& env, jni::String language, jni::String region) {
static auto javaClass = jni::Class<Locale>::Singleton(env);
jni::Local<jni::Object<Locale>> Locale::New(jni::JNIEnv& env, const jni::String& language, const jni::String& region) {
static auto& javaClass = jni::Class<Locale>::Singleton(env);
static auto constructor = javaClass.GetConstructor<jni::String, jni::String>(env);
return javaClass.New(env, constructor, language, region);
}
@@ -98,26 +98,25 @@ public:
{
LanguageTag languageTag = locale_ ? LanguageTag::fromBCP47(*locale_) : LanguageTag();
if (!languageTag.language) {
locale = android::Locale::getDefault(*env).NewGlobalRef(*env);
locale = jni::NewGlobal(*env,
android::Locale::getDefault(*env));
} else if (!languageTag.region) {
locale = android::Locale::New(*env,
jni::Make<jni::String>(*env, *(languageTag.language)))
.NewGlobalRef(*env);
locale = jni::NewGlobal(*env,
android::Locale::New(*env, jni::Make<jni::String>(*env, *languageTag.language)));
} else {
locale = android::Locale::New(*env,
jni::Make<jni::String>(*env, *(languageTag.language)),
jni::Make<jni::String>(*env, *(languageTag.region)))
.NewGlobalRef(*env);
locale = jni::NewGlobal(*env,
android::Locale::New(*env, jni::Make<jni::String>(*env, *languageTag.language),
jni::Make<jni::String>(*env, *languageTag.region)));
}
collator = android::Collator::getInstance(*env, *locale).NewGlobalRef(*env);;
collator = jni::NewGlobal(*env, android::Collator::getInstance(*env, locale));
if (!diacriticSensitive && !caseSensitive) {
android::Collator::setStrength(*env, *collator, 0 /*PRIMARY*/);
android::Collator::setStrength(*env, collator, 0 /*PRIMARY*/);
} else if (diacriticSensitive && !caseSensitive) {
android::Collator::setStrength(*env, *collator, 1 /*SECONDARY*/);
android::Collator::setStrength(*env, collator, 1 /*SECONDARY*/);
} else if (caseSensitive) {
// If we're case-sensitive and diacritic-sensitive, we use a case-sensitive collator
// and a fallback implementation of diacritic-insensitivity.
android::Collator::setStrength(*env, *collator, 2 /*TERTIARY*/);
android::Collator::setStrength(*env, collator, 2 /*TERTIARY*/);
}
}
@@ -135,23 +134,21 @@ public:
// Because of the difference in locale-awareness, this means turning on case-sensitivity
// can _potentially_ change compare results for strings that don't actually have any case
// differences.
jni::Local<jni::String> jlhs = jni::SeizeLocal(*env, jni::Make<jni::String>(*env, useUnaccent ?
jni::Local<jni::String> jlhs = jni::Make<jni::String>(*env, useUnaccent ?
platform::unaccent(lhs) :
lhs));
jni::Local<jni::String> jrhs = jni::SeizeLocal(*env, jni::Make<jni::String>(*env, useUnaccent ?
lhs);
jni::Local<jni::String> jrhs = jni::Make<jni::String>(*env, useUnaccent ?
platform::unaccent(rhs) :
rhs));
rhs);
jni::jint result = android::Collator::compare(*env, *collator, *jlhs, *jrhs);
jni::jint result = android::Collator::compare(*env, collator, jlhs, jrhs);
return result;
}
std::string resolvedLocale() const {
std::string language = jni::Make<std::string>(*env,
*jni::SeizeLocal(*env, android::Locale::getLanguage(*env, *locale)));
std::string region = jni::Make<std::string>(*env,
*jni::SeizeLocal(*env, android::Locale::getCountry(*env, *locale)));
std::string language = jni::Make<std::string>(*env, android::Locale::getLanguage(*env, locale));
std::string region = jni::Make<std::string>(*env, android::Locale::getCountry(*env, locale));
optional<std::string> resultLanguage;
if (!language.empty()) resultLanguage = language;

View File

@@ -24,12 +24,12 @@ public:
static jni::Object<Locale> forLanguageTag(jni::JNIEnv&, jni::String);
static jni::String toLanguageTag(jni::JNIEnv&, jni::Object<Locale>);
*/
static jni::Object<Locale> getDefault(jni::JNIEnv&);
static jni::String getLanguage(jni::JNIEnv&, jni::Object<Locale>);
static jni::String getCountry(jni::JNIEnv&, jni::Object<Locale>);
static jni::Local<jni::Object<Locale>> getDefault(jni::JNIEnv&);
static jni::Local<jni::String> getLanguage(jni::JNIEnv&, const jni::Object<Locale>&);
static jni::Local<jni::String> getCountry(jni::JNIEnv&, const jni::Object<Locale>&);
static jni::Object<Locale> New(jni::JNIEnv&, jni::String);
static jni::Object<Locale> New(jni::JNIEnv&, jni::String, jni::String);
static jni::Local<jni::Object<Locale>> New(jni::JNIEnv&, const jni::String&);
static jni::Local<jni::Object<Locale>> New(jni::JNIEnv&, const jni::String&, const jni::String&);
static void registerNative(jni::JNIEnv&);
@@ -39,11 +39,11 @@ class Collator {
public:
static constexpr auto Name() { return "java/text/Collator"; };
static jni::Object<Collator> getInstance(jni::JNIEnv&, jni::Object<Locale>);
static jni::Local<jni::Object<Collator>> getInstance(jni::JNIEnv&, const jni::Object<Locale>&);
static void setStrength(jni::JNIEnv&, jni::Object<Collator>, jni::jint);
static void setStrength(jni::JNIEnv&, const jni::Object<Collator>&, jni::jint);
static jni::jint compare(jni::JNIEnv&, jni::Object<Collator>, jni::String, jni::String);
static jni::jint compare(jni::JNIEnv&, const jni::Object<Collator>&, const jni::String&, const jni::String&);
static void registerNative(jni::JNIEnv&);

View File

@@ -36,25 +36,24 @@ namespace android {
LocalGlyphRasterizer::LocalGlyphRasterizer() {
UniqueEnv env { AttachEnv() };
static auto javaClass = jni::Class<LocalGlyphRasterizer>::Singleton(*env);
static auto& javaClass = jni::Class<LocalGlyphRasterizer>::Singleton(*env);
static auto constructor = javaClass.GetConstructor(*env);
javaObject = javaClass.New(*env, constructor).NewGlobalRef(*env);
javaObject = jni::NewGlobal(*env, javaClass.New(*env, constructor));
}
PremultipliedImage LocalGlyphRasterizer::drawGlyphBitmap(const std::string& fontFamily, const bool bold, const GlyphID glyphID) {
UniqueEnv env { AttachEnv() };
static auto javaClass = jni::Class<LocalGlyphRasterizer>::Singleton(*env);
static auto& javaClass = jni::Class<LocalGlyphRasterizer>::Singleton(*env);
static auto drawGlyphBitmap = javaClass.GetMethod<jni::Object<Bitmap> (jni::String, jni::jboolean, jni::jchar)>(*env, "drawGlyphBitmap");
auto javaBitmap = jni::SeizeLocal(*env,
javaObject->Call(*env, drawGlyphBitmap,
*jni::SeizeLocal(*env, jni::Make<jni::String>(*env, fontFamily)),
static_cast<jni::jboolean>(bold),
static_cast<jni::jchar>(glyphID)));
return Bitmap::GetImage(*env, *javaBitmap);
return Bitmap::GetImage(*env,
javaObject.Call(*env,
drawGlyphBitmap,
jni::Make<jni::String>(*env, fontFamily),
static_cast<jni::jboolean>(bold),
static_cast<jni::jchar>(glyphID)));
}
void LocalGlyphRasterizer::registerNative(jni::JNIEnv& env) {