From 162123338ad923cf760ff86f0b4a1aa159327b93 Mon Sep 17 00:00:00 2001
From: LaIixia <97442619+LaIixia@users.noreply.github.com>
Date: Tue, 1 Oct 2024 15:25:55 +0900
Subject: [PATCH] Counter_v1.5.5

---
 .idea/misc.xml                                       |  1 +
 app/build.gradle                                     |  2 +-
 app/src/main/java/com/myapp/textcounter/Buttons.java | 12 ++++++++++--
 .../main/java/com/myapp/textcounter/SubActivity.java | 11 -----------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index f27700b..99e89d7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/app/build.gradle b/app/build.gradle
index 354485c..2f24762 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdk 21
         targetSdk 34
         versionCode 1
-        versionName "1.5"
+        versionName "1.5.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/myapp/textcounter/Buttons.java b/app/src/main/java/com/myapp/textcounter/Buttons.java
index 2f5f525..031189b 100644
--- a/app/src/main/java/com/myapp/textcounter/Buttons.java
+++ b/app/src/main/java/com/myapp/textcounter/Buttons.java
@@ -15,10 +15,18 @@ public class Buttons  {
     //edittextの改行抜きでテキストの文字数を取得するメソッド
     public String BreakCnt(String letters,String lines) {return format((Integer.parseInt(letters) - Integer.parseInt(lines))+1);}
     //空白抜きでテキストの文字数をカウント
-    public String EmptyCnt(String letters) {return format(letters.replaceAll("　", "").length());}
+    public String EmptyCnt(String letters) {
+        //全角が含まれる場合半角に置き換え、その置き換えた半角を””に置き換えて、その際のdataの長さを返す
+        if(letters.contains("　")){
+          String data = letters.replaceAll("　", " ");//全角=>半角
+            return format(data.replaceAll(" ","").length());//半角=>空
+        }
+        //全角が含まれない場合
+        return format(letters.replaceAll(" ","").length());
+    }
+
     //Intをstring型に変換するメソッド
     public String format(int lines) {return String.valueOf (lines);}
-
     //edittextの文字列の長さが0であるか判断するメソッド
     public boolean Judge(Editable l) {return Integer.parseInt (Count (l)) == 0;}//0の場合だけtrueを返す
     //OS Version Check
diff --git a/app/src/main/java/com/myapp/textcounter/SubActivity.java b/app/src/main/java/com/myapp/textcounter/SubActivity.java
index 3332aaf..a0a32ea 100644
--- a/app/src/main/java/com/myapp/textcounter/SubActivity.java
+++ b/app/src/main/java/com/myapp/textcounter/SubActivity.java
@@ -27,17 +27,6 @@ protected void onCreate(Bundle savedInstanceState) {
         String text = b.getString("text data"),
         lines = b.getString ("text lines");
 
-     /*   TextView LT = findViewById (R.id.text_letters2),
-                LI = findViewById (R.id.text_lines2),
-                PA = findViewById (R.id.text_paper2),
-                EM = findViewById (R.id.text_empty2),
-                BR = findViewById (R.id.text_break2),
-                UTF8 = findViewById (R.id.text_utf_8_2),
-                UTF16 = findViewById (R.id.text_utf_16_2),
-                EUC = findViewById (R.id.text_euc_2),
-                SHIFT = findViewById (R.id.text_shift_2),
-                JIS = findViewById (R.id.text_jis_2);*/
-
         LT = findViewById (R.id.text_letters2);
         LI = findViewById (R.id.text_lines2);
         //PA = findViewById (R.id.text_paper2);