From 3137880a2137e96b7cee8a02e1e2a055e37f04db Mon Sep 17 00:00:00 2001 From: Thad Hughes Date: Wed, 25 Dec 2013 17:58:06 -0800 Subject: [PATCH] Fix flags of Scotland. Fix bug with URL encoding HTMLEntry titles. --- res/drawable-xxhdpi/flag_of_scotland.png | Bin 5324 -> 3496 bytes .../dictionary/DictionaryManagerActivity.java | 51 +++++++++++------- .../hughes/android/dictionary/MyWebView.java | 1 + .../android/dictionary/engine/HtmlEntry.java | 3 +- todo.txt | 2 + 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/res/drawable-xxhdpi/flag_of_scotland.png b/res/drawable-xxhdpi/flag_of_scotland.png index 551836fb4f4cafe9d397dd8b2d47c575005e79cf..8ce57bf39019bd3bd8513bc2add64d3f984d08fd 100644 GIT binary patch delta 3350 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\n

%s\n", - formatQuickdicUrl(indexShortName, titleEscaped), titleEscaped, + formatQuickdicUrl(indexShortName, htmlEntry.title), titleEscaped, htmlEntry.getHtml())); } return result.toString(); diff --git a/todo.txt b/todo.txt index 7bbc3c8..8cdab76 100644 --- a/todo.txt +++ b/todo.txt @@ -1,2 +1,4 @@ +* Clicking link in HTML view doesn't trigger search. +* Back button in top left * Contributions from: * HtmlEntries inline, expandable. \ No newline at end of file -- 2.43.0