Testing

Re-worked assets
2026-01-07 23:37:22 -07:00 · 2026-01-07 13:52:01 -07:00
37 changed files with 542 additions and 507 deletions
--- a/branding/.gitignore
+++ b/branding/.gitignore
@@ -1,3 +0,0 @@
-*.tmp
-.DS_Store
-*.log
--- a/branding/generate.py
+++ b/branding/generate.py
@@ -1,394 +0,0 @@
-#!/usr/bin/env python3
-
-import xml.etree.ElementTree as ET
-from pathlib import Path
-from typing import Callable, TypedDict
-from PIL import Image, ImageDraw
-
-
-class Polygon(TypedDict):
-    coords: list[tuple[float, float]]
-    fill: str
-
-
-SCRIPT_DIR = Path(__file__).parent
-PROJECT_ROOT = SCRIPT_DIR.parent
-SOURCE_DIR = SCRIPT_DIR / "source"
-LOGOS_DIR = SCRIPT_DIR / "logos"
-
-
-def parse_svg_polygons(svg_path: Path) -> list[Polygon]:
-    tree = ET.parse(svg_path)
-    root = tree.getroot()
-
-    ns = {"svg": "http://www.w3.org/2000/svg"}
-    polygons = root.findall(".//svg:polygon", ns)
-    if not polygons:
-        polygons = root.findall(".//polygon")
-
-    result: list[Polygon] = []
-    for poly in polygons:
-        points_str = poly.get("points", "").strip()
-        fill = poly.get("fill", "#000000")
-
-        coords: list[tuple[float, float]] = []
-        for pair in points_str.split():
-            x, y = pair.split(",")
-            coords.append((float(x), float(y)))
-
-        result.append({"coords": coords, "fill": fill})
-
-    return result
-
-
-def get_bbox(polygons: list[Polygon]) -> dict[str, float]:
-    all_coords: list[tuple[float, float]] = []
-    for poly in polygons:
-        all_coords.extend(poly["coords"])
-
-    xs = [c[0] for c in all_coords]
-    ys = [c[1] for c in all_coords]
-
-    return {
-        "min_x": min(xs),
-        "max_x": max(xs),
-        "min_y": min(ys),
-        "max_y": max(ys),
-        "width": max(xs) - min(xs),
-        "height": max(ys) - min(ys),
-    }
-
-
-def scale_and_center(
-    polygons: list[Polygon], viewbox_size: float, target_width: float
-) -> list[Polygon]:
-    bbox = get_bbox(polygons)
-
-    scale = target_width / bbox["width"]
-    center = viewbox_size / 2
-
-    scaled_polys: list[Polygon] = []
-    for poly in polygons:
-        scaled_coords = [(x * scale, y * scale) for x, y in poly["coords"]]
-        scaled_polys.append({"coords": scaled_coords, "fill": poly["fill"]})
-
-    scaled_bbox = get_bbox(scaled_polys)
-    current_center_x = (scaled_bbox["min_x"] + scaled_bbox["max_x"]) / 2
-    current_center_y = (scaled_bbox["min_y"] + scaled_bbox["max_y"]) / 2
-
-    offset_x = center - current_center_x
-    offset_y = center - current_center_y
-
-    final_polys: list[Polygon] = []
-    for poly in scaled_polys:
-        final_coords = [(x + offset_x, y + offset_y) for x, y in poly["coords"]]
-        final_polys.append({"coords": final_coords, "fill": poly["fill"]})
-
-    return final_polys
-
-
-def format_svg_points(coords: list[tuple[float, float]]) -> str:
-    return " ".join(f"{x:.3f},{y:.3f}" for x, y in coords)
-
-
-def format_android_path(coords: list[tuple[float, float]]) -> str:
-    points = " ".join(f"{x:.3f},{y:.3f}" for x, y in coords)
-    pairs = points.split()
-    return f"M{pairs[0]} L{pairs[1]} L{pairs[2]} Z"
-
-
-def generate_svg(polygons: list[Polygon], width: int, height: int) -> str:
-    lines = [
-        f'<svg width="{width}" height="{height}" viewBox="0 0 {width} {height}" xmlns="http://www.w3.org/2000/svg">'
-    ]
-    for poly in polygons:
-        points = format_svg_points(poly["coords"])
-        lines.append(f'  <polygon points="{points}" fill="{poly["fill"]}"/>')
-    lines.append("</svg>")
-    return "\n".join(lines)
-
-
-def generate_android_vector(
-    polygons: list[Polygon], width: int, height: int, viewbox: int
-) -> str:
-    lines = [
-        '<?xml version="1.0" encoding="utf-8"?>',
-        '<vector xmlns:android="http://schemas.android.com/apk/res/android"',
-        f'    android:width="{width}dp"',
-        f'    android:height="{height}dp"',
-        f'    android:viewportWidth="{viewbox}"',
-        f'    android:viewportHeight="{viewbox}">',
-    ]
-    for poly in polygons:
-        path = format_android_path(poly["coords"])
-        lines.append(
-            f'    <path android:fillColor="{poly["fill"]}" android:pathData="{path}" />'
-        )
-    lines.append("</vector>")
-    return "\n".join(lines)
-
-
-def rasterize_svg(
-    svg_path: Path,
-    output_path: Path,
-    size: int,
-    bg_color: tuple[int, int, int, int] | None = None,
-    circular: bool = False,
-) -> None:
-    from xml.dom import minidom
-
-    doc = minidom.parse(str(svg_path))
-
-    img = Image.new(
-        "RGBA", (size, size), (255, 255, 255, 0) if bg_color is None else bg_color
-    )
-    draw = ImageDraw.Draw(img)
-
-    svg_elem = doc.getElementsByTagName("svg")[0]
-    viewbox = svg_elem.getAttribute("viewBox").split()
-    if viewbox:
-        vb_width = float(viewbox[2])
-        vb_height = float(viewbox[3])
-        scale_x = size / vb_width
-        scale_y = size / vb_height
-    else:
-        scale_x = scale_y = 1
-
-    def parse_transform(
-        transform_str: str,
-    ) -> Callable[[float, float], tuple[float, float]]:
-        import re
-
-        if not transform_str:
-            return lambda x, y: (x, y)
-
-        transforms: list[tuple[str, list[float]]] = []
-        for match in re.finditer(r"(\w+)\(([^)]+)\)", transform_str):
-            func, args_str = match.groups()
-            args = [float(x) for x in args_str.replace(",", " ").split()]
-            transforms.append((func, args))
-
-        def apply_transforms(x: float, y: float) -> tuple[float, float]:
-            for func, args in transforms:
-                if func == "translate":
-                    x += args[0]
-                    y += args[1] if len(args) > 1 else args[0]
-                elif func == "scale":
-                    x *= args[0]
-                    y *= args[1] if len(args) > 1 else args[0]
-            return x, y
-
-        return apply_transforms
-
-    for g in doc.getElementsByTagName("g"):
-        transform = parse_transform(g.getAttribute("transform"))
-
-        for poly in g.getElementsByTagName("polygon"):
-            points_str = poly.getAttribute("points").strip()
-            fill = poly.getAttribute("fill")
-            if not fill:
-                fill = "#000000"
-
-            coords: list[tuple[float, float]] = []
-            for pair in points_str.split():
-                x, y = pair.split(",")
-                x, y = float(x), float(y)
-                x, y = transform(x, y)
-                coords.append((x * scale_x, y * scale_y))
-
-            draw.polygon(coords, fill=fill)
-
-    for poly in doc.getElementsByTagName("polygon"):
-        if poly.parentNode and getattr(poly.parentNode, "tagName", None) == "g":
-            continue
-
-        points_str = poly.getAttribute("points").strip()
-        fill = poly.getAttribute("fill")
-        if not fill:
-            fill = "#000000"
-
-        coords = []
-        for pair in points_str.split():
-            x, y = pair.split(",")
-            coords.append((float(x) * scale_x, float(y) * scale_y))
-
-        draw.polygon(coords, fill=fill)
-
-    if circular:
-        mask = Image.new("L", (size, size), 0)
-        mask_draw = ImageDraw.Draw(mask)
-        mask_draw.ellipse((0, 0, size, size), fill=255)
-        img.putalpha(mask)
-
-    img.save(output_path)
-
-
-def main() -> None:
-    print("Generating branding assets...")
-
-    logo_svg = SOURCE_DIR / "logo.svg"
-    icon_light = SOURCE_DIR / "icon-light.svg"
-    icon_dark = SOURCE_DIR / "icon-dark.svg"
-    icon_tinted = SOURCE_DIR / "icon-tinted.svg"
-
-    polygons = parse_svg_polygons(logo_svg)
-
-    print("  iOS...")
-    ios_assets = PROJECT_ROOT / "ios/Ascently/Assets.xcassets/AppIcon.appiconset"
-
-    for src, dst in [
-        (icon_light, ios_assets / "app_icon_light_template.svg"),
-        (icon_dark, ios_assets / "app_icon_dark_template.svg"),
-        (icon_tinted, ios_assets / "app_icon_tinted_template.svg"),
-    ]:
-        with open(src) as f:
-            content = f.read()
-        with open(dst, "w") as f:
-            f.write(content)
-
-    img_light = Image.new("RGB", (1024, 1024), (255, 255, 255))
-    draw_light = ImageDraw.Draw(img_light)
-    scaled = scale_and_center(polygons, 1024, int(1024 * 0.7))
-    for poly in scaled:
-        coords = [(x, y) for x, y in poly["coords"]]
-        draw_light.polygon(coords, fill=poly["fill"])
-    img_light.save(ios_assets / "app_icon_1024.png")
-
-    img_dark = Image.new("RGB", (1024, 1024), (26, 26, 26))
-    draw_dark = ImageDraw.Draw(img_dark)
-    for poly in scaled:
-        coords = [(x, y) for x, y in poly["coords"]]
-        draw_dark.polygon(coords, fill=poly["fill"])
-    img_dark.save(ios_assets / "app_icon_1024_dark.png")
-
-    img_tinted = Image.new("RGB", (1024, 1024), (0, 0, 0))
-    draw_tinted = ImageDraw.Draw(img_tinted)
-    for i, poly in enumerate(scaled):
-        coords = [(x, y) for x, y in poly["coords"]]
-        draw_tinted.polygon(coords, fill=(0, 0, 0))
-    img_tinted.save(ios_assets / "app_icon_1024_tinted.png")
-
-    print("  Android...")
-
-    polys_108 = scale_and_center(polygons, 108, 60)
-    android_xml = generate_android_vector(polys_108, 108, 108, 108)
-    (
-        PROJECT_ROOT / "android/app/src/main/res/drawable/ic_launcher_foreground.xml"
-    ).write_text(android_xml)
-
-    polys_24 = scale_and_center(polygons, 24, 20)
-    mountains_xml = generate_android_vector(polys_24, 24, 24, 24)
-    (PROJECT_ROOT / "android/app/src/main/res/drawable/ic_mountains.xml").write_text(
-        mountains_xml
-    )
-
-    for density, size in [
-        ("mdpi", 48),
-        ("hdpi", 72),
-        ("xhdpi", 96),
-        ("xxhdpi", 144),
-        ("xxxhdpi", 192),
-    ]:
-        mipmap_dir = PROJECT_ROOT / f"android/app/src/main/res/mipmap-{density}"
-
-        img = Image.new("RGBA", (size, size), (255, 255, 255, 255))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.6))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        img.save(mipmap_dir / "ic_launcher.webp")
-
-        img_round = Image.new("RGBA", (size, size), (255, 255, 255, 255))
-        draw_round = ImageDraw.Draw(img_round)
-
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw_round.polygon(coords, fill=poly["fill"])
-
-        mask = Image.new("L", (size, size), 0)
-        mask_draw = ImageDraw.Draw(mask)
-        mask_draw.ellipse((0, 0, size, size), fill=255)
-        img_round.putalpha(mask)
-
-        img_round.save(mipmap_dir / "ic_launcher_round.webp")
-
-    print("  Docs...")
-
-    polys_32 = scale_and_center(polygons, 32, 26)
-    logo_svg_32 = generate_svg(polys_32, 32, 32)
-    (PROJECT_ROOT / "docs/src/assets/logo.svg").write_text(logo_svg_32)
-    (PROJECT_ROOT / "docs/src/assets/logo-dark.svg").write_text(logo_svg_32)
-
-    polys_256 = scale_and_center(polygons, 256, 208)
-    logo_svg_256 = generate_svg(polys_256, 256, 256)
-    (PROJECT_ROOT / "docs/src/assets/logo-highres.svg").write_text(logo_svg_256)
-
-    logo_32_path = PROJECT_ROOT / "docs/src/assets/logo.svg"
-    rasterize_svg(logo_32_path, PROJECT_ROOT / "docs/public/favicon.png", 32)
-
-    sizes = [16, 32, 48]
-    imgs = []
-    for size in sizes:
-        img = Image.new("RGBA", (size, size), (255, 255, 255, 0))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.8))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        imgs.append(img)
-
-    imgs[0].save(
-        PROJECT_ROOT / "docs/public/favicon.ico",
-        format="ICO",
-        sizes=[(s, s) for s in sizes],
-        append_images=imgs[1:],
-    )
-
-    print("  Logos...")
-
-    LOGOS_DIR.mkdir(exist_ok=True)
-
-    sizes = [64, 128, 256, 512, 1024, 2048]
-    for size in sizes:
-        img = Image.new("RGBA", (size, size), (255, 255, 255, 0))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.8))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        img.save(LOGOS_DIR / f"logo-{size}.png")
-
-    for size in sizes:
-        img = Image.new("RGBA", (size, size), (255, 255, 255, 255))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.8))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        img.save(LOGOS_DIR / f"logo-{size}-white.png")
-
-    for size in sizes:
-        img = Image.new("RGBA", (size, size), (26, 26, 26, 255))
-        draw = ImageDraw.Draw(img)
-
-        scaled = scale_and_center(polygons, size, int(size * 0.8))
-        for poly in scaled:
-            coords = [(x, y) for x, y in poly["coords"]]
-            draw.polygon(coords, fill=poly["fill"])
-
-        img.save(LOGOS_DIR / f"logo-{size}-dark.png")
-
-    print("Done.")
-
-
-if __name__ == "__main__":
-    main()
--- a/branding/generate.sh
+++ b/branding/generate.sh
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-if ! command -v python3 &> /dev/null; then
-    echo "Error: Python 3 required"
-    exit 1
-fi
-
-python3 "$SCRIPT_DIR/generate.py"
--- a/branding/source/AscentlyBlueBall.png
+++ b/branding/source/AscentlyBlueBall.png
--- a/branding/source/AscentlyGreenBall.png
+++ b/branding/source/AscentlyGreenBall.png
--- a/branding/source/AscentlyRedBall.png
+++ b/branding/source/AscentlyRedBall.png
--- a/branding/source/AscentlyYellowBall.png
+++ b/branding/source/AscentlyYellowBall.png
--- a/branding/source/AscetlyTriangle1.png
+++ b/branding/source/AscetlyTriangle1.png
--- a/branding/source/AscetlyTriangle2.png
+++ b/branding/source/AscetlyTriangle2.png
--- a/branding/source/Balls.icon/Assets/AscentlyBlueBall.png
+++ b/branding/source/Balls.icon/Assets/AscentlyBlueBall.png
--- a/branding/source/Balls.icon/Assets/AscentlyGreenBall.png
+++ b/branding/source/Balls.icon/Assets/AscentlyGreenBall.png
--- a/branding/source/Balls.icon/Assets/AscentlyRedBall.png
+++ b/branding/source/Balls.icon/Assets/AscentlyRedBall.png
--- a/branding/source/Balls.icon/Assets/AscentlyYellowBall.png
+++ b/branding/source/Balls.icon/Assets/AscentlyYellowBall.png
--- a/branding/source/Balls.icon/icon.json
+++ b/branding/source/Balls.icon/icon.json
@@ -0,0 +1,67 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "AscentlyRedBall.png",
+          "name" : "AscentlyRedBall",
+          "position" : {
+            "scale" : 0.4,
+            "translation-in-points" : [
+              90.60312499999992,
+              127.86484375000009
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyYellowBall.png",
+          "name" : "AscentlyYellowBall",
+          "position" : {
+            "scale" : 0.3,
+            "translation-in-points" : [
+              90.50312500000001,
+              -177.66484375
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyBlueBall.png",
+          "name" : "AscentlyBlueBall",
+          "position" : {
+            "scale" : 0.3,
+            "translation-in-points" : [
+              -138.20312500000006,
+              177.3648437500001
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyGreenBall.png",
+          "name" : "AscentlyGreenBall",
+          "position" : {
+            "scale" : 0.2,
+            "translation-in-points" : [
+              -138.30312499999997,
+              -43.08515625000001
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}
--- a/branding/source/Icon.icon/Assets/AscetlyTriangle1.png
+++ b/branding/source/Icon.icon/Assets/AscetlyTriangle1.png
--- a/branding/source/Icon.icon/Assets/AscetlyTriangle2.png
+++ b/branding/source/Icon.icon/Assets/AscetlyTriangle2.png
--- a/branding/source/Icon.icon/icon.json
+++ b/branding/source/Icon.icon/icon.json
@@ -0,0 +1,45 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "AscetlyTriangle2.png",
+          "name" : "AscetlyTriangle2",
+          "position" : {
+            "scale" : 0.75,
+            "translation-in-points" : [
+              108,
+              -53.8125
+            ]
+          }
+        },
+        {
+          "image-name" : "AscetlyTriangle1.png",
+          "name" : "AscetlyTriangle1",
+          "position" : {
+            "scale" : 0.5,
+            "translation-in-points" : [
+              -215,
+              39.9375
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}
--- a/ios/Ascently.xcodeproj/project.pbxproj
+++ b/ios/Ascently.xcodeproj/project.pbxproj
@@ -7,6 +7,52 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		D28C33372F0F87D60040FE49 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D28C33312F0F87D60040FE49 /* Assets.xcassets */; };
+		D28C33382F0F87D60040FE49 /* Balls.icon in Resources */ = {isa = PBXBuildFile; fileRef = D28C33322F0F87D60040FE49 /* Balls.icon */; };
+		D28C33392F0F87D60040FE49 /* Icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = D28C33342F0F87D60040FE49 /* Icon.icon */; };
+		D28C333B2F0F87D60040FE49 /* AscentlyShortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C32F92F0F87D60040FE49 /* AscentlyShortcuts.swift */; };
+		D28C333C2F0F87D60040FE49 /* SessionIntentSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C32FA2F0F87D60040FE49 /* SessionIntentSupport.swift */; };
+		D28C333D2F0F87D60040FE49 /* ToggleSessionIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C32FB2F0F87D60040FE49 /* ToggleSessionIntent.swift */; };
+		D28C333E2F0F87D60040FE49 /* AsyncImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C32FD2F0F87D60040FE49 /* AsyncImageView.swift */; };
+		D28C333F2F0F87D60040FE49 /* CameraImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C32FE2F0F87D60040FE49 /* CameraImagePicker.swift */; };
+		D28C33402F0F87D60040FE49 /* PhotoOptionSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C32FF2F0F87D60040FE49 /* PhotoOptionSheet.swift */; };
+		D28C33412F0F87D60040FE49 /* ActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33022F0F87D60040FE49 /* ActivityAttributes.swift */; };
+		D28C33422F0F87D60040FE49 /* BackupFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33032F0F87D60040FE49 /* BackupFormat.swift */; };
+		D28C33432F0F87D60040FE49 /* DataModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33042F0F87D60040FE49 /* DataModels.swift */; };
+		D28C33442F0F87D60040FE49 /* DeltaSyncFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33052F0F87D60040FE49 /* DeltaSyncFormat.swift */; };
+		D28C33452F0F87D60040FE49 /* ServerSyncProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33072F0F87D60040FE49 /* ServerSyncProvider.swift */; };
+		D28C33462F0F87D60040FE49 /* SyncMerger.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33082F0F87D60040FE49 /* SyncMerger.swift */; };
+		D28C33472F0F87D60040FE49 /* SyncProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33092F0F87D60040FE49 /* SyncProvider.swift */; };
+		D28C33482F0F87D60040FE49 /* HealthKitService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C330B2F0F87D60040FE49 /* HealthKitService.swift */; };
+		D28C33492F0F87D60040FE49 /* MusicService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C330C2F0F87D60040FE49 /* MusicService.swift */; };
+		D28C334A2F0F87D60040FE49 /* SyncService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C330D2F0F87D60040FE49 /* SyncService.swift */; };
+		D28C334B2F0F87D60040FE49 /* AppIconHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33102F0F87D60040FE49 /* AppIconHelper.swift */; };
+		D28C334C2F0F87D60040FE49 /* AppLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33112F0F87D60040FE49 /* AppLogger.swift */; };
+		D28C334D2F0F87D60040FE49 /* DataStateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33122F0F87D60040FE49 /* DataStateManager.swift */; };
+		D28C334E2F0F87D60040FE49 /* IconTestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33132F0F87D60040FE49 /* IconTestView.swift */; };
+		D28C334F2F0F87D60040FE49 /* ImageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33142F0F87D60040FE49 /* ImageManager.swift */; };
+		D28C33502F0F87D60040FE49 /* ImageNamingUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33152F0F87D60040FE49 /* ImageNamingUtils.swift */; };
+		D28C33512F0F87D60040FE49 /* OrientationAwareImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33162F0F87D60040FE49 /* OrientationAwareImage.swift */; };
+		D28C33522F0F87D60040FE49 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33172F0F87D60040FE49 /* ThemeManager.swift */; };
+		D28C33532F0F87D60040FE49 /* ZipUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33182F0F87D60040FE49 /* ZipUtils.swift */; };
+		D28C33542F0F87D60040FE49 /* ClimbingDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C331A2F0F87D60040FE49 /* ClimbingDataManager.swift */; };
+		D28C33552F0F87D60040FE49 /* LiveActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C331B2F0F87D60040FE49 /* LiveActivityManager.swift */; };
+		D28C33562F0F87D60040FE49 /* AddAttemptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C331D2F0F87D60040FE49 /* AddAttemptView.swift */; };
+		D28C33572F0F87D60040FE49 /* AddEditGymView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C331E2F0F87D60040FE49 /* AddEditGymView.swift */; };
+		D28C33582F0F87D60040FE49 /* AddEditProblemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C331F2F0F87D60040FE49 /* AddEditProblemView.swift */; };
+		D28C33592F0F87D60040FE49 /* AddEditSessionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33202F0F87D60040FE49 /* AddEditSessionView.swift */; };
+		D28C335A2F0F87D60040FE49 /* GymDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33232F0F87D60040FE49 /* GymDetailView.swift */; };
+		D28C335B2F0F87D60040FE49 /* ProblemDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33242F0F87D60040FE49 /* ProblemDetailView.swift */; };
+		D28C335C2F0F87D60040FE49 /* SessionDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33252F0F87D60040FE49 /* SessionDetailView.swift */; };
+		D28C335D2F0F87D60040FE49 /* AnalyticsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33272F0F87D60040FE49 /* AnalyticsView.swift */; };
+		D28C335E2F0F87D60040FE49 /* CalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33282F0F87D60040FE49 /* CalendarView.swift */; };
+		D28C335F2F0F87D60040FE49 /* GymsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33292F0F87D60040FE49 /* GymsView.swift */; };
+		D28C33602F0F87D60040FE49 /* LiveActivityDebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C332A2F0F87D60040FE49 /* LiveActivityDebugView.swift */; };
+		D28C33612F0F87D60040FE49 /* ProblemsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C332B2F0F87D60040FE49 /* ProblemsView.swift */; };
+		D28C33622F0F87D60040FE49 /* SessionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C332C2F0F87D60040FE49 /* SessionsView.swift */; };
+		D28C33632F0F87D60040FE49 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C332D2F0F87D60040FE49 /* SettingsView.swift */; };
+		D28C33642F0F87D60040FE49 /* AscentlyApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33302F0F87D60040FE49 /* AscentlyApp.swift */; };
+		D28C33652F0F87D60040FE49 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D28C33332F0F87D60040FE49 /* ContentView.swift */; };
 		D2FE94822E78E95C008CDB25 /* ActivityKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2FE94802E78E958008CDB25 /* ActivityKit.framework */; };
 		D2FE948D2E78FEE0008CDB25 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2FE948C2E78FEE0008CDB25 /* WidgetKit.framework */; };
 		D2FE948F2E78FEE0008CDB25 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2FE948E2E78FEE0008CDB25 /* SwiftUI.framework */; };
@@ -48,6 +94,54 @@
 /* Begin PBXFileReference section */
 		D24C19682E75002A0045894C /* Ascently.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ascently.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D268B79E2E83894A003AA641 /* SessionStatusLiveExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SessionStatusLiveExtension.entitlements; sourceTree = "<group>"; };
+		D28C32F92F0F87D60040FE49 /* AscentlyShortcuts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AscentlyShortcuts.swift; sourceTree = "<group>"; };
+		D28C32FA2F0F87D60040FE49 /* SessionIntentSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionIntentSupport.swift; sourceTree = "<group>"; };
+		D28C32FB2F0F87D60040FE49 /* ToggleSessionIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleSessionIntent.swift; sourceTree = "<group>"; };
+		D28C32FD2F0F87D60040FE49 /* AsyncImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncImageView.swift; sourceTree = "<group>"; };
+		D28C32FE2F0F87D60040FE49 /* CameraImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraImagePicker.swift; sourceTree = "<group>"; };
+		D28C32FF2F0F87D60040FE49 /* PhotoOptionSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoOptionSheet.swift; sourceTree = "<group>"; };
+		D28C33022F0F87D60040FE49 /* ActivityAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityAttributes.swift; sourceTree = "<group>"; };
+		D28C33032F0F87D60040FE49 /* BackupFormat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackupFormat.swift; sourceTree = "<group>"; };
+		D28C33042F0F87D60040FE49 /* DataModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataModels.swift; sourceTree = "<group>"; };
+		D28C33052F0F87D60040FE49 /* DeltaSyncFormat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeltaSyncFormat.swift; sourceTree = "<group>"; };
+		D28C33072F0F87D60040FE49 /* ServerSyncProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSyncProvider.swift; sourceTree = "<group>"; };
+		D28C33082F0F87D60040FE49 /* SyncMerger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncMerger.swift; sourceTree = "<group>"; };
+		D28C33092F0F87D60040FE49 /* SyncProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncProvider.swift; sourceTree = "<group>"; };
+		D28C330B2F0F87D60040FE49 /* HealthKitService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HealthKitService.swift; sourceTree = "<group>"; };
+		D28C330C2F0F87D60040FE49 /* MusicService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicService.swift; sourceTree = "<group>"; };
+		D28C330D2F0F87D60040FE49 /* SyncService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncService.swift; sourceTree = "<group>"; };
+		D28C33102F0F87D60040FE49 /* AppIconHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIconHelper.swift; sourceTree = "<group>"; };
+		D28C33112F0F87D60040FE49 /* AppLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLogger.swift; sourceTree = "<group>"; };
+		D28C33122F0F87D60040FE49 /* DataStateManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataStateManager.swift; sourceTree = "<group>"; };
+		D28C33132F0F87D60040FE49 /* IconTestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconTestView.swift; sourceTree = "<group>"; };
+		D28C33142F0F87D60040FE49 /* ImageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageManager.swift; sourceTree = "<group>"; };
+		D28C33152F0F87D60040FE49 /* ImageNamingUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageNamingUtils.swift; sourceTree = "<group>"; };
+		D28C33162F0F87D60040FE49 /* OrientationAwareImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrientationAwareImage.swift; sourceTree = "<group>"; };
+		D28C33172F0F87D60040FE49 /* ThemeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeManager.swift; sourceTree = "<group>"; };
+		D28C33182F0F87D60040FE49 /* ZipUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZipUtils.swift; sourceTree = "<group>"; };
+		D28C331A2F0F87D60040FE49 /* ClimbingDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClimbingDataManager.swift; sourceTree = "<group>"; };
+		D28C331B2F0F87D60040FE49 /* LiveActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveActivityManager.swift; sourceTree = "<group>"; };
+		D28C331D2F0F87D60040FE49 /* AddAttemptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAttemptView.swift; sourceTree = "<group>"; };
+		D28C331E2F0F87D60040FE49 /* AddEditGymView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditGymView.swift; sourceTree = "<group>"; };
+		D28C331F2F0F87D60040FE49 /* AddEditProblemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditProblemView.swift; sourceTree = "<group>"; };
+		D28C33202F0F87D60040FE49 /* AddEditSessionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditSessionView.swift; sourceTree = "<group>"; };
+		D28C33232F0F87D60040FE49 /* GymDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GymDetailView.swift; sourceTree = "<group>"; };
+		D28C33242F0F87D60040FE49 /* ProblemDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProblemDetailView.swift; sourceTree = "<group>"; };
+		D28C33252F0F87D60040FE49 /* SessionDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionDetailView.swift; sourceTree = "<group>"; };
+		D28C33272F0F87D60040FE49 /* AnalyticsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsView.swift; sourceTree = "<group>"; };
+		D28C33282F0F87D60040FE49 /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = "<group>"; };
+		D28C33292F0F87D60040FE49 /* GymsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GymsView.swift; sourceTree = "<group>"; };
+		D28C332A2F0F87D60040FE49 /* LiveActivityDebugView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveActivityDebugView.swift; sourceTree = "<group>"; };
+		D28C332B2F0F87D60040FE49 /* ProblemsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProblemsView.swift; sourceTree = "<group>"; };
+		D28C332C2F0F87D60040FE49 /* SessionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionsView.swift; sourceTree = "<group>"; };
+		D28C332D2F0F87D60040FE49 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
+		D28C332F2F0F87D60040FE49 /* Ascently.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Ascently.entitlements; sourceTree = "<group>"; };
+		D28C33302F0F87D60040FE49 /* AscentlyApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AscentlyApp.swift; sourceTree = "<group>"; };
+		D28C33312F0F87D60040FE49 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		D28C33322F0F87D60040FE49 /* Balls.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Balls.icon; sourceTree = "<group>"; };
+		D28C33332F0F87D60040FE49 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		D28C33342F0F87D60040FE49 /* Icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Icon.icon; sourceTree = "<group>"; };
+		D28C33352F0F87D60040FE49 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D2F32FAD2E90B26500B1BC56 /* AscentlyTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AscentlyTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		D2FE94802E78E958008CDB25 /* ActivityKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ActivityKit.framework; path = System/Library/Frameworks/ActivityKit.framework; sourceTree = SDKROOT; };
 		D2FE948B2E78FEE0008CDB25 /* SessionStatusLiveExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SessionStatusLiveExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -56,13 +150,6 @@
 /* End PBXFileReference section */

 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		D28C3C8B2E75111D00F7AEE9 /* Exceptions for "Ascently" folder in "Ascently" target */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				Info.plist,
-			);
-			target = D24C19672E75002A0045894C /* Ascently */;
-		};
 		D2FE94A42E78FEE1008CDB25 /* Exceptions for "SessionStatusLive" folder in "SessionStatusLiveExtension" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
@@ -73,14 +160,6 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		D24C196A2E75002A0045894C /* Ascently */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-				D28C3C8B2E75111D00F7AEE9 /* Exceptions for "Ascently" folder in "Ascently" target */,
-			);
-			path = Ascently;
-			sourceTree = "<group>";
-		};
 		D2F32FAE2E90B26500B1BC56 /* AscentlyTests */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			path = AscentlyTests;
@@ -129,7 +208,7 @@
 			isa = PBXGroup;
 			children = (
 				D268B79E2E83894A003AA641 /* SessionStatusLiveExtension.entitlements */,
-				D24C196A2E75002A0045894C /* Ascently */,
+				D28C33362F0F87D60040FE49 /* Ascently */,
 				D2FE94902E78FEE0008CDB25 /* SessionStatusLive */,
 				D2F32FAE2E90B26500B1BC56 /* AscentlyTests */,
 				D2FE947F2E78E958008CDB25 /* Frameworks */,
@@ -147,6 +226,165 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		D28C32FC2F0F87D60040FE49 /* AppIntents */ = {
+			isa = PBXGroup;
+			children = (
+				D28C32F92F0F87D60040FE49 /* AscentlyShortcuts.swift */,
+				D28C32FA2F0F87D60040FE49 /* SessionIntentSupport.swift */,
+				D28C32FB2F0F87D60040FE49 /* ToggleSessionIntent.swift */,
+			);
+			path = AppIntents;
+			sourceTree = "<group>";
+		};
+		D28C33002F0F87D60040FE49 /* Components */ = {
+			isa = PBXGroup;
+			children = (
+				D28C32FD2F0F87D60040FE49 /* AsyncImageView.swift */,
+				D28C32FE2F0F87D60040FE49 /* CameraImagePicker.swift */,
+				D28C32FF2F0F87D60040FE49 /* PhotoOptionSheet.swift */,
+			);
+			path = Components;
+			sourceTree = "<group>";
+		};
+		D28C33012F0F87D60040FE49 /* FocusFilter */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = FocusFilter;
+			sourceTree = "<group>";
+		};
+		D28C33062F0F87D60040FE49 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				D28C33022F0F87D60040FE49 /* ActivityAttributes.swift */,
+				D28C33032F0F87D60040FE49 /* BackupFormat.swift */,
+				D28C33042F0F87D60040FE49 /* DataModels.swift */,
+				D28C33052F0F87D60040FE49 /* DeltaSyncFormat.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		D28C330A2F0F87D60040FE49 /* Sync */ = {
+			isa = PBXGroup;
+			children = (
+				D28C33072F0F87D60040FE49 /* ServerSyncProvider.swift */,
+				D28C33082F0F87D60040FE49 /* SyncMerger.swift */,
+				D28C33092F0F87D60040FE49 /* SyncProvider.swift */,
+			);
+			path = Sync;
+			sourceTree = "<group>";
+		};
+		D28C330E2F0F87D60040FE49 /* Services */ = {
+			isa = PBXGroup;
+			children = (
+				D28C330A2F0F87D60040FE49 /* Sync */,
+				D28C330B2F0F87D60040FE49 /* HealthKitService.swift */,
+				D28C330C2F0F87D60040FE49 /* MusicService.swift */,
+				D28C330D2F0F87D60040FE49 /* SyncService.swift */,
+			);
+			path = Services;
+			sourceTree = "<group>";
+		};
+		D28C330F2F0F87D60040FE49 /* Spotlight */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Spotlight;
+			sourceTree = "<group>";
+		};
+		D28C33192F0F87D60040FE49 /* Utils */ = {
+			isa = PBXGroup;
+			children = (
+				D28C33102F0F87D60040FE49 /* AppIconHelper.swift */,
+				D28C33112F0F87D60040FE49 /* AppLogger.swift */,
+				D28C33122F0F87D60040FE49 /* DataStateManager.swift */,
+				D28C33132F0F87D60040FE49 /* IconTestView.swift */,
+				D28C33142F0F87D60040FE49 /* ImageManager.swift */,
+				D28C33152F0F87D60040FE49 /* ImageNamingUtils.swift */,
+				D28C33162F0F87D60040FE49 /* OrientationAwareImage.swift */,
+				D28C33172F0F87D60040FE49 /* ThemeManager.swift */,
+				D28C33182F0F87D60040FE49 /* ZipUtils.swift */,
+			);
+			path = Utils;
+			sourceTree = "<group>";
+		};
+		D28C331C2F0F87D60040FE49 /* ViewModels */ = {
+			isa = PBXGroup;
+			children = (
+				D28C331A2F0F87D60040FE49 /* ClimbingDataManager.swift */,
+				D28C331B2F0F87D60040FE49 /* LiveActivityManager.swift */,
+			);
+			path = ViewModels;
+			sourceTree = "<group>";
+		};
+		D28C33212F0F87D60040FE49 /* AddEdit */ = {
+			isa = PBXGroup;
+			children = (
+				D28C331D2F0F87D60040FE49 /* AddAttemptView.swift */,
+				D28C331E2F0F87D60040FE49 /* AddEditGymView.swift */,
+				D28C331F2F0F87D60040FE49 /* AddEditProblemView.swift */,
+				D28C33202F0F87D60040FE49 /* AddEditSessionView.swift */,
+			);
+			path = AddEdit;
+			sourceTree = "<group>";
+		};
+		D28C33222F0F87D60040FE49 /* Debug */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Debug;
+			sourceTree = "<group>";
+		};
+		D28C33262F0F87D60040FE49 /* Detail */ = {
+			isa = PBXGroup;
+			children = (
+				D28C33232F0F87D60040FE49 /* GymDetailView.swift */,
+				D28C33242F0F87D60040FE49 /* ProblemDetailView.swift */,
+				D28C33252F0F87D60040FE49 /* SessionDetailView.swift */,
+			);
+			path = Detail;
+			sourceTree = "<group>";
+		};
+		D28C332E2F0F87D60040FE49 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				D28C33212F0F87D60040FE49 /* AddEdit */,
+				D28C33222F0F87D60040FE49 /* Debug */,
+				D28C33262F0F87D60040FE49 /* Detail */,
+				D28C33272F0F87D60040FE49 /* AnalyticsView.swift */,
+				D28C33282F0F87D60040FE49 /* CalendarView.swift */,
+				D28C33292F0F87D60040FE49 /* GymsView.swift */,
+				D28C332A2F0F87D60040FE49 /* LiveActivityDebugView.swift */,
+				D28C332B2F0F87D60040FE49 /* ProblemsView.swift */,
+				D28C332C2F0F87D60040FE49 /* SessionsView.swift */,
+				D28C332D2F0F87D60040FE49 /* SettingsView.swift */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		D28C33362F0F87D60040FE49 /* Ascently */ = {
+			isa = PBXGroup;
+			children = (
+				D28C32FC2F0F87D60040FE49 /* AppIntents */,
+				D28C33002F0F87D60040FE49 /* Components */,
+				D28C33012F0F87D60040FE49 /* FocusFilter */,
+				D28C33062F0F87D60040FE49 /* Models */,
+				D28C330E2F0F87D60040FE49 /* Services */,
+				D28C330F2F0F87D60040FE49 /* Spotlight */,
+				D28C33192F0F87D60040FE49 /* Utils */,
+				D28C331C2F0F87D60040FE49 /* ViewModels */,
+				D28C332E2F0F87D60040FE49 /* Views */,
+				D28C332F2F0F87D60040FE49 /* Ascently.entitlements */,
+				D28C33302F0F87D60040FE49 /* AscentlyApp.swift */,
+				D28C33312F0F87D60040FE49 /* Assets.xcassets */,
+				D28C33322F0F87D60040FE49 /* Balls.icon */,
+				D28C33332F0F87D60040FE49 /* ContentView.swift */,
+				D28C33342F0F87D60040FE49 /* Icon.icon */,
+				D28C33352F0F87D60040FE49 /* Info.plist */,
+			);
+			path = Ascently;
+			sourceTree = "<group>";
+		};
 		D2FE947F2E78E958008CDB25 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -174,9 +412,6 @@
 			dependencies = (
 				D2FE949F2E78FEE1008CDB25 /* PBXTargetDependency */,
 			);
-			fileSystemSynchronizedGroups = (
-				D24C196A2E75002A0045894C /* Ascently */,
-			);
 			name = Ascently;
 			packageProductDependencies = (
 			);
@@ -277,6 +512,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D28C33372F0F87D60040FE49 /* Assets.xcassets in Resources */,
+				D28C33382F0F87D60040FE49 /* Balls.icon in Resources */,
+				D28C33392F0F87D60040FE49 /* Icon.icon in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -301,6 +539,49 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D28C333B2F0F87D60040FE49 /* AscentlyShortcuts.swift in Sources */,
+				D28C333C2F0F87D60040FE49 /* SessionIntentSupport.swift in Sources */,
+				D28C333D2F0F87D60040FE49 /* ToggleSessionIntent.swift in Sources */,
+				D28C333E2F0F87D60040FE49 /* AsyncImageView.swift in Sources */,
+				D28C333F2F0F87D60040FE49 /* CameraImagePicker.swift in Sources */,
+				D28C33402F0F87D60040FE49 /* PhotoOptionSheet.swift in Sources */,
+				D28C33412F0F87D60040FE49 /* ActivityAttributes.swift in Sources */,
+				D28C33422F0F87D60040FE49 /* BackupFormat.swift in Sources */,
+				D28C33432F0F87D60040FE49 /* DataModels.swift in Sources */,
+				D28C33442F0F87D60040FE49 /* DeltaSyncFormat.swift in Sources */,
+				D28C33452F0F87D60040FE49 /* ServerSyncProvider.swift in Sources */,
+				D28C33462F0F87D60040FE49 /* SyncMerger.swift in Sources */,
+				D28C33472F0F87D60040FE49 /* SyncProvider.swift in Sources */,
+				D28C33482F0F87D60040FE49 /* HealthKitService.swift in Sources */,
+				D28C33492F0F87D60040FE49 /* MusicService.swift in Sources */,
+				D28C334A2F0F87D60040FE49 /* SyncService.swift in Sources */,
+				D28C334B2F0F87D60040FE49 /* AppIconHelper.swift in Sources */,
+				D28C334C2F0F87D60040FE49 /* AppLogger.swift in Sources */,
+				D28C334D2F0F87D60040FE49 /* DataStateManager.swift in Sources */,
+				D28C334E2F0F87D60040FE49 /* IconTestView.swift in Sources */,
+				D28C334F2F0F87D60040FE49 /* ImageManager.swift in Sources */,
+				D28C33502F0F87D60040FE49 /* ImageNamingUtils.swift in Sources */,
+				D28C33512F0F87D60040FE49 /* OrientationAwareImage.swift in Sources */,
+				D28C33522F0F87D60040FE49 /* ThemeManager.swift in Sources */,
+				D28C33532F0F87D60040FE49 /* ZipUtils.swift in Sources */,
+				D28C33542F0F87D60040FE49 /* ClimbingDataManager.swift in Sources */,
+				D28C33552F0F87D60040FE49 /* LiveActivityManager.swift in Sources */,
+				D28C33562F0F87D60040FE49 /* AddAttemptView.swift in Sources */,
+				D28C33572F0F87D60040FE49 /* AddEditGymView.swift in Sources */,
+				D28C33582F0F87D60040FE49 /* AddEditProblemView.swift in Sources */,
+				D28C33592F0F87D60040FE49 /* AddEditSessionView.swift in Sources */,
+				D28C335A2F0F87D60040FE49 /* GymDetailView.swift in Sources */,
+				D28C335B2F0F87D60040FE49 /* ProblemDetailView.swift in Sources */,
+				D28C335C2F0F87D60040FE49 /* SessionDetailView.swift in Sources */,
+				D28C335D2F0F87D60040FE49 /* AnalyticsView.swift in Sources */,
+				D28C335E2F0F87D60040FE49 /* CalendarView.swift in Sources */,
+				D28C335F2F0F87D60040FE49 /* GymsView.swift in Sources */,
+				D28C33602F0F87D60040FE49 /* LiveActivityDebugView.swift in Sources */,
+				D28C33612F0F87D60040FE49 /* ProblemsView.swift in Sources */,
+				D28C33622F0F87D60040FE49 /* SessionsView.swift in Sources */,
+				D28C33632F0F87D60040FE49 /* SettingsView.swift in Sources */,
+				D28C33642F0F87D60040FE49 /* AscentlyApp.swift in Sources */,
+				D28C33652F0F87D60040FE49 /* ContentView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -460,7 +741,8 @@
 		D24C19742E75002A0045894C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = Balls;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Icon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -508,7 +790,8 @@
 		D24C19752E75002A0045894C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = Balls;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Icon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
--- a/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate
--- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,38 +0,0 @@
-{
-  "images": [
-    {
-      "filename": "app_icon_1024.png",
-      "idiom": "universal",
-      "platform": "ios",
-      "size": "1024x1024"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "filename": "app_icon_1024_dark.png",
-      "idiom": "universal",
-      "platform": "ios",
-      "size": "1024x1024"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "tinted"
-        }
-      ],
-      "filename": "app_icon_1024_tinted.png",
-      "idiom": "universal",
-      "platform": "ios",
-      "size": "1024x1024"
-    }
-  ],
-  "info": {
-    "author": "xcode",
-    "version": 1
-  }
-}
--- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
+++ b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
--- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_dark.png
+++ b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_dark.png
--- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_tinted.png
+++ b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_1024_tinted.png
--- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_dark_template.svg
+++ b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_dark_template.svg
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="#1A1A1A" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#FFC107"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#F44336"/>
-  </g>
-</svg>
--- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_light_template.svg
+++ b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_light_template.svg
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="#FFFFFF" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#FFC107"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#F44336"/>
-  </g>
-</svg>
--- a/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_tinted_template.svg
+++ b/ios/Ascently/Assets.xcassets/AppIcon.appiconset/app_icon_tinted_template.svg
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
-  <rect width="1024" height="1024" fill="transparent" rx="180" ry="180"/>
-  <g transform="translate(512, 512) scale(4.75) translate(-54, -42.5)">
-    <polygon points="8,75 35,14.25 62,75" fill="#000000" opacity="0.8"/>
-    <polygon points="31.25,75 65,0.75 98.75,75" fill="#000000" opacity="0.9"/>
-  </g>
-</svg>
--- a/ios/Ascently/Balls.icon/Assets/AscentlyBlueBall.png
+++ b/ios/Ascently/Balls.icon/Assets/AscentlyBlueBall.png
--- a/ios/Ascently/Balls.icon/Assets/AscentlyGreenBall.png
+++ b/ios/Ascently/Balls.icon/Assets/AscentlyGreenBall.png
--- a/ios/Ascently/Balls.icon/Assets/AscentlyRedBall.png
+++ b/ios/Ascently/Balls.icon/Assets/AscentlyRedBall.png
--- a/ios/Ascently/Balls.icon/Assets/AscentlyYellowBall.png
+++ b/ios/Ascently/Balls.icon/Assets/AscentlyYellowBall.png
--- a/ios/Ascently/Balls.icon/icon.json
+++ b/ios/Ascently/Balls.icon/icon.json
@@ -0,0 +1,67 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "AscentlyRedBall.png",
+          "name" : "AscentlyRedBall",
+          "position" : {
+            "scale" : 0.4,
+            "translation-in-points" : [
+              90.60312499999992,
+              127.86484375000009
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyYellowBall.png",
+          "name" : "AscentlyYellowBall",
+          "position" : {
+            "scale" : 0.3,
+            "translation-in-points" : [
+              90.50312500000001,
+              -177.66484375
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyBlueBall.png",
+          "name" : "AscentlyBlueBall",
+          "position" : {
+            "scale" : 0.3,
+            "translation-in-points" : [
+              -138.20312500000006,
+              177.3648437500001
+            ]
+          }
+        },
+        {
+          "image-name" : "AscentlyGreenBall.png",
+          "name" : "AscentlyGreenBall",
+          "position" : {
+            "scale" : 0.2,
+            "translation-in-points" : [
+              -138.30312499999997,
+              -43.08515625000001
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}
--- a/ios/Ascently/Icon.icon/Assets/AscetlyTriangle1.png
+++ b/ios/Ascently/Icon.icon/Assets/AscetlyTriangle1.png
--- a/ios/Ascently/Icon.icon/Assets/AscetlyTriangle2.png
+++ b/ios/Ascently/Icon.icon/Assets/AscetlyTriangle2.png
--- a/ios/Ascently/Icon.icon/icon.json
+++ b/ios/Ascently/Icon.icon/icon.json
@@ -0,0 +1,45 @@
+{
+  "fill" : "automatic",
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "image-name" : "AscetlyTriangle2.png",
+          "name" : "AscetlyTriangle2",
+          "position" : {
+            "scale" : 0.75,
+            "translation-in-points" : [
+              108,
+              -53.8125
+            ]
+          }
+        },
+        {
+          "image-name" : "AscetlyTriangle1.png",
+          "name" : "AscetlyTriangle1",
+          "position" : {
+            "scale" : 0.5,
+            "translation-in-points" : [
+              -215,
+              39.9375
+            ]
+          }
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}
--- a/ios/Ascently/Info.plist
+++ b/ios/Ascently/Info.plist
@@ -6,7 +6,6 @@
 	<true/>
 	<key>NSSupportsLiveActivities</key>
 	<true/>
-
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>This app needs access to your photo library to add photos to climbing problems.</string>
 	<key>NSCameraUsageDescription</key>
--- a/ios/Ascently/Utils/IconTestView.swift
+++ b/ios/Ascently/Utils/IconTestView.swift
@@ -321,7 +321,7 @@ import SwiftUI
        private func validateAssetConfiguration() {
            // Check if main bundle contains the expected icon assets
            let expectedAssets = [
-                "AppIcon",
+                "Icon",
                "AppLogo",
            ]

--- a/ios/Ascently/Views/SettingsView.swift
+++ b/ios/Ascently/Views/SettingsView.swift
@@ -84,11 +84,11 @@ extension SheetType: Identifiable {

 struct AppearanceSection: View {
    @EnvironmentObject var themeManager: ThemeManager
-    
+
    let columns = [
        GridItem(.adaptive(minimum: 44))
    ]
-    
+
    var body: some View {
        Section("Appearance") {
            VStack(alignment: .leading, spacing: 12) {
@@ -96,7 +96,7 @@ struct AppearanceSection: View {
                    .font(.caption)
                    .foregroundColor(.secondary)
                    .textCase(.uppercase)
-                
+
                LazyVGrid(columns: columns, spacing: 12) {
                    ForEach(ThemeManager.presetColors, id: \.self) { color in
                        Circle()
@@ -123,7 +123,7 @@ struct AppearanceSection: View {
                }
                .padding(.vertical, 8)
            }
-            
+
            if !isSelected(.blue) {
                Button("Reset to Default") {
                    withAnimation {
@@ -134,17 +134,17 @@ struct AppearanceSection: View {
            }
        }
    }
-    
+
    private func isSelected(_ color: Color) -> Bool {
        // Compare using UIColor to handle different Color initializers
        let selectedUIColor = UIColor(themeManager.accentColor)
        let targetUIColor = UIColor(color)
-        
+
        // Simple equality check might fail for some system colors, so we check components if needed
        // But usually UIColor equality is robust enough for system colors
        return selectedUIColor == targetUIColor
    }
-    
+
    private func colorDescription(for color: Color) -> String {
        switch color {
        case .blue: return "Blue"
@@ -809,12 +809,12 @@ struct SyncSettingsView: View {

                        syncService.serverURL = newURL
                        syncService.authToken = newToken
-                        
+
                        // Ensure provider type is set to server
                        if syncService.providerType != .server {
                            syncService.providerType = .server
                        }
-                        
+
                        dismiss()
                    }
                    .fontWeight(.semibold)
@@ -1116,7 +1116,7 @@ struct HealthKitSection: View {

 struct MusicSection: View {
    @EnvironmentObject var musicService: MusicService
-    
+
    var body: some View {
        Section {
            Toggle(isOn: Binding(
@@ -1129,7 +1129,7 @@ struct MusicSection: View {
                    Text("Apple Music Integration")
                }
            }
-            
+
            if musicService.isMusicEnabled {
                if !musicService.isAuthorized {
                    Button("Connect Apple Music") {
@@ -1140,14 +1140,14 @@ struct MusicSection: View {
                } else {
                    Toggle("Auto-Play on Session Start", isOn: $musicService.isAutoPlayEnabled)
                    Toggle("Stop Music on Session End", isOn: $musicService.isAutoStopEnabled)
-                    
+
                    Picker("Playlist", selection: $musicService.selectedPlaylistId) {
                        Text("None").tag(nil as String?)
                        ForEach(musicService.playlists, id: \.id) { playlist in
                            Text(playlist.name).tag(playlist.id.rawValue as String?)
                        }
                    }
-                    
+
                    if musicService.isAutoPlayEnabled {
                        Text("Music will only auto-play if headphones are connected when you start a session.")
                            .font(.caption)
Author	SHA1	Message	Date
Atridad Lahiji	11850408be	Testing	2026-01-07 23:37:22 -07:00
Atridad Lahiji	37beb4abb6	Re-worked assets	2026-01-07 13:52:01 -07:00