From 52a2885e28309631edab2fe653c956600107394b Mon Sep 17 00:00:00 2001

From: Julien Lepiller <julien@lepiller.eu>

Date: Sat, 25 Jun 2022 15:57:04 +0200

Subject: [PATCH 1/2] =?UTF-8?q?Fix=20issue=20with=20=E3=80=85?=

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

---

 .idea/gradle.xml                              |  3 +--

 .idea/runConfigurations.xml                   | 12 ----------

 .../java/eu/lepiller/nani/result/Result.java  | 23 +++++++++++++------

 3 files changed, 17 insertions(+), 21 deletions(-)

 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml

index 91df564..dffceeb 100644

--- a/.idea/gradle.xml

+++ b/.idea/gradle.xml

@@ -4,7 +4,7 @@

   <component name="GradleSettings">

     <option name="linkedExternalProjectsSettings">

       <GradleProjectSettings>

-        <option name="testRunner" value="PLATFORM" />

+        <option name="testRunner" value="GRADLE" />

         <option name="distributionType" value="DEFAULT_WRAPPED" />

         <option name="externalProjectPath" value="$PROJECT_DIR$" />

         <option name="modules">

@@ -14,7 +14,6 @@

             <option value="$PROJECT_DIR$/rubytextview" />

           </set>

         </option>

-        <option name="resolveModulePerSourceSet" value="false" />

       </GradleProjectSettings>

     </option>

   </component>

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml

deleted file mode 100644

index 7f68460..0000000

--- a/.idea/runConfigurations.xml

+++ /dev/null

@@ -1,12 +0,0 @@

-<?xml version="1.0" encoding="UTF-8"?>

-<project version="4">

-  <component name="RunConfigurationProducerService">

-    <option name="ignoredProducers">

-      <set>

-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />

-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />

-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

-      </set>

-    </option>

-  </component>

-</project>

\ No newline at end of file

diff --git a/app/src/main/java/eu/lepiller/nani/result/Result.java b/app/src/main/java/eu/lepiller/nani/result/Result.java

index ed1cfb5..ff7e87c 100644

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

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

@@ -1,5 +1,6 @@

 package eu.lepiller.nani.result;

+import android.os.Build;

 import android.util.Log;

 import com.moji4j.MojiConverter;

@@ -9,8 +10,7 @@ import java.util.List;

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

-import static java.lang.Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS;

-import static java.lang.Character.UnicodeBlock.KATAKANA;

+import static java.lang.Character.UnicodeBlock.*;

 public class Result {

     public static class Source {

@@ -133,6 +133,16 @@ public class Result {

         return null;

     }

+    private static boolean isKanji(char c) {

+        Character.UnicodeBlock b = of(c);

+        return b == CJK_UNIFIED_IDEOGRAPHS ||

+                b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A ||

+                b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B ||

+                (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C) ||

+                (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D) ||

+                b == CJK_SYMBOLS_AND_PUNCTUATION;

+    }

+

     public String getKanjiFurigana() {

         String txt = getKanji();

         String reading = getReading();

@@ -142,12 +152,12 @@ public class Result {

         ArrayList<String> portions = new ArrayList<>();

         StringBuilder current = new StringBuilder();

-        Character.UnicodeBlock b = CJK_UNIFIED_IDEOGRAPHS;

+        boolean currentBlockIsKanji = true;

         MojiConverter converter = new MojiConverter();

         for(int i=0; i<txt.length(); i++) {

-            Character.UnicodeBlock b2 = Character.UnicodeBlock.of(txt.charAt(i));

-            if(b == b2) {

+            boolean currentCharIsKanji = isKanji(txt.charAt(i));

+            if(currentBlockIsKanji == currentCharIsKanji) {

                 // if the headwork contains katakana, convert it to hiragana to match pronunciation

                 // better.

                 current.append(txt.charAt(i));

@@ -158,8 +168,7 @@ public class Result {

                 current = new StringBuilder();

                 current.append(txt.charAt(i));

             }

-

-            b = b2;

+            currentBlockIsKanji = currentCharIsKanji;

         }

         String str = current.toString();

         if(!str.isEmpty())

-- 

2.36.1

From 578597e322002ae1d9fb2cd649c1d57950c8d5e2 Mon Sep 17 00:00:00 2001

From: Julien Lepiller <julien@lepiller.eu>

Date: Sat, 25 Jun 2022 16:06:16 +0200

Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"Fix=20issue=20with=20=E3=80=85"?=

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

This reverts commit 52a2885e28309631edab2fe653c956600107394b.

---

 .idea/gradle.xml                              |  3 ++-

 .idea/runConfigurations.xml                   | 12 ++++++++++

 .../java/eu/lepiller/nani/result/Result.java  | 23 ++++++-------------

 3 files changed, 21 insertions(+), 17 deletions(-)

 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml

index dffceeb..91df564 100644

--- a/.idea/gradle.xml

+++ b/.idea/gradle.xml

@@ -4,7 +4,7 @@

   <component name="GradleSettings">

     <option name="linkedExternalProjectsSettings">

       <GradleProjectSettings>

-        <option name="testRunner" value="GRADLE" />

+        <option name="testRunner" value="PLATFORM" />

         <option name="distributionType" value="DEFAULT_WRAPPED" />

         <option name="externalProjectPath" value="$PROJECT_DIR$" />

         <option name="modules">

@@ -14,6 +14,7 @@

             <option value="$PROJECT_DIR$/rubytextview" />

           </set>

         </option>

+        <option name="resolveModulePerSourceSet" value="false" />

       </GradleProjectSettings>

     </option>

   </component>

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml

new file mode 100644

index 0000000..7f68460

--- /dev/null

+++ b/.idea/runConfigurations.xml

@@ -0,0 +1,12 @@

+<?xml version="1.0" encoding="UTF-8"?>

+<project version="4">

+  <component name="RunConfigurationProducerService">

+    <option name="ignoredProducers">

+      <set>

+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />

+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />

+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

+      </set>

+    </option>

+  </component>

+</project>

\ No newline at end of file

diff --git a/app/src/main/java/eu/lepiller/nani/result/Result.java b/app/src/main/java/eu/lepiller/nani/result/Result.java

index ff7e87c..ed1cfb5 100644

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

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

@@ -1,6 +1,5 @@

 package eu.lepiller.nani.result;

-import android.os.Build;

 import android.util.Log;

 import com.moji4j.MojiConverter;

@@ -10,7 +9,8 @@ import java.util.List;

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

-import static java.lang.Character.UnicodeBlock.*;

+import static java.lang.Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS;

+import static java.lang.Character.UnicodeBlock.KATAKANA;

 public class Result {

     public static class Source {

@@ -133,16 +133,6 @@ public class Result {

         return null;

     }

-    private static boolean isKanji(char c) {

-        Character.UnicodeBlock b = of(c);

-        return b == CJK_UNIFIED_IDEOGRAPHS ||

-                b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A ||

-                b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B ||

-                (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C) ||

-                (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && b == CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D) ||

-                b == CJK_SYMBOLS_AND_PUNCTUATION;

-    }

-

     public String getKanjiFurigana() {

         String txt = getKanji();

         String reading = getReading();

@@ -152,12 +142,12 @@ public class Result {

         ArrayList<String> portions = new ArrayList<>();

         StringBuilder current = new StringBuilder();

-        boolean currentBlockIsKanji = true;

+        Character.UnicodeBlock b = CJK_UNIFIED_IDEOGRAPHS;

         MojiConverter converter = new MojiConverter();

         for(int i=0; i<txt.length(); i++) {

-            boolean currentCharIsKanji = isKanji(txt.charAt(i));

-            if(currentBlockIsKanji == currentCharIsKanji) {

+            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));

@@ -168,7 +158,8 @@ public class Result {

                 current = new StringBuilder();

                 current.append(txt.charAt(i));

             }

-            currentBlockIsKanji = currentCharIsKanji;

+

+            b = b2;

         }

         String str = current.toString();

         if(!str.isEmpty())

-- 

2.36.1

        versionCode 12

        versionName "0.4.0"