Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,12 @@ jobs:
with:
xcode-version: ${{ env.xcode_version }}

# the framing draws with Pillow, which is the one thing the scripts here
# storeframe frames the captures; it is the one thing the scripts here
# want that is not in the standard library
- uses: actions/setup-python@v7
with:
python-version: "3.13"
- run: python3 -m pip install --quiet Pillow
- run: python3 -m pip install --quiet -r scripts/requirements.txt

# Cache the screenshot build using all source and resource inputs.
- name: reuse the last build
Expand Down
6 changes: 4 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ IPA_DIR = File.expand_path("../build").freeze
# so they do not care which of the two they are called from.
STORE_LISTING = File.expand_path("../scripts/store_listing.py").freeze
STORE_SCREENSHOTS = File.expand_path("../scripts/store_screenshots.py").freeze
FRAME_SCREENSHOTS = File.expand_path("../scripts/frame-screenshots.py").freeze
# The design storeframe frames the captures with (scripts/requirements.txt).
FRAMES_DESIGN = File.expand_path("frames/frames.json").freeze
MAKE_DOCUMENTS = File.expand_path("../scripts/make-screenshot-documents.py").freeze

# Where snapshot writes, and where the framed set goes. Neither is committed:
Expand Down Expand Up @@ -242,7 +243,8 @@ platform :ios do
)

# Frame captures separately so design changes do not require new screenshots.
sh(FRAME_SCREENSHOTS)
sh("python3", "-m", "storeframe", "frame", FRAMES_DESIGN, "--platform", "ios",
"--captured", SCREENSHOT_DIR, "--out", FRAMED_DIR)

# Validate complete sets; the release workflow checks combined device jobs.
narrowed = %w[ODR_SCREENSHOT_LANGUAGES ODR_SCREENSHOT_DEVICE ODR_SCREENSHOT_DEVICES]
Expand Down
Binary file removed fastlane/frames/Nunito[wght].ttf
Binary file not shown.
93 changes: 0 additions & 93 deletions fastlane/frames/OFL.txt

This file was deleted.

5 changes: 3 additions & 2 deletions fastlane/frames/frames.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"_comment": [
"What the App Store pictures show, and what they say in every language.",
"scripts/frame-screenshots.py draws them; see that file for the geometry.",
"storeframe (scripts/requirements.txt) draws them, in its tabs style; see",
"https://github.com/andiwand/storeframe for the geometry.",
"",
"One entry per screen, in the order the store shows them, named as the",
"screenshot test writes them. `headline` is two lines: the first is set",
"light and the second bold, so each language picks its own break rather",
"than inheriting the English one."
],
"font": "Nunito[wght].ttf",
"backgrounds": {
"orange": [
"#f4b663",
Expand Down Expand Up @@ -196,6 +196,7 @@
},
{
"name": "04-edit",
"aliases": ["04-edit-lite"],
"background": "blue",
"chips": [
"odt"
Expand Down
11 changes: 7 additions & 4 deletions fastlane/screenshots/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ are taken during the release run, from the build that goes out.

```sh
bundle exec fastlane ios screenshots # capture, then frame
scripts/frame-screenshots.py # frame again, without a capture
python3 -m storeframe frame fastlane/frames/frames.json --platform ios \
--captured fastlane/screenshots --out fastlane/framed # frame again, without a capture
```

The lane does these steps:
Expand All @@ -17,8 +18,9 @@ The lane does these steps:
2. `fastlane snapshot` builds the `ODR Screenshots` scheme once and launches
the app once per screen and locale, with `-ODRScreenshot <screen>`. See
`OpenDocumentReader/ScreenshotMode.swift`.
3. `scripts/frame-screenshots.py` puts each capture on a device frame with a
headline from `fastlane/frames/frames.json`. It needs Pillow.
3. [storeframe](https://github.com/andiwand/storeframe) puts each capture on a
device frame with a headline from `fastlane/frames/frames.json`. Install it
with `python3 -m pip install -r scripts/requirements.txt`.
4. `scripts/store_screenshots.py` checks the framed set against the sizes the
store accepts.

Expand Down Expand Up @@ -55,4 +57,5 @@ The two apps differ only in the edit. `-ODRScreenshot edit-lite` turns the Pro
tools off in the Pro build, so Lite's edit is taken from the same build.
`scripts/store_screenshots.py --stage DIR --app lite` puts that picture in
place of `04-edit`, and each listing gets its own set. Both edits share the
headline of `04-edit` in `fastlane/frames/frames.json`.
headline of `04-edit` in `fastlane/frames/frames.json` (`04-edit-lite` is an
alias of that screen).
Loading
Loading