Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Paywalls V2] Implements Variables V2 #2099

Merged
merged 100 commits into from
Feb 5, 2025
Merged

[Paywalls V2] Implements Variables V2 #2099

Changes from 5 commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
a0b0911
Fixes compilation of IconComponentView.
JayShortway Jan 22, 2025
fbb2cb6
ColorInfo.Alias has a ColorAlias value now.
JayShortway Jan 22, 2025
6357b73
Adds ColorStyles and a way to look them up.
JayShortway Jan 22, 2025
c0c801a
Adds UiConfig to StyleFactory and uses it to build StackComponentStyle.
JayShortway Jan 22, 2025
3dd6bf8
Adds PresentedStackPartialTests and a fix to ColorStyle.
JayShortway Jan 22, 2025
9946cc8
Adds ColorStyleTests
JayShortway Jan 22, 2025
ee91fd8
Merge branch 'main' into pw2-colorstyles
JayShortway Jan 22, 2025
d3e81c2
Updates documentation for a function.
JayShortway Jan 23, 2025
b148227
Renames a parameter.
JayShortway Jan 23, 2025
ab6a491
Fixes a compilation error.
JayShortway Jan 23, 2025
044b221
Fixes test compilation.
JayShortway Jan 23, 2025
8aeedbb
Adds ColorStyles to IconComponentStyle.
JayShortway Jan 23, 2025
ba778c0
Adds ColorStyles to IconComponentStyle.Background.
JayShortway Jan 23, 2025
0b36305
Adds PresentedIconPartialTests.
JayShortway Jan 23, 2025
fe11b77
Merge branch 'main' into pw2-colorstyles-icon
JayShortway Jan 23, 2025
f21353d
ImageComponentStyle.overlay is a ColorStyles now.
JayShortway Jan 23, 2025
240f508
Adds PresentedImagePartialTests.
JayShortway Jan 23, 2025
8e814c9
Changes ColorScheme properties to ColorStyles in TextComponentStyle.
JayShortway Jan 23, 2025
a733f8b
Adds more LocalizedTextPartialTests.
JayShortway Jan 23, 2025
89c5286
Introduces BorderStyles and adds it to StackComponentStyle.
JayShortway Jan 24, 2025
0b25b3b
Adds BorderStyles to IconComponentStyle.Background.
JayShortway Jan 24, 2025
7be4c38
Adds BorderStyles to ImageComponentStyle.
JayShortway Jan 24, 2025
7ab352b
Introduces ShadowStyles and adds it to StackComponentStyle.
JayShortway Jan 24, 2025
a508cf5
Adds ShadowStyles to IconComponentStyle.Background.
JayShortway Jan 24, 2025
da30ef7
Adds ShadowStyles to ImageComponentStyle.
JayShortway Jan 24, 2025
56e6b80
Adds BackgroundStyles and uses it for the main paywall.
JayShortway Jan 24, 2025
a7f46a8
Removes a bunch of functions that are not needed anymore.
JayShortway Jan 24, 2025
8b20983
Merge branch 'main' into pw2-colorstyles-icon
JayShortway Jan 24, 2025
27dd90f
Merge branch 'pw2-colorstyles-icon' into pw2-colorstyles-image
JayShortway Jan 24, 2025
199816c
Merge branch 'pw2-colorstyles-image' into pw2-colorstyles-text
JayShortway Jan 24, 2025
5300158
Merge branch 'pw2-colorstyles-text' into pw2-colorstyles-border
JayShortway Jan 24, 2025
967b4f0
Merge branch 'pw2-colorstyles-border' into pw2-colorstyles-shadow
JayShortway Jan 24, 2025
5891761
Merge branch 'pw2-colorstyles-shadow' into pw2-colorstyles-background
JayShortway Jan 24, 2025
e9a081f
Merge branch 'pw2-colorstyles-background' into pw2-color-alias-cleanup
JayShortway Jan 24, 2025
b5d90c1
Adds getResourceIdentifier() to ResourceProvider.
JayShortway Jan 27, 2025
44d9af5
Merge branch 'main' into pw2-colorstyles-background
JayShortway Jan 27, 2025
11eb74a
Re-reverts an unintended change.
JayShortway Jan 27, 2025
3ce1c66
Fixes a test.
JayShortway Jan 27, 2025
ae87952
Merge branch 'main' into pw2-colorstyles-background
JayShortway Jan 27, 2025
0ee2a8c
Merge branch 'pw2-colorstyles-background' into pw2-color-alias-cleanup
JayShortway Jan 27, 2025
24d01d6
Merge branch 'pw2-color-alias-cleanup' into pw2-fonts-uiconfig
JayShortway Jan 27, 2025
70cf708
Adds FontSpec.
JayShortway Jan 27, 2025
2388bd8
Adds fontAliases parameter to StyleFactory.
JayShortway Jan 27, 2025
36c3352
Adds fontAliases parameter to StyleFactory.
JayShortway Jan 27, 2025
926775f
StyleFactory resolves FontSpecs.
JayShortway Jan 27, 2025
841357e
Merge branch 'main' into pw2-fonts-uiconfig
JayShortway Jan 27, 2025
31a43ad
TextComponent.fontName is a FontAlias now.
JayShortway Jan 27, 2025
4ac6a5f
Adds FontSpec to TextComponentStyle and LocalizedTextPartial.
JayShortway Jan 27, 2025
ad309de
Adds more tests to StyleFactoryTests.
JayShortway Jan 27, 2025
fc6cbf3
Deletes SystemFontFamily.
JayShortway Jan 27, 2025
d5791da
Fixes LocalizedTextPartialTests.
JayShortway Jan 27, 2025
6b31f04
Adds some LocalizedTextPartialTests.
JayShortway Jan 27, 2025
79e61f6
Renames FontSpec.Device to FontSpec.System.
JayShortway Jan 27, 2025
5874fc0
Adds some PaywallComponentDataValidationTests.
JayShortway Jan 27, 2025
1868c25
Merge branch 'main' into pw2-fonts-uiconfig
JayShortway Jan 28, 2025
9b7cb53
Fixes FontFamily not getting applied in the Markdown composable.
JayShortway Jan 28, 2025
6dc16a1
Adds custom font paywall to PaywallsTester.
JayShortway Jan 28, 2025
4779152
Removes passing the MockResourceProvider by default. Resolves a TODO.
JayShortway Jan 28, 2025
6c020e6
Adds a Google Font paywall to PaywallsTester.
JayShortway Jan 28, 2025
314b364
Merge branch 'main' into pw2-fonts-uiconfig
JayShortway Jan 28, 2025
1ba3c5b
Fixes compilation after merge.
JayShortway Jan 28, 2025
9a0ce39
Adds localizedPricePerDay() and localizedPricePerYear() to VariableDa…
JayShortway Jan 29, 2025
39566ae
Adds a new PaywallValidationError.
JayShortway Jan 29, 2025
488bf38
Adds StyleFactory and UiConfig convenience constructors for tests.
JayShortway Jan 29, 2025
aa7071d
Adds pricePerPeriod extensions.
JayShortway Jan 29, 2025
b87e977
Uses the new UiConfig and StyleFactory test helpers.
JayShortway Jan 30, 2025
54089c1
Adds ComposeLocale.toJavaLocale().
JayShortway Jan 30, 2025
bb56c91
Adds variableLocalizationKeysForEnUs() to PreviewHelpers.kt.
JayShortway Jan 30, 2025
64dc407
Adds Period.valueInDays.
JayShortway Jan 30, 2025
552c32f
Uses previewTextComponentStyle in more places.
JayShortway Jan 30, 2025
2561714
Adds pricePerDay to StoreProduct.
JayShortway Jan 30, 2025
bf0fe56
TextComponentView processes variables with VariableProcessorV2.
JayShortway Jan 30, 2025
7529ab7
Adds a failing TextComponentViewVariablesTests.
JayShortway Jan 30, 2025
82f08dd
Fixes a few tests.
JayShortway Jan 30, 2025
57f7af0
Fixes another test.
JayShortway Jan 30, 2025
d4059ae
Passes Date around.
JayShortway Jan 30, 2025
d57fe0b
Fixes the final test.
JayShortway Jan 30, 2025
f0dfde4
Adds V2 variables to TextComponentViewTests.
JayShortway Jan 30, 2025
fdf5019
Adds a bunch more test cases.
JayShortway Jan 30, 2025
c722cd4
Adds a bunch more test cases, some failing.
JayShortway Jan 30, 2025
faa6184
Fixes tests.
JayShortway Jan 30, 2025
d42258a
TextComponentView longer processes V1 variables.
JayShortway Jan 30, 2025
6bd4cc9
Some cleanup.
JayShortway Jan 30, 2025
96dbfdd
Adds some tests.
JayShortway Jan 30, 2025
dbb2ac3
Some optimizations.
JayShortway Jan 30, 2025
89dbac0
Some cleanup.
JayShortway Jan 30, 2025
4343164
Merge branch 'main' into pw2-variables-v2
JayShortway Jan 30, 2025
307cbd5
Fixes previews.
JayShortway Jan 30, 2025
aba0a43
Adds StyleFactory and UiConfig convenience constructors for tests.
JayShortway Jan 30, 2025
707955a
Adds variableLocalizations to TextComponentStyle, and uses previewTex…
JayShortway Jan 30, 2025
6b027d5
Adds new price calculations needed for Variables V2.
JayShortway Jan 30, 2025
31ba3f7
Merge branch 'pw2-variables-v2-2' into pw2-variables-v2-3
JayShortway Jan 30, 2025
3c7056f
Attempts to fix broken previews.
JayShortway Jan 31, 2025
e295e57
Merge branch 'main' into pw2-variables-v2-3
JayShortway Jan 31, 2025
8c32df8
Merge branch 'main' into pw2-variables-v2-3
JayShortway Feb 4, 2025
523097d
Merge branch 'main' into pw2-variables-v2-3
JayShortway Feb 4, 2025
8189144
Fixes compilation.
JayShortway Feb 5, 2025
eb7529a
Adds tests for a lifetime product.
JayShortway Feb 5, 2025
f0c0e39
Corrects the lifetime product's description.
JayShortway Feb 5, 2025
6484ed8
Merge branch 'main' into pw2-variables-v2-3
JayShortway Feb 5, 2025
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

These merge commits were added into this branch cleanly.

There are no new changes to show.