Fixes for logos, diorite, and iOS.

Signed-off-by: Katharine Berry <[email protected]>

Author: Katharine

app/src/c/converse/segments/widgets/map.c

@@ -94,7 +94,7 @@ static void prv_layer_update(Layer *layer, GContext *ctx) {
       graphics_fill_circle(ctx, center, 6);
       graphics_context_set_stroke_color(ctx, COLOR_FALLBACK(GColorDarkGray, GColorBlack));
       graphics_draw_circle(ctx, center, 6);
-      graphics_context_set_fill_color(ctx, COLOR_FALLBACK(GColorBlue, GColorDarkGray));
+      graphics_context_set_fill_color(ctx, COLOR_FALLBACK(GColorBlue, GColorBlack));
       graphics_fill_circle(ctx, center, 4);
     }
   } else {

app/src/pkjs/widgets/map.js

@@ -16,12 +16,44 @@
 
 var imageManager = require('../lib/image_transfer').sharedManager;
 
+var atob = window.atob;
+
+// We don't get atob on iOS, so provide our own implementation.
+// This code was generated by Google Search, in response to the query "atob in pure javascript".
+// It seems to work.
+if (!atob) {
+    atob = function(encoded) {
+        const base64 =
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+        var str = "";
+        var bytes = 0;
+        var bits = 0;
+        for (var i = 0; i < encoded.length; i++) {
+            const char = encoded.charAt(i);
+            if (char === "=") {
+                break;
+            }
+            var value = base64.indexOf(char);
+            if (value < 0) {
+                continue;
+            }
+            bytes = (bytes << 6) | value;
+            bits += 6;
+            if (bits >= 8) {
+                str += String.fromCharCode((bytes >>> (bits - 8)) & 255);
+                bits -= 8;
+            }
+        }
+        return str;
+    }
+}
+
 exports.map = function(session, params) {
     console.log(JSON.stringify(params));
     var base64pbi = params['image'];
     var width = params['width'];
     var height = params['height'];
-    var pbi = atob(base64pbi); // TODO: this doesn't work on iOS!
+    var pbi = atob(base64pbi);
     var imageData = new Array(pbi.length);
     for (var i = 0; i < pbi.length; i++) {
         imageData[i] = pbi.charCodeAt(i);

service/assistant/widgets/google1bit.png

@@ -24,6 +24,10 @@ import (
 var googleLogo2BitBytes []byte
 var googleLogo2Bit image.Image
 
+//go:embed google1bit.png
+var googleLogo1BitBytes []byte
+var googleLogo1Bit image.Image
+
 var mapClient *gmaps.Client
 
 func init() {
@@ -37,6 +41,10 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
+	googleLogo1Bit, err = png.Decode(bytes.NewReader(googleLogo1BitBytes))
+	if err != nil {
+		panic(err)
+	}
 }
 
 type MapWidget struct {
@@ -53,6 +61,7 @@ func mapWidget(ctx context.Context, markerString, includeLocationString string)
 	markers := make(map[string]util.Coords)
 	threadContext := query.ThreadContextFromContext(ctx)
 	poiInfo := threadContext.ContextStorage.POIs
+	// Sometimes the model decides to quote random parts of the string, I don't know.
 	markerString = strings.ReplaceAll(markerString, "\"", "")
 	for _, marker := range strings.Split(markerString, ",") {
 		parts := strings.Split(marker, ":")
@@ -191,6 +200,7 @@ func monochrome(img image.Image) image.Image {
 			}
 		}
 	}
+	stampLogo(newImg, googleLogo1Bit)
 	return newImg
 }
 
@@ -207,13 +217,17 @@ func lowColour(img image.Image) image.Image {
 			}
 		}
 	}
-	// slap the 2-bit version of the Google logo over the existing one
-	topCorner := image.Pt(8, newImg.Bounds().Max.Y-16)
-	targetImageRect := image.Rect(topCorner.X, topCorner.Y, topCorner.X+googleLogo2Bit.Bounds().Dx(), topCorner.Y+googleLogo2Bit.Bounds().Dy())
-	draw.Draw(newImg, targetImageRect, googleLogo2Bit, image.Point{0, 0}, draw.Over)
+	stampLogo(newImg, googleLogo2Bit)
 	return newImg
 }
 
+func stampLogo(img *image.Paletted, logo image.Image) {
+	// slap the black and white version of the Google logo over the existing one
+	topCorner := image.Pt(7, img.Bounds().Max.Y-17)
+	targetImageRect := image.Rect(topCorner.X, topCorner.Y, topCorner.X+googleLogo2Bit.Bounds().Dx(), topCorner.Y+googleLogo2Bit.Bounds().Dy())
+	draw.Draw(img, targetImageRect, logo, image.Point{0, 0}, draw.Over)
+}
+
 func greyTo2BitGrey(c color.Color) color.Color {
 	y := color.GrayModel.Convert(c).(color.Gray).Y
 	switch {
@@ -228,20 +242,6 @@ func greyTo2BitGrey(c color.Color) color.Color {
 	}
 }
 
-func colourToMonochrome(c color.Color) color.Color {
-	isBlack := color.Gray16Model.Convert(c).(color.Gray16).Y <= 0xEFFF
-	if isBlack {
-		return color.Black
-	} else {
-		return color.White
-	}
-}
-
-func closeToWhite(c color.Color) bool {
-	r, g, b, _ := c.RGBA()
-	return r > 0x7FFF && g > 0x7FFF && b > 0x7FFF
-}
-
 func closeToBlack(c color.Color) bool {
 	r, _, _, _ := c.RGBA()
 	return r <= 0x8FFF
@@ -251,8 +251,3 @@ func shouldDither(c color.Color) bool {
 	r, g, b, _ := c.RGBA()
 	return r == 42148 && g == 43176 && b == 43690
 }
-
-func isGrey(c color.Color) bool {
-	r, g, b, _ := c.RGBA()
-	return r == g && g == b
-}