Revert "Fix issue with ???"

Julien LepillerSat Jun 25 16:06:16+0200 2022

578597e

Revert "Fix issue with ???" This reverts commit 52a2885e28309631edab2fe653c956600107394b.

.idea/gradle.xml

44 
  <component name="GradleSettings">
55 
    <option name="linkedExternalProjectsSettings">
66 
      <GradleProjectSettings>
7-
        <option name="testRunner" value="GRADLE" />
7+
        <option name="testRunner" value="PLATFORM" />
88 
        <option name="distributionType" value="DEFAULT_WRAPPED" />
99 
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
1010 
        <option name="modules">

…

1414 
            <option value="$PROJECT_DIR$/rubytextview" />
1515 
          </set>
1616 
        </option>
17+
        <option name="resolveModulePerSourceSet" value="false" />
1718 
      </GradleProjectSettings>
1819 
    </option>
1920 
  </component>

.idea/runConfigurations.xml unknown status 1

1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project version="4">
3+
  <component name="RunConfigurationProducerService">
4+
    <option name="ignoredProducers">
5+
      <set>
6+
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
7+
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
8+
        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
9+
      </set>
10+
    </option>
11+
  </component>
12+
</project>
12<
013<
\ No newline at end of file
app/src/main/java/eu/lepiller/nani/result/Result.java
11 
package eu.lepiller.nani.result;
22 
3-
import android.os.Build;
43 
import android.util.Log;
54 
65 
import com.moji4j.MojiConverter;
…
109 
import java.util.regex.Matcher;
1110 
import java.util.regex.Pattern;
1211 
13-
import static java.lang.Character.UnicodeBlock.*;
12+
import static java.lang.Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS;
13+
import static java.lang.Character.UnicodeBlock.KATAKANA;
1414 
1515 
public class Result {
1616 
    public static class Source {
…
133133 
        return null;
134134 
    }
135135 
136-
    private static boolean isKanji(char c) {
137-
        Character.UnicodeBlock b = of(c);
138-
        return b == CJK_UNIFIED_IDEOGRAPHS ||
139-
                b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A ||
140-
                b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B ||
141-
                (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C) ||
142-
                (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D) ||
143-
                b == CJK_SYMBOLS_AND_PUNCTUATION;
144-
    }
145-
146136 
    public String getKanjiFurigana() {
147137 
        String txt = getKanji();
148138 
        String reading = getReading();
…
152142 
        ArrayList<String> portions = new ArrayList<>();
153143 
154144 
        StringBuilder current = new StringBuilder();
155-
        boolean currentBlockIsKanji = true;
145+
        Character.UnicodeBlock b = CJK_UNIFIED_IDEOGRAPHS;
156146 
157147 
        MojiConverter converter = new MojiConverter();
158148 
        for(int i=0; i<txt.length(); i++) {
159-
            boolean currentCharIsKanji = isKanji(txt.charAt(i));
160-
            if(currentBlockIsKanji == currentCharIsKanji) {
149+
            Character.UnicodeBlock b2 = Character.UnicodeBlock.of(txt.charAt(i));
150+
            if(b == b2) {
161151 
                // if the headwork contains katakana, convert it to hiragana to match pronunciation
162152 
                // better.
163153 
                current.append(txt.charAt(i));
…
168158 
                current = new StringBuilder();
169159 
                current.append(txt.charAt(i));
170160 
            }
171-
            currentBlockIsKanji = currentCharIsKanji;
161+
162+
            b = b2;
172163 
        }
173164 
        String str = current.toString();
174165 
        if(!str.isEmpty())