A cross platform Audiobookshelf client for Android and iOS
Dart
Keep word lookups inside the app and cover more languages
Barnabasa4a08121e9bb
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xmlindex 8082cc7e..da791b69 100644--- a/android/app/src/main/AndroidManifest.xml+++ b/android/app/src/main/AndroidManifest.xml@@ -238,8 +238,5 @@<action android:name="android.intent.action.PROCESS_TEXT"/><data android:mimeType="text/plain"/></intent>- <intent>- <action android:name="android.intent.action.DEFINE"/>- </intent></queries></manifest>diff --git a/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt b/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.ktindex d21e2a15..890413d5 100644--- a/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt+++ b/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt@@ -1,7 +1,6 @@package com.barnabas.absorbimport android.content.Context-import android.content.ActivityNotFoundExceptionimport android.content.Intentimport android.media.AudioDeviceInfoimport android.media.AudioManager@@ -119,10 +118,6 @@ class MainActivity : AudioServiceActivity() {MonoController.setMonoEnabled(enabled)result.success(true)}- "defineWord" -> {- val word = call.argument<String>("word") ?: ""- result.success(if (word.isEmpty()) false else launchDefineIntent(word))- }else -> result.notImplemented()}}@@ -510,36 +505,6 @@ class MainActivity : AudioServiceActivity() {eqEnabled = false}- // Reader dictionary: hand the word to the system's definition UI.- // Android 13+ has a dedicated DEFINE action; anything older (or without a- // DEFINE handler) falls back to the text-processing chooser (Translate,- // dictionary apps). Returns false when the device has neither, so Dart- // can fall back to the app's own lookup sheet.- private fun launchDefineIntent(word: String): Boolean {- if (Build.VERSION.SDK_INT >= 33) {- val define = Intent(Intent.ACTION_DEFINE).putExtra(Intent.EXTRA_TEXT, word)- if (define.resolveActivity(packageManager) != null) {- try {- startActivity(define)- return true- } catch (_: ActivityNotFoundException) {- }- }- }- val process = Intent(Intent.ACTION_PROCESS_TEXT)- .setType("text/plain")- .putExtra(Intent.EXTRA_PROCESS_TEXT, word)- .putExtra(Intent.EXTRA_PROCESS_TEXT_READONLY, true)- if (process.resolveActivity(packageManager) != null) {- try {- startActivity(Intent.createChooser(process, null))- return true- } catch (_: ActivityNotFoundException) {- }- }- return false- }-private fun isBluetoothAudioConnected(): Boolean {val am = getSystemService(Context.AUDIO_SERVICE) as AudioManagerif (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {diff --git a/lib/services/dictionary_service.dart b/lib/services/dictionary_service.dartindex 9295596d..7f878eb3 100644--- a/lib/services/dictionary_service.dart+++ b/lib/services/dictionary_service.dart@@ -1,18 +1,19 @@import 'dart:convert';+import 'dart:io';import 'package:flutter/foundation.dart';import 'package:flutter/services.dart';import 'package:http/http.dart' as http;-/// The platform's own dictionary UI: UIReferenceLibraryViewController on iOS-/// (offline, the user's own dictionaries, any language), the system DEFINE-/// action / text-processing chooser on Android. Returns false when the-/// platform had nothing to show, so the caller can fall back to the in-app-/// lookup sheet.+/// iOS only: present the system dictionary (UIReferenceLibraryViewController -+/// offline, the user's own downloaded dictionaries, any language). Android has+/// no equivalent (the DEFINE intent just bounces into the Google app), so it+/// returns false there and the caller shows the in-app Wiktionary sheet.class NativeDictionary {static const _channel = MethodChannel('com.absorb.equalizer');static Future<bool> define(String word) async {+ if (!Platform.isIOS) return false;try {final ok = await _channel.invokeMethod<bool>('defineWord', {'word': word});return ok ?? false;@@ -35,7 +36,11 @@ class DictionaryMeaning {final String partOfSpeech;final List<DictionaryDefinition> definitions;final List<String> synonyms;- const DictionaryMeaning(this.partOfSpeech, this.definitions, this.synonyms);+ /// Display name of the word's language section ("German", "French"), so a+ /// foreign word's entry can be labeled. Null/"English" renders unlabeled.+ final String? language;+ const DictionaryMeaning(this.partOfSpeech, this.definitions, this.synonyms,+ {this.language});}class DictionaryResult {@@ -47,71 +52,97 @@ class DictionaryResult {{this.phonetic, this.meanings = const []});}-/// Word lookups against the free dictionaryapi.dev endpoint (English), so a-/// definition opens in an in-app sheet instead of bouncing to a browser.+/// Word lookups against Wiktionary's definition API, so a definition opens in+/// an in-app sheet instead of bouncing to a browser or the Google app. Covers+/// words in most languages (definitions written in English); the exact+/// capitalization is tried first (German nouns), lowercase second.class DictionaryService {static Future<DictionaryResult> lookup(String word) async {- final clean = word.trim().toLowerCase();+ final clean = word.trim();+ final result = await _fetch(clean);+ if (result.status == DictionaryStatus.notFound &&+ clean != clean.toLowerCase()) {+ final lower = await _fetch(clean.toLowerCase());+ if (lower.status == DictionaryStatus.found) return lower;+ }+ return result;+ }++ static Future<DictionaryResult> _fetch(String word) async {try {- final resp = await http- .get(Uri.parse(- 'https://api.dictionaryapi.dev/api/v2/entries/en/${Uri.encodeComponent(clean)}'))- .timeout(const Duration(seconds: 8));+ final resp = await http.get(+ Uri.parse(+ 'https://en.wiktionary.org/api/rest_v1/page/definition/${Uri.encodeComponent(word)}'),+ headers: const {'User-Agent': 'Absorb audiobook app'},+ ).timeout(const Duration(seconds: 8));if (resp.statusCode == 404) {- return DictionaryResult(DictionaryStatus.notFound, clean);+ return DictionaryResult(DictionaryStatus.notFound, word);}if (resp.statusCode != 200) {- return DictionaryResult(DictionaryStatus.error, clean);+ return DictionaryResult(DictionaryStatus.error, word);}final data = jsonDecode(resp.body);- if (data is! List || data.isEmpty) {- return DictionaryResult(DictionaryStatus.notFound, clean);+ if (data is! Map<String, dynamic> || data.isEmpty) {+ return DictionaryResult(DictionaryStatus.notFound, word);}- String? phonetic;+ // English section first, other languages after in response order.+ final keys = [+ if (data.containsKey('en')) 'en',+ ...data.keys.where((k) => k != 'en'),+ ];final meanings = <DictionaryMeaning>[];- for (final entry in data.whereType<Map<String, dynamic>>()) {- phonetic ??= (entry['phonetic'] as String?)?.trim();- if (phonetic == null || phonetic.isEmpty) {- final phonetics =- (entry['phonetics'] as List<dynamic>? ?? const [])- .whereType<Map<String, dynamic>>();- for (final p in phonetics) {- final t = (p['text'] as String?)?.trim();- if (t != null && t.isNotEmpty) {- phonetic = t;- break;- }- }- }- for (final m in (entry['meanings'] as List<dynamic>? ?? const [])- .whereType<Map<String, dynamic>>()) {+ for (final key in keys) {+ final section = data[key];+ if (section is! List) continue;+ for (final entry in section.whereType<Map<String, dynamic>>()) {+ final language = (entry['language'] as String?)?.trim();final defs = <DictionaryDefinition>[];- for (final d in (m['definitions'] as List<dynamic>? ?? const [])+ for (final d in (entry['definitions'] as List<dynamic>? ?? const []).whereType<Map<String, dynamic>>()) {- final text = (d['definition'] as String?)?.trim();- if (text == null || text.isEmpty) continue;- defs.add(DictionaryDefinition(- text, (d['example'] as String?)?.trim()));+ final text = _stripHtml((d['definition'] as String?) ?? '');+ if (text.isEmpty) continue;+ String? example;+ final parsed = (d['parsedExamples'] as List<dynamic>? ?? const [])+ .whereType<Map<String, dynamic>>();+ for (final p in parsed) {+ final e = _stripHtml((p['example'] as String?) ?? '');+ if (e.isNotEmpty) {+ example = e;+ break;+ }+ }+ example ??= (d['examples'] as List<dynamic>? ?? const [])+ .whereType<String>()+ .map(_stripHtml)+ .where((e) => e.isNotEmpty)+ .firstOrNull;+ defs.add(DictionaryDefinition(text, example));}if (defs.isEmpty) continue;- final synonyms = (m['synonyms'] as List<dynamic>? ?? const [])- .whereType<String>()- .where((s) => s.trim().isNotEmpty)- .take(8)- .toList();meanings.add(DictionaryMeaning(- (m['partOfSpeech'] as String?) ?? '', defs, synonyms));+ (entry['partOfSpeech'] as String?) ?? '', defs, const [],+ language: language));}}if (meanings.isEmpty) {- return DictionaryResult(DictionaryStatus.notFound, clean);+ return DictionaryResult(DictionaryStatus.notFound, word);}- return DictionaryResult(DictionaryStatus.found, clean,- phonetic: phonetic, meanings: meanings);+ return DictionaryResult(DictionaryStatus.found, word,+ meanings: meanings);} catch (e) {- debugPrint('[Dictionary] lookup failed for "$clean": $e');- return DictionaryResult(DictionaryStatus.error, clean);+ debugPrint('[Dictionary] lookup failed for "$word": $e');+ return DictionaryResult(DictionaryStatus.error, word);}}++ static String _stripHtml(String s) => s+ .replaceAll(RegExp(r'<[^>]*>'), '')+ .replaceAll('&', '&')+ .replaceAll('<', '<')+ .replaceAll('>', '>')+ .replaceAll(''', "'")+ .replaceAll('"', '"')+ .replaceAll(' ', ' ')+ .trim();}diff --git a/lib/widgets/dictionary_sheet.dart b/lib/widgets/dictionary_sheet.dartindex d40697ae..95f5255d 100644--- a/lib/widgets/dictionary_sheet.dart+++ b/lib/widgets/dictionary_sheet.dart@@ -135,9 +135,13 @@ class _DictionarySheetState extends State<_DictionarySheet> {DictionaryResult result, ColorScheme cs, TextTheme tt) {final widgets = <Widget>[];for (final m in result.meanings) {+ final language = m.language;+ final label = (language == null || language.isEmpty || language == 'English')+ ? m.partOfSpeech+ : '$language · ${m.partOfSpeech}';widgets.add(Padding(padding: const EdgeInsets.only(top: 10, bottom: 4),- child: Text(m.partOfSpeech,+ child: Text(label,style: tt.titleSmall?.copyWith(color: cs.primary,fontStyle: FontStyle.italic,