nani/app

Julien LepillerSat Jul 31 02:58:54+0200 2021

ad7f304

Fix furigana with katakana in headword

CHANGELOG.md

   This fixes the issues where the furigana was not fully visible if it took
   too much space, as well as the view disappearing completely when the text was
   too large.
 * Fixed furigana with katakana in headword. It used to make the furigana matching
   fail completely.
 ### Features

app/src/main/java/eu/lepiller/nani/ResultPagerAdapter.java

 import java.util.List;
 import java.util.Map;
 import eu.lepiller.views.RubyTextView;
 import me.weilunli.views.RubyTextView;
 import eu.lepiller.nani.result.KanjiResult;
 import eu.lepiller.nani.result.Result;

app/src/main/java/eu/lepiller/nani/result/Result.java

 import java.util.regex.Pattern;
 import static java.lang.Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS;
 import static java.lang.Character.UnicodeBlock.KATAKANA;
 public class Result {
     public static class Source {
         // split the text into kanji / not kanji portions
         ArrayList<String> portions = new ArrayList<>();
         ArrayList<String> portionsMatcher = new ArrayList<>();
         StringBuilder current = new StringBuilder();
         StringBuilder currentMatcher = new StringBuilder();
         Character.UnicodeBlock b = CJK_UNIFIED_IDEOGRAPHS;
         MojiConverter converter = new MojiConverter();
         for(int i=0; i<txt.length(); i++) {
             Character.UnicodeBlock b2 = Character.UnicodeBlock.of(txt.charAt(i));
             if(b == b2) {
                 // if the headwork contains katakana, convert it to hiragana to match pronunciation
                 // better.
                 current.append(txt.charAt(i));
                 if(b2 == KATAKANA) {
                     String s = new String(new char[]{txt.charAt(i)});
                     String hiragana = converter.convertRomajiToHiragana(converter.convertKanaToRomaji(s));
                     currentMatcher.append(hiragana.charAt(0));
                 } else {
                     currentMatcher.append(txt.charAt(i));
                 }
             } else {
                 String s = current.toString();
                 if(!s.isEmpty())
                     portions.add(s);
                 s = currentMatcher.toString();
                 if(!s.isEmpty())
                     portionsMatcher.add(s);
                 current = new StringBuilder();
                 currentMatcher = new StringBuilder();
                 current.append(txt.charAt(i));
                 if(b2 == KATAKANA) {
                     String katakana = new String(new char[]{txt.charAt(i)});
                     String hiragana = converter.convertRomajiToHiragana(converter.convertKanaToRomaji(katakana));
                     currentMatcher.append(hiragana.charAt(0));
                 } else {
                     currentMatcher.append(txt.charAt(i));
                 }
             }
             b = b2;
         String str = current.toString();
         if(!str.isEmpty())
             portions.add(str);
         str = currentMatcher.toString();
         if(!str.isEmpty()) {
             portionsMatcher.add(str);
         }
         // Create a regexp to match kanji places
         current = new StringBuilder();
         current.append("^");
         for(String s: portions) {
         for(String s: portionsMatcher) {
             if(Character.UnicodeBlock.of(s.charAt(0)) == CJK_UNIFIED_IDEOGRAPHS) {
                 current.append("(.*)");
             } else {
         Matcher m = p.matcher(reading);
         if(!m.matches()) {
             Log.v("RESULT", "Finaly: " + txt);
             Log.v("RESULT", "Finally: " + txt);
             return txt;
         }