MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-25 11:26:47 +01:00
Code Releases Wiki Activity

Now split words for image conversion on punctuation, not just space.

Browse Source 
Also fix accidental typos
This commit is contained in:
Gordon Williams 2022-05-23 16:01:06 +01:00
parent 5211540e03
commit 57b53f28be
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
View File

@ -262,7 +262,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
else if (ch<32 || ch==26 || ch==27 || ch==127 || ch==173) json += "\\x"+Integer.toHexString((ch&255)|256).substring(1); else if (ch<32 || ch==26 || ch==27 || ch==127 || ch==173) json += "\\x"+Integer.toHexString((ch&255)|256).substring(1);
else json += s.charAt(i); else json += s.charAt(i);
} }
json += "\""; return json + "\"";
} else if (v instanceof JSONArray) { } else if (v instanceof JSONArray) {
JSONArray a = (JSONArray)v; JSONArray a = (JSONArray)v;
String json = "["; String json = "[";
@ -274,7 +274,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
} catch (JSONException e) { } catch (JSONException e) {
LOG.warn("jsonToString array error: " + e.getLocalizedMessage()); LOG.warn("jsonToString array error: " + e.getLocalizedMessage());
} }
json += jsonToStringInternal(o)); json += jsonToStringInternal(o);
} }
return json+"]"; return json+"]";
} else if (v instanceof JSONObject) { } else if (v instanceof JSONObject) {
@ -293,9 +293,8 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
if (iter.hasNext()) json+=","; if (iter.hasNext()) json+=",";
} }
return json+"}"; return json+"}";
} else { // int/double/null } // else int/double/null
return v.toString(); return v.toString();
}
} }
/// Convert a JSON object to a JSON String (NOT 100% JSON compliant) /// Convert a JSON object to a JSON String (NOT 100% JSON compliant)
@ -577,8 +576,6 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
return true; return true;
} }
public String renderUnicodeAsImage(String txt) { public String renderUnicodeAsImage(String txt) {
if (txt==null) return null; if (txt==null) return null;
// If we're not doing conversion, pass this right back // If we're not doing conversion, pass this right back
@ -586,18 +583,31 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
if (!devicePrefs.getBoolean(PREF_BANGLEJS_TEXT_BITMAP, false)) if (!devicePrefs.getBoolean(PREF_BANGLEJS_TEXT_BITMAP, false))
return txt; return txt;
// Otherwise split up and check each word // Otherwise split up and check each word
String words[] = txt.split(" "); String word = "", result = "";
for (int i=0;i<words.length;i++) { boolean needsTranslate = false;
boolean isRenderable = true; for (int i=0;i<txt.length();i++) {
for (int j=0;j<words[i].length();j++) { char ch = txt.charAt(i);
char c = words[i].charAt(j); if (" -_/:.,?!'\"&*()".indexOf(ch)>=0) {
// word split
if (needsTranslate) { // convert word
result += "\0"+bitmapToEspruinoString(textToBitmap(word))+ch;
} else { // or just copy across
result += word+ch;
}
word = "";
needsTranslate = false;
} else {
// TODO: better check? // TODO: better check?
if (c<0 || c>255) isRenderable = false; if (ch<0 || ch>255) needsTranslate = true;
word += ch;
} }
if (!isRenderable)
words[i] = "\0"+bitmapToEspruinoString(textToBitmap(words[i]));
} }
return String.join(" ", words); if (needsTranslate) { // convert word
result += "\0"+bitmapToEspruinoString(textToBitmap(word));
} else { // or just copy across
result += word;
}
return result;
} }
@Override @Override