Functional phone app

.gitignore

@@ -41,6 +41,10 @@ captures/
 .idea/dictionaries
 .idea/libraries
 .idea/caches
+.idea/modules.xml
+.idea/compiler.xml
+.idea/misc.xml
+.idea/**/shelf
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.
@@ -65,4 +69,3 @@ fastlane/test_output
 fastlane/readme.md
 .idea/workspace.xml___jb_old___
 .idea/misc.xml
-.idea/misc.xml

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.layoutxml.twelveish"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 267
-        versionName "2.3.2"
+        versionCode 358
+        versionName "2.4.0"
         multiDexEnabled true
     }
     buildTypes {
@@ -20,12 +20,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.android.support:wearable:2.7.0'
+    implementation 'com.google.android.support:wearable:2.8.1'
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha03'
     implementation 'androidx.wear:wear:1.0.0'
-    compileOnly 'com.google.android.wearable:wearable:2.7.0'
+    compileOnly 'com.google.android.wearable:wearable:2.8.1'
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
 }

app/src/main/java/com/layoutxml/twelveish/MyWatchFace.java

@@ -59,6 +59,7 @@
 import java.lang.ref.WeakReference;
 import java.util.Calendar;
 import java.util.Locale;
+import java.util.Map;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
@@ -70,13 +71,20 @@ public class MyWatchFace extends CanvasWatchFaceService {
     private static final String TAG = "MyWatchFace";
     private final String path = "/twelveish";
     private final String DATA_KEY = "rokas-twelveish";
-    private final String HANDSHAKE_KEY = "rokas-twelveish-hs";
+    // private final String HANDSHAKE_KEY = "rokas-twelveish-hs";
+    private final String HANDSHAKE_REQUEST = "rokas-twelveish-hs-req";
+    private final String HANDSHAKE_RESPONSE = "rokas-twelveish-hs-res";
     private final String GOODBYE_KEY = "rokas-twelveish-gb";
     private final String DATA_REQUEST_KEY = "rokas-twelveish-dr";
     private final String DATA_REQUEST_KEY2 = "rokas-twelveish-dr2";
     private final String CONFIG_REQUEST_KEY = "rokas-twelveish-cr";
     private final String CONFIG_REQUEST_KEY2 = "rokas-twelveish-cr2";
     private final String PREFERENCES_KEY = "rokas-twelveish-pr";
+
+    private final String PING_FIRE = "rokas-twelveish-fire"; // Request ping
+    private final String PING_ICE = "rokas-twelveish-ice"; // Ping response
+    private final String TIMESTAMP = "rokas-twelveish-timestamp";
+
     private static Typeface NORMAL_TYPEFACE = Typeface.create("sans-serif-light", Typeface.NORMAL);
     private static final long INTERACTIVE_UPDATE_RATE_MS = TimeUnit.SECONDS.toMillis(1);
     private static final int MSG_UPDATE_TIME = 0;
@@ -755,8 +763,8 @@ public void onVisibilityChanged(boolean visible) {
                 Wearable.getDataClient(getApplicationContext()).addListener(this);
 
                 final PutDataMapRequest mPutDataMapRequest = PutDataMapRequest.create(path);
-                mPutDataMapRequest.getDataMap().putLong("Timestamp", System.currentTimeMillis());
-                mPutDataMapRequest.getDataMap().putBoolean(HANDSHAKE_KEY, true);
+                mPutDataMapRequest.getDataMap().putLong(TIMESTAMP, System.currentTimeMillis());
+                mPutDataMapRequest.getDataMap().putBoolean(HANDSHAKE_REQUEST, true);
                 mPutDataMapRequest.setUrgent();
                 PutDataRequest mPutDataRequest = mPutDataMapRequest.asPutDataRequest();
                 Wearable.getDataClient(getApplicationContext()).putDataItem(mPutDataRequest);
@@ -1184,11 +1192,44 @@ private void processData(DataItem dataItem) {
                 getDate(); //forces date refresh in case it is changed
                 significantTimeChange = true;
             }
-            boolean handshake = mDataMapItem.getDataMap().getBoolean(HANDSHAKE_KEY);
-            if (!handshake) {
+            if (array!=null && array.length > 3){ // We're receiving multiple preferences at once
+                for(int i = 0; i < array.length; i+=3){
+                    switch(array[i + 2]){
+                        case "String":
+                            prefs.edit().putString(array[i], array[i+1]).apply();
+                            break;
+                        case "Integer":
+                            try {
+                                int newPref = Integer.parseInt(array[1]);
+                                prefs.edit().putInt(array[i],newPref).apply();
+                            } catch (NumberFormatException e) {
+                                Toast.makeText(getApplicationContext(), "Preference error", Toast.LENGTH_SHORT).show();
+                            }
+                            break;
+                        case "Boolean":
+                            if (array[i + 1].equalsIgnoreCase("true") || array[i+1].equalsIgnoreCase("false")){
+                                boolean newPref2 = Boolean.parseBoolean(array[i+1]);
+                                prefs.edit().putBoolean(array[i], newPref2).apply();
+                            } else {
+                                Toast.makeText(getApplicationContext(), "Preference error", Toast.LENGTH_SHORT).show();
+                                Log.d(TAG, "processData: Boolean was neither true nor false! Key: " + array[i]);
+                            }
+                            break;
+                        default:
+                            Log.d(TAG, "Unkown type in processData. Index: " + i);
+                    }
+                }
+
+                loadPreferences();
+                getDate(); //forces date refresh in case it is changed
+                significantTimeChange = true;
+
+            }
+            boolean handshake = mDataMapItem.getDataMap().getBoolean(HANDSHAKE_REQUEST);
+            if (handshake) {
                 final PutDataMapRequest mPutDataMapRequest = PutDataMapRequest.create(path);
-                mPutDataMapRequest.getDataMap().putLong("Timestamp", System.currentTimeMillis());
-                mPutDataMapRequest.getDataMap().putBoolean(HANDSHAKE_KEY, true);
+                mPutDataMapRequest.getDataMap().putLong(TIMESTAMP, System.currentTimeMillis());
+                mPutDataMapRequest.getDataMap().putBoolean(HANDSHAKE_RESPONSE, true);
                 mPutDataMapRequest.setUrgent();
                 PutDataRequest mPutDataRequest = mPutDataMapRequest.asPutDataRequest();
                 Wearable.getDataClient(getApplicationContext()).putDataItem(mPutDataRequest);
@@ -1202,48 +1243,21 @@ public void run() {
             }
             boolean preferences = mDataMapItem.getDataMap().getBoolean(DATA_REQUEST_KEY);
             if (preferences) {
-                String[] preferencesToSend = new String[38];
-                preferencesToSend[0] = "militaryTime";
-                preferencesToSend[1] = militaryTime ? "true" : "false";
-                preferencesToSend[2] = "militaryTextTime";
-                preferencesToSend[3] = militaryTextTime ? "true" : "false";
-                preferencesToSend[4] = "ampm";
-                preferencesToSend[5] = "false"; //TODO: remove
-                preferencesToSend[6] = "showSecondary";
-                preferencesToSend[7] = showSecondary ? "true" : "false";
-                preferencesToSend[8] = "showSecondaryActive";
-                preferencesToSend[9] = showSecondaryActive ? "true" : "false";
-                preferencesToSend[10] = "showSecondaryCalendar";
-                preferencesToSend[11] = showSecondaryCalendar ? "true" : "false";
-                preferencesToSend[12] = "showSecondaryCalendarActive";
-                preferencesToSend[13] = showSecondaryCalendarActive ? "true" : "false";
-                preferencesToSend[14] = "showSuffixes";
-                preferencesToSend[15] = "true";
-                preferencesToSend[16] = "showBattery";
-                preferencesToSend[17] = showBattery ? "true" : "false";
-                preferencesToSend[18] = "showBatteryAmbient";
-                preferencesToSend[19] = showBatteryAmbient ? "true" : "false";
-                preferencesToSend[20] = "showWords";
-                preferencesToSend[21] = "true";
-                preferencesToSend[22] = "showWordsAmbient";
-                preferencesToSend[23] = "true";
-                preferencesToSend[24] = "showSeconds";
-                preferencesToSend[25] = showSeconds ? "true" : "false";
-                preferencesToSend[26] = "showComplication";
-                preferencesToSend[27] = showComplication ? "true" : "false";
-                preferencesToSend[28] = "showComplicationAmbient";
-                preferencesToSend[29] = showComplicationAmbient ? "true" : "false";
-                preferencesToSend[30] = "showDay";
-                preferencesToSend[31] = showDay ? "true" : "false";
-                preferencesToSend[32] = "showDayAmbient";
-                preferencesToSend[33] = showDayAmbient ? "true" : "false";
-                preferencesToSend[34] = "disableComplicationTap";
-                preferencesToSend[35] = disableComplicationTap ? "true" : "false";
-                preferencesToSend[36] = "legacyWords";
-                preferencesToSend[37] = "false";
+                Map<String, ?> prefMap = prefs.getAll();
+                int index = 0;
+                String[] preferencesToSend = new String[prefMap.size() * 2];
+
+                for(Map.Entry<String, ?> entry : prefMap.entrySet()){
+                    String key = entry.getKey();
+                    String value = entry.getValue().toString();
+
+                    preferencesToSend[index] = key;
+                    preferencesToSend[index+1] = value;
+                    index += 2;
+                }
 
                 final PutDataMapRequest mPutDataMapRequest = PutDataMapRequest.create(path);
-                mPutDataMapRequest.getDataMap().putLong("Timestamp", System.currentTimeMillis());
+                mPutDataMapRequest.getDataMap().putLong(TIMESTAMP, System.currentTimeMillis());
                 mPutDataMapRequest.getDataMap().putStringArray(PREFERENCES_KEY, preferencesToSend);
                 mPutDataMapRequest.getDataMap().putBoolean(DATA_REQUEST_KEY, false);
                 mPutDataMapRequest.getDataMap().putBoolean(DATA_REQUEST_KEY2, true);
@@ -1267,7 +1281,7 @@ public void run() {
                 configToSend[2] = complicationRightSet ? "true" : "false";
 
                 final PutDataMapRequest mPutDataMapRequest = PutDataMapRequest.create(path);
-                mPutDataMapRequest.getDataMap().putLong("Timestamp", System.currentTimeMillis());
+                mPutDataMapRequest.getDataMap().putLong(TIMESTAMP, System.currentTimeMillis());
                 mPutDataMapRequest.getDataMap().putStringArray(PREFERENCES_KEY, configToSend);
                 mPutDataMapRequest.getDataMap().putBoolean(CONFIG_REQUEST_KEY, false);
                 mPutDataMapRequest.getDataMap().putBoolean(CONFIG_REQUEST_KEY2, true);
@@ -1282,6 +1296,23 @@ public void run() {
                     }
                 }, 5000);
             }
+            boolean ping = mDataMapItem.getDataMap().getBoolean(PING_FIRE);
+            if(ping){
+                final PutDataMapRequest mPutDataMapRequest = PutDataMapRequest.create(path);
+                mPutDataMapRequest.getDataMap().putLong(TIMESTAMP, System.currentTimeMillis());
+                mPutDataMapRequest.getDataMap().putBoolean(PING_FIRE, false);
+                mPutDataMapRequest.getDataMap().putBoolean(PING_ICE, true);
+                mPutDataMapRequest.setUrgent();
+                PutDataRequest mPutDataRequest = mPutDataMapRequest.asPutDataRequest();
+                Wearable.getDataClient(getApplicationContext()).putDataItem(mPutDataRequest);
+                final Handler handler = new Handler();
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        mPutDataMapRequest.getDataMap().clear();
+                    }
+                }, 5000);
+            }
         }
     }
 }

app/src/main/java/com/layoutxml/twelveish/WordClockTask.java

@@ -369,7 +369,22 @@ private String capitalise0(int hours, int minutes, int index) {
         String mainPrefix = "";
         StringBuilder prefix;
         if ((minutes > 0) && (!Prefixes[index].equals("")) && (Prefixes[index] != null)) {
-            String[] prefixArray = Prefixes[index].split(" ");
+
+            //Split the prefix with non-break spaces and capitalise each word
+            StringBuilder preString = new StringBuilder();
+            String[] preArray = Prefixes[index].split("\\u00A0");
+
+            for (String word : preArray){
+                if(preString.length() != 0)
+                    preString.append("\u00A0");
+
+                String capitalised = word.substring(0, 1).toUpperCase() + word.substring(1);
+                preString.append(capitalised);
+            }
+
+            // Do the same with spaces
+
+            String[] prefixArray = preString.toString().split(" ");
             prefix = new StringBuilder();
             for (String word : prefixArray) {
                 if (prefix.length() != 0)
@@ -403,8 +418,21 @@ private String capitalise0(int hours, int minutes, int index) {
         if (showSuffixes) {
             StringBuilder suffix;
             if ((minutes > 0) && (!Suffixes[index].equals("")) && (Suffixes[index] != null)) {
+
+                //We first need to replace non-break spaces with regular spaces
+                StringBuilder suffString = new StringBuilder();
+                String[] suffArray = Suffixes[index].split("\\u00A0");
+
+                for (String word : suffArray){
+                    if(suffString.length() != 0)
+                        suffString.append("\u00A0");
+
+                    String capitalised = word.substring(0, 1).toUpperCase() + word.substring(1);
+                    suffString.append(capitalised);
+                }
+
                 if (SuffixNewLine[index]) {
-                    String[] suffixArray = Suffixes[index].split(" ");
+                    String[] suffixArray = suffString.toString().split(" ");
                     suffix = new StringBuilder();
                     for (String word : suffixArray) {
                         if (suffix.length() != 0)
@@ -414,7 +442,7 @@ private String capitalise0(int hours, int minutes, int index) {
                     }
                     mainSuffix = suffix.toString();
                 } else {
-                    mainSuffix = Suffixes[index].toLowerCase();
+                    mainSuffix = suffString.toString().toLowerCase();
                 }
             }
         }
@@ -478,7 +506,7 @@ private String capitalise2(int hours, int minutes, int index) {
                             + middle
                             + ((minutes > 0) ? (SuffixNewLine[index] ? " " : "") : "")
                             + ((showSuffixes) ? ((minutes > 0) ? Suffixes[index] : "") : "");
-            return arrangeWords(text);
+            return arrangeWords(text).toLowerCase();
         }
     }
 
@@ -498,15 +526,15 @@ private String capitalise3(int hours, int minutes, int index) {
                             + middle
                             + ((minutes > 0) ? (SuffixNewLine[index] ? "\n" : "") : "")
                             + ((showSuffixes) ? ((minutes > 0) ? Suffixes[index] : "") : "");
-            return text20.substring(0, 1).toUpperCase() + text20.substring(1).toLowerCase();
+            return text20.substring(0, 1).toUpperCase() + text20.substring(1);
         } else {
             String text20 =
                     ((minutes > 0) ? Prefixes[index] : "")
                             + ((minutes > 0) ? (PrefixNewLine[index] ? " " : "") : "")
                             + middle
                             + ((minutes > 0) ? (SuffixNewLine[index] ? " " : "") : "")
                             + ((showSuffixes) ? ((minutes > 0) ? Suffixes[index] : "") : "");
-            return arrangeWords(text20.substring(0, 1).toUpperCase() + text20.substring(1).toLowerCase());
+            return arrangeWords(text20.substring(0, 1).toUpperCase() + text20.substring(1));
         }
     }