ui: new UX for making connections after / as part of onboarding (#6753)

* ui: additional images, views for making connections and creating groups (#6750) * ios: setup for additional assets * ios build config * header * fix * update layout * more views with images * layout * layout * android images and view * fix path * fix desktop * fix desktop build * smaller image * layout * more layout * more kotlin views * group layout * padding * create group layout * more create group layout * layout * tweak layout * more tweak * config --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * ios: connecting as part of onboarding (#6754) * ios: implementation of "connecting" cards * ios: revision * fix flip * fixes * fix frame * replace nav stack with tab view * rename * update gradient and card label material * fix gradient * debug * remove debug code * update card labels * card label layout * landscape cards * layout * safe area * less bold * debug landscape * refactor titles, back inline with title in landscape * remove ignoreSafeArea * remove extra padding * refactor * clean * layout spec added to plan --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * android, desktop: connecting during onboarding - new cards (#6757) * android, desktop: connecting during onboarding - new cards * fix * change layout * fixes * fix * fix * layout * fix layout * animation * import * paddings * 350ms * font * fonts * layout * box * more layout * layout * simpler * hide toolbar heading in onboarding mode * simpler desktop layout * better desktop * revert desktop toolbar * bigger font, landscape * fix desktop * cap width * refactor, simplify * qr code scanner icon * use icon without assets * cleaner * fix * fix --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * android, desktop: connect banner after onboarding (#6761) * android, desktop: connect banner after onboarding * improve * smaller button * bigger icon, same string * fallback gradients * improve build * simpler connect screens during onboarding * left-align * update strings * improve state machine * text, padding * strings * primary color for tap to paste link * fix race condition * fix loading race --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * ios: banner and connect screens (#6767) * ios: banner and connect screens * fix * return nav * remove padding * refactor * refactor * refactor 2 * refactor 3 * refactor 4 * header * xcode files * improve * fix toolbar * toolbar 2 * no assets * no assets 2 * padding * android padding * simplify * layout * fix --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> * fix refreshable * text * fix toolbar color * rework address share logic * padding --------- Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com> Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
2026-04-25 20:42:13 +00:00 · 2026-04-21 17:41:52 +01:00
parent 6f86c5af2e
commit 035a2f954c
62 changed files with 2858 additions and 407 deletions
--- a/scripts/android/copy-assets.sh
+++ b/scripts/android/copy-assets.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -eu
+
+# Copies generated multiplatform assets into the SimpleX assets directory.
+# Called by Gradle build when simplex.assets.dir property is set.
+#
+# Usage: copy-assets.sh <source-dir> <dest-dir>
+
+SRC_DIR="$1/multiplatform/resources/MR/images"
+DEST_DIR="$2/MR/images"
+
+if [ ! -d "$SRC_DIR" ]; then
+  echo "Error: source assets not found: $SRC_DIR (run resize.sh first)" >&2
+  exit 1
+fi
+
+rm -rf "$DEST_DIR"
+mkdir -p "$DEST_DIR"
+
+cp "$SRC_DIR"/* "$DEST_DIR/"
+echo "Copied multiplatform assets to $DEST_DIR"
--- a/scripts/ios/copy-assets.sh
+++ b/scripts/ios/copy-assets.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+set -eu
+
+# Copies generated iOS assets into SimpleXAssets.xcassets.
+# Intended to run as an Xcode Run Script build phase.
+# Skips silently if SIMPLEX_ASSETS is not in SWIFT_ACTIVE_COMPILATION_CONDITIONS
+# or if the source directory is not found.
+#
+# The source path is resolved in order:
+#   1. Command-line argument
+#   2. SIMPLEX_ASSETS_DIR build setting (set in Local.xcconfig)
+#   3. No default — skips if neither is set
+#
+# Manual usage: ./scripts/copy-assets.sh path/to/assets
+
+# Skip if SIMPLEX_ASSETS flag is not set (unless run manually outside Xcode)
+if [ -n "${SWIFT_ACTIVE_COMPILATION_CONDITIONS:-}" ]; then
+  case " $SWIFT_ACTIVE_COMPILATION_CONDITIONS " in
+    *" SIMPLEX_ASSETS "*) ;;
+    *) exit 0 ;;
+  esac
+fi
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+IOS_DIR="$SCRIPT_DIR/../../apps/ios/Shared/SimpleXAssets.xcassets"
+
+ASSETS_ROOT="${1:-${SIMPLEX_ASSETS_DIR:-}}"
+if [ -z "$ASSETS_ROOT" ]; then
+  echo "warning: SIMPLEX_ASSETS_DIR not set and no path argument provided" >&2
+  exit 0
+fi
+
+SRC_DIR="$ASSETS_ROOT/ios/Assets.xcassets"
+
+if [ ! -d "$SRC_DIR" ]; then
+  echo "warning: source assets not found: $SRC_DIR (run resize.sh first)" >&2
+  exit 0
+fi
+
+# Remove old imagesets but keep root Contents.json
+find "$IOS_DIR" -name "*.imageset" -type d -exec rm -rf {} + 2>/dev/null || true
+
+# Copy imagesets
+for imageset in "$SRC_DIR"/*.imageset; do
+  [ -d "$imageset" ] || continue
+  cp -r "$imageset" "$IOS_DIR/"
+  echo "Copied $(basename "$imageset")"
+done
+
+echo "Done. Assets copied to $IOS_DIR"