Repository navigation
fix(today): explain Start session availability in customization - #2672
Merged
Merged
Conversation
6 tasks done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rebase of #2654 by @kavemang onto current main. The original description there remains the authoritative account.
Rebase-merge rather than squash, so @kavemang stays the author.
What the rebase changed
Two things, both mechanical.
The docs commit
13cdde663is dropped, because it is already on main asf8594b894from #2653. #2654 was stacked on that same commit, so only its own change replays here: 12 files, +31/-3, where the original listed 15 files including the three guidance files.Strand/Resources/Localizable.xcstringsconflicted. Both sides PREPEND one new key to"strings": {: main carries"Skips sessions that overlap a saved or imported workout..."from #2658, and this change adds"Requires Live Sessions to be enabled in Settings.". The catalogue is not alphabetically ordered, so the correct resolution is to keep both, which is what I did. Verified on the result rather than on the method: the file parses, holds 4171 keys (4170 + 1), carries BOTH keys, and has no duplicate key under anobject_pairs_hookcheck, which a plain parse would hide by keeping only the last of a duplicated pair.Verified before merge
today_customize_live_session_availabilityis present in the default locale and in all eight translations, and no locale carries a key the default lacks. That last one is the ExtraTranslation class that passes compile and the i18n gate and only fails release lint.Tools/i18n_audit.py --ci: no new English-only translations, no new non-focus-locale gaps.Tools/doc_comment_lint.py: OK, no new detached doc comments.Toolsunittest suite: OK../gradlew compileFullDebugKotlin --no-build-cache: clean. Worth running becauseTodayScreen.kttakes +22/-3 here, more than the one-line string additions elsewhere.TodayCustomizationSheet.swifttakes +2, and app-target Swift needs Xcode on macOS, so thebuild (Strand, macOS)andbuild (NOOPiOS)legs on this PR are the first execution of it.Refs #2654, #2653, #2658