Skip to content

Commit

Permalink
Shadow container (#638)
Browse files Browse the repository at this point in the history
Co-authored-by: roubachof <jm.alfonsi@gmail.com>
Co-authored-by: xiaoy312 <xiaoyao312@gmail.com>
Co-authored-by: Jérôme Laban <jlaban@gmail.com>
Co-authored-by: Steve Bilogan <steve.bilogan@gmail.com>
(cherry picked from commit 97bc94f)
  • Loading branch information
eriklimakc authored and pictos committed Aug 17, 2023
1 parent 8b40821 commit afb5add
Show file tree
Hide file tree
Showing 46 changed files with 3,001 additions and 55 deletions.
6 changes: 3 additions & 3 deletions build/workflow/scripts/wasm-uitest-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ fi

cd $BUILD_SOURCESDIRECTORY/build/$SAMPLEAPP_ARTIFACT_NAME

npm i chromedriver@86.0.0
npm i puppeteer@5.3.1
npm i chromedriver@102.0.0
npm i puppeteer@14.1.0

# install dotnet serve / Remove as needed
dotnet tool uninstall dotnet-serve -g || true
Expand All @@ -27,7 +27,7 @@ export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools"
export BASE_ARTIFACTS_PATH=$BUILD_ARTIFACTSTAGINGDIRECTORY/wasm/$XAML_FLAVOR_BUILD/$UITEST_TEST_MODE_NAME
export UNO_UITEST_TARGETURI=http://localhost:5000
export UNO_UITEST_DRIVERPATH_CHROME=$BUILD_SOURCESDIRECTORY/build/$SAMPLEAPP_ARTIFACT_NAME/node_modules/chromedriver/lib/chromedriver
export UNO_UITEST_CHROME_BINARY_PATH=$BUILD_SOURCESDIRECTORY/build/$SAMPLEAPP_ARTIFACT_NAME/node_modules/puppeteer/.local-chromium/linux-800071/chrome-linux/chrome
export UNO_UITEST_CHROME_BINARY_PATH=$BUILD_SOURCESDIRECTORY/build/$SAMPLEAPP_ARTIFACT_NAME/node_modules/puppeteer/.local-chromium/linux-991974/chrome-linux/chrome
export UNO_UITEST_SCREENSHOT_PATH=$BASE_ARTIFACTS_PATH/screenshots
export UNO_UITEST_PLATFORM=Browser
export UNO_UITEST_CHROME_CONTAINER_MODE=true
Expand Down
2 changes: 1 addition & 1 deletion build/workflow/stage-uitests-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
- task: DownloadBuildArtifacts@0
displayName: 'Download UITest Binaries'
inputs:
artifactName: toolkit-uitest-binaries
artifactName: toolkit-uitest-binaries-$(XAML_FLAVOR_BUILD)
downloadPath: '$(build.sourcesdirectory)/build'

- template: templates/dotnet-workload-install-mac.yml
Expand Down
12 changes: 10 additions & 2 deletions build/workflow/stage-uitests-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ jobs:
- job: Toolkit_UITests_Build
displayName: 'Build Toolkit UI Tests'

strategy:
maxParallel: 2
matrix:
UWP:
XAML_FLAVOR_BUILD: UWP
WinUI:
XAML_FLAVOR_BUILD: WinUI

variables:
CI_Build: true

Expand All @@ -18,7 +26,7 @@ jobs:
displayName: 'Build UI Tests'
inputs:
solution: src/Uno.Toolkit.UITest/Uno.Toolkit.UITest.csproj
msbuildArguments: /r /m /p:Configuration=Release /detailedsummary /m /bl:$(build.artifactstagingdirectory)\build.binlog
msbuildArguments: /r /m /p:Configuration=Release /p:FrameworkLineage=$(XAML_FLAVOR_BUILD) /detailedsummary /m /bl:$(build.artifactstagingdirectory)\build.binlog

- task: CopyFiles@2
displayName: 'Publish UITest binaries'
Expand All @@ -34,5 +42,5 @@ jobs:
retryCountOnTaskFailure: 3
inputs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: toolkit-uitest-binaries
ArtifactName: toolkit-uitest-binaries-$(XAML_FLAVOR_BUILD)
ArtifactType: Container
2 changes: 1 addition & 1 deletion build/workflow/stage-uitests-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
- task: DownloadBuildArtifacts@0
displayName: 'Download UITest Binaries'
inputs:
artifactName: toolkit-uitest-binaries
artifactName: toolkit-uitest-binaries-$(XAML_FLAVOR_BUILD)
downloadPath: '$(build.sourcesdirectory)/build'

- template: templates/dotnet-workload-install-mac.yml
Expand Down
2 changes: 1 addition & 1 deletion build/workflow/stage-uitests-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
- task: DownloadBuildArtifacts@0
displayName: 'Download UITest Binaries'
inputs:
artifactName: toolkit-uitest-binaries
artifactName: toolkit-uitest-binaries-$(XAML_FLAVOR_BUILD)
downloadPath: '$(build.sourcesdirectory)/build'

- task: UseDotNet@2
Expand Down
6 changes: 6 additions & 0 deletions build/workflow/templates/dotnet-workload-install-mac.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
parameters:
<<<<<<< HEAD
DotNetVersion: '6.0.401'
UnoCheck_Version: '1.5.4'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json'
=======
DotNetVersion: '7.0.302'
UnoCheck_Version: '1.13.0'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/c3b289d7bb16a2a2df7f7f7f848d76fe1e74036d/manifests/uno.ui.manifest.json'
>>>>>>> 97bc94f (Shadow container (#638))
Dotnet_Root: '/usr/local/share/dotnet/'
Dotnet_Tools: '~/.dotnet/tools'

Expand Down
6 changes: 6 additions & 0 deletions build/workflow/templates/dotnet-workload-install-windows.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
parameters:
<<<<<<< HEAD
DotNetVersion: '6.0.401'
UnoCheck_Version: '1.5.4'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json'
=======
DotNetVersion: '7.0.302'
UnoCheck_Version: '1.13.0'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/c3b289d7bb16a2a2df7f7f7f848d76fe1e74036d/manifests/uno.ui.manifest.json'
>>>>>>> 97bc94f (Shadow container (#638))

steps:

Expand Down
Binary file added doc/assets/shadows-colors.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/assets/shadows-neumorphism.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion doc/controls-styles.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ The `Uno.Toolkit.UI` library adds the following controls:
- [`DrawerControl`](controls/DrawerControl.md): A container to display additional content, in a hidden pane that can be revealed using a swipe gesture, like a drawer.
- [`DrawerFlyoutPresenter`](controls/DrawerFlyoutPresenter.md): A specialized `ContentPresenter` to be used in the template of a `FlyoutPresenter` to enable gesture support.
- [`LoadingView`](controls/LoadingView.md): A control that indicates that the UI is waiting on a task to complete.
- [`TabBar` and `TabBarItem`](controls/TabBarAndTabBarItem.md): A list of selectable items that can be used to facilitate lateral navigation within an application.
- [`NavigationBar`](controls/NavigationBar.md): A custom control that helps implement navigation logic for your application.
- [`ShadowContainer`](controls/ShadowContainer.md): A content control allowing you to add multiple shadows to your content.
- [`TabBar` and `TabBarItem`](controls/TabBarAndTabBarItem.md): A list of selectable items that can be used to facilitate lateral navigation within an application.

## Helpers
The `Uno.Toolkit.UI` library adds the following helper classes:
Expand Down
Loading

0 comments on commit afb5add

Please sign in to comment.