Skip to content

Commit

Permalink
Merge pull request #234 from Crequency/dev=main
Browse files Browse the repository at this point in the history
[Pull Request] Mainly updates in `KitX Mobile` and `KitX Website`
  • Loading branch information
Dynesshely authored Mar 5, 2023
2 parents 42c4dc0 + f0e9618 commit 54dc2a9
Show file tree
Hide file tree
Showing 23 changed files with 125 additions and 161 deletions.
54 changes: 15 additions & 39 deletions .github/workflows/build-loaders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,43 @@ name: Build Loaders

on:
push:
branches: [ "main" ]
branches:
- main
paths-ignore:
- ".*/**"
- "**/*.md"
pull_request:
branches: [ "main" ]
branches:
- main
paths-ignore:
- ".*/**"
- "**/*.md"

workflow_dispatch:

jobs:
build-loaders-on-windows:
runs-on: windows-latest

steps:

- uses: actions/checkout@v3
with:
submodules: 'true'
submodules: "true"

- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
dotnet-version: "6.0.x"
include-prerelease: false

- name: Setup Dotnet SDK
run: |
bitsadmin.exe /rawreturn /transfer getfile https://go.microsoft.com/fwlink/?linkid=2088517 C:\sdk.exe
C:\sdk.exe
- name: Build Loaders
working-directory: "KitX Loaders"
run: |
cd "KitX Loaders"
cd "KitX.Loader.Winform.Framework"
dotnet build -c Release
cd ".."
Expand All @@ -48,33 +54,3 @@ jobs:
cd "KitX.Loader.WPF.Core"
dotnet build -c Release
cd ".."
cd ".."
# build-loaders-on-ubuntu:
# runs-on: ubuntu-latest

# steps:

# - uses: actions/checkout@v3

# - name: Setup .NET
# uses: actions/setup-dotnet@v2
# with:
# dotnet-version: '6.0.x'
# include-prerelease: false

# build-loaders-on-macos:
# runs-on: macos-latest

# steps:

# - uses: actions/checkout@v3

# - name: Setup .NET
# uses: actions/setup-dotnet@v2
# with:
# dotnet-version: '6.0.x'
# include-prerelease: false


52 changes: 14 additions & 38 deletions .github/workflows/build-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,33 @@ name: Build Plugins

on:
push:
branches: [ "main" ]
branches:
- main
paths-ignore:
- ".*/**"
- "**/*.md"
pull_request:
branches: [ "main" ]
branches:
- main
paths-ignore:
- ".*/**"
- "**/*.md"

workflow_dispatch:

jobs:
build-plugins-on-windows:
runs-on: windows-latest

steps:

- uses: actions/checkout@v3
with:
submodules: 'true'
submodules: "true"

- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
dotnet-version: "6.0.x"
include-prerelease: false

- name: Setup Dotnet SDK
Expand All @@ -30,39 +37,8 @@ jobs:
C:\sdk.exe
- name: Build Plugins
working-directory: "KitX Plugins"
run: |
cd "KitX Plugins"
cd "TestPlugin.WPF.Core"
dotnet build -c Release
cd ".."
cd ".."
# build-plugins-on-ubuntu:
# runs-on: ubuntu-latest

# steps:

# - uses: actions/checkout@v3

# - name: Setup .NET
# uses: actions/setup-dotnet@v2
# with:
# dotnet-version: '6.0.x'
# include-prerelease: false

# build-plugins-on-macos:
# runs-on: macos-latest

# steps:

# - uses: actions/checkout@v3

# - name: Setup .NET
# uses: actions/setup-dotnet@v2
# with:
# dotnet-version: '6.0.x'
# include-prerelease: false


87 changes: 30 additions & 57 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,164 +2,137 @@ name: Build Universal

on:
push:
branches: [ "main" ]
branches:
- main
paths-ignore:
- ".*/**"
- "**/*.md"
pull_request:
branches: [ "main" ]
branches:
- main
paths-ignore:
- ".*/**"
- "**/*.md"

workflow_dispatch:

jobs:
build-on-windows:
runs-on: windows-latest

steps:

- uses: actions/checkout@v3
with:
submodules: 'true'
submodules: "true"

- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
dotnet-version: "6.0.x"
include-prerelease: false

- name: Build Contracts
working-directory: "KitX Contracts"
run: |
cd "KitX Contracts"
cd "KitX.Contract.CSharp"
dotnet build -c Release
cd ".."
cd ".."
- name: Build Dashboard
working-directory: "KitX Dashboard"
run: |
cd "KitX Dashboard"
dotnet build -c Release
cd ".."
- name: Build Rules
working-directory: "KitX Rules"
run: |
cd "KitX Rules"
cd "KitX.Web.Rules"
dotnet build -c Release
cd ".."
cd ".."
- name: Build File Format Helper
working-directory: "KitX File Format Helper"
run: |
cd "KitX File Format Helper"
cd "KitX.KXP.Helper"
dotnet build -c Release
cd ".."
cd ".."
build-on-ubuntu:
runs-on: ubuntu-latest

steps:

- uses: actions/checkout@v3
with:
submodules: 'true'
submodules: "true"

- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
dotnet-version: "6.0.x"
include-prerelease: false

- name: Build Contracts
working-directory: "KitX Contracts"
run: |
cd "KitX Contracts"
cd "KitX.Contract.CSharp"
dotnet build -c Release
cd ".."
cd ".."
- name: Build Dashboard
working-directory: "KitX Dashboard"
run: |
cd "KitX Dashboard"
dotnet build -c Release
cd ".."
- name: Build Rules
working-directory: "KitX Rules"
run: |
cd "KitX Rules"
cd "KitX.Web.Rules"
dotnet build -c Release
cd ".."
cd ".."
- name: Build File Format Helper
working-directory: "KitX File Format Helper"
run: |
cd "KitX File Format Helper"
cd "KitX.KXP.Helper"
dotnet build -c Release
cd ".."
cd ".."
build-on-macos:
runs-on: macos-latest

steps:

- uses: actions/checkout@v3
with:
submodules: 'true'
submodules: "true"

- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'
dotnet-version: "6.0.x"
include-prerelease: false

- name: Build Contracts
working-directory: "KitX Contracts"
run: |
cd "KitX Contracts"
cd "KitX.Contract.CSharp"
dotnet build -c Release
cd ".."
cd ".."
- name: Build Dashboard
working-directory: "KitX Dashboard"
run: |
cd "KitX Dashboard"
dotnet build -c Release
cd ".."
- name: Build Rules
working-directory: "KitX Rules"
run: |
cd "KitX Rules"
cd "KitX.Web.Rules"
dotnet build -c Release
cd ".."
cd ".."
- name: Build File Format Helper
working-directory: "KitX File Format Helper"
run: |
cd "KitX File Format Helper"
cd "KitX.KXP.Helper"
dotnet build -c Release
cd ".."
cd ".."
2 changes: 1 addition & 1 deletion KitX Contracts
2 changes: 1 addition & 1 deletion KitX Dashboard Helper
2 changes: 1 addition & 1 deletion KitX Docs
Submodule KitX Docs updated 86 files
+1 −2 .github/workflows/deploy-docs.yml
+0 −0 .gitignore
+0 −0 LICENSE
+0 −0 build.sh
+0 −1 default/README.md
+0 −0 dev.sh
+1 −1 docs/.vuepress/config.ts
+0 −0 docs/.vuepress/configs/index.ts
+0 −0 docs/.vuepress/configs/navbar/en.ts
+0 −0 docs/.vuepress/configs/navbar/index.ts
+0 −0 docs/.vuepress/configs/navbar/zh.ts
+0 −0 docs/.vuepress/configs/sidebar/en.ts
+0 −0 docs/.vuepress/configs/sidebar/index.ts
+0 −0 docs/.vuepress/configs/sidebar/zh.ts
+0 −0 docs/.vuepress/styles/index.scss
+0 −0 docs/README.md
+0 −0 docs/contributing.md
+0 −0 docs/en/README.md
+0 −0 docs/en/contributing.md
+0 −0 docs/en/guide/README.md
+0 −0 docs/en/guide/getting-started.md
+0 −0 docs/en/guide/network-connection.md
+0 −0 docs/en/guide/order.md
+0 −0 docs/en/guide/package-plugin.md
+0 −0 docs/en/mobile/README.md
+0 −0 docs/en/mobile/guide/README.md
+0 −0 docs/en/mobile/guide/getting-started.md
+0 −0 docs/en/reference/error-codes.md
+0 −0 docs/en/reference/file-formats/README.md
+0 −0 docs/en/reference/file-formats/kxp.md
+0 −0 docs/guide/README.md
+0 −0 docs/guide/getting-started.md
+0 −0 docs/guide/network-connection.md
+0 −0 docs/guide/order.md
+0 −0 docs/guide/package-plugin.md
+0 −0 docs/mobile/README.md
+0 −0 docs/mobile/guide/README.md
+0 −0 docs/mobile/guide/getting-started.md
+0 −0 docs/mobile/guide/packages.md
+0 −0 docs/reference/error-codes.md
+0 −0 docs/reference/file-formats/README.md
+0 −0 docs/reference/file-formats/kxp.md
+0 −47 hope/.github/workflows/deploy-docs.yml
+0 −5 hope/.gitignore
+0 −23 hope/docs/.vuepress/config.ts
+0 −30 hope/docs/.vuepress/navbar/en.ts
+0 −2 hope/docs/.vuepress/navbar/index.ts
+0 −30 hope/docs/.vuepress/navbar/zh.ts
+ hope/docs/.vuepress/public/favicon.ico
+ hope/docs/.vuepress/public/logo.png
+0 −1 hope/docs/.vuepress/public/logo.svg
+0 −21 hope/docs/.vuepress/sidebar/en.ts
+0 −2 hope/docs/.vuepress/sidebar/index.ts
+0 −21 hope/docs/.vuepress/sidebar/zh.ts
+0 −3 hope/docs/.vuepress/styles/config.scss
+0 −1 hope/docs/.vuepress/styles/index.scss
+0 −2 hope/docs/.vuepress/styles/palette.scss
+0 −194 hope/docs/.vuepress/theme.ts
+0 −27 hope/docs/README.md
+0 −17 hope/docs/demo/README.md
+0 −42 hope/docs/demo/disable.md
+0 −15 hope/docs/demo/encrypt.md
+0 −408 hope/docs/demo/markdown.md
+0 −72 hope/docs/demo/page.md
+0 −16 hope/docs/guide/README.md
+0 −13 hope/docs/guide/bar/README.md
+0 −6 hope/docs/guide/bar/baz.md
+0 −13 hope/docs/guide/foo/README.md
+0 −6 hope/docs/guide/foo/ray.md
+0 −433 hope/docs/slides.md
+0 −27 hope/docs/zh/README.md
+0 −17 hope/docs/zh/demo/README.md
+0 −42 hope/docs/zh/demo/disable.md
+0 −15 hope/docs/zh/demo/encrypt.md
+0 −388 hope/docs/zh/demo/markdown.md
+0 −72 hope/docs/zh/demo/page.md
+0 −16 hope/docs/zh/guide/README.md
+0 −13 hope/docs/zh/guide/bar/README.md
+0 −6 hope/docs/zh/guide/bar/baz.md
+0 −13 hope/docs/zh/guide/foo/README.md
+0 −6 hope/docs/zh/guide/foo/ray.md
+0 −429 hope/docs/zh/slides.md
+0 −18 hope/package.json
+0 −5,864 hope/pnpm-lock.yaml
+0 −0 package.json
+0 −0 yarn.lock
2 changes: 1 addition & 1 deletion KitX File Format Helper
2 changes: 1 addition & 1 deletion KitX Loaders
2 changes: 1 addition & 1 deletion KitX Mobile
Submodule KitX Mobile updated 59 files
+72 −24 .github/workflows/build_apk.yml
+15 −10 README.md
+0 −0 code.style.md
+4 −0 kitx_mobile/.gitignore
+2 −2 kitx_mobile/analysis_options.yaml
+2 −2 kitx_mobile/android/app/build.gradle
+38 −18 kitx_mobile/android/app/src/main/AndroidManifest.xml
+ kitx_mobile/assets/KitX-Icon-1920x-margin-2x.png
+51 −0 kitx_mobile/build.py
+1 −1 kitx_mobile/lib/converters/os_type_2_icon.dart
+63 −0 kitx_mobile/lib/converters/os_type_2_int.dart
+33 −0 kitx_mobile/lib/converters/size_converter.dart
+27 −0 kitx_mobile/lib/converters/theme_mode_2_int.dart
+52 −0 kitx_mobile/lib/data/third_party_licenses_provider.dart
+48 −38 kitx_mobile/lib/main.dart
+23 −13 kitx_mobile/lib/models/command.dart
+152 −152 kitx_mobile/lib/models/command.g.dart
+31 −22 kitx_mobile/lib/models/device_info.dart
+158 −158 kitx_mobile/lib/models/device_info.g.dart
+12 −12 kitx_mobile/lib/models/device_locator.dart
+53 −53 kitx_mobile/lib/models/device_locator.g.dart
+1 −2 kitx_mobile/lib/models/enums/command_type.dart
+2 −4 kitx_mobile/lib/models/enums/device_os_type.dart
+16 −15 kitx_mobile/lib/models/function.dart
+77 −77 kitx_mobile/lib/models/function.g.dart
+15 −0 kitx_mobile/lib/models/third_party_data.dart
+423 −9 kitx_mobile/lib/pages/about_page.dart
+13 −12 kitx_mobile/lib/pages/account_page.dart
+1 −1 kitx_mobile/lib/pages/controls/devices_status.dart
+83 −0 kitx_mobile/lib/pages/controls/drawer.dart
+137 −96 kitx_mobile/lib/pages/device_page.dart
+0 −24 kitx_mobile/lib/pages/get_pages.dart
+76 −79 kitx_mobile/lib/pages/home_page.dart
+36 −0 kitx_mobile/lib/pages/routes.dart
+210 −10 kitx_mobile/lib/pages/settings_page.dart
+44 −36 kitx_mobile/lib/pages/test_page.dart
+94 −215 kitx_mobile/lib/pages/test_pages/device_info_test.dart
+9 −6 kitx_mobile/lib/pages/test_pages/device_sensors.dart
+38 −144 kitx_mobile/lib/pages/test_pages/network_info_test.dart
+5 −6 kitx_mobile/lib/pages/test_pages/sensors_display_stands/acceleration_display_stand.dart
+26 −54 kitx_mobile/lib/pages/test_pages/sensors_display_stands/device_rotation_display_stand.dart
+50 −44 kitx_mobile/lib/pages/test_pages/sensors_display_stands/gyroscope_display_stand.dart
+31 −36 kitx_mobile/lib/pages/test_pages/sensors_display_stands/vibration_display_stand.dart
+32 −26 kitx_mobile/lib/services/devices.dart
+0 −35 kitx_mobile/lib/services/sms_server.dart
+170 −123 kitx_mobile/lib/services/web_service.dart
+6 −4 kitx_mobile/lib/themes/dark_theme.dart
+6 −4 kitx_mobile/lib/themes/light_theme.dart
+3 −4 kitx_mobile/lib/utils/acceleration_emulator.dart
+46 −34 kitx_mobile/lib/utils/config.dart
+24 −26 kitx_mobile/lib/utils/datetime_format.dart
+66 −6 kitx_mobile/lib/utils/global.dart
+1 −1 kitx_mobile/lib/utils/intent.dart
+25 −0 kitx_mobile/lib/utils/log.dart
+0 −15 kitx_mobile/lib/utils/log/init.dart
+19 −24 kitx_mobile/lib/utils/rotation_emulator.dart
+68 −27 kitx_mobile/lib/utils/translation.dart
+16 −25 kitx_mobile/pubspec.yaml
+1 −1 kitx_mobile/test/widget_test.dart
2 changes: 1 addition & 1 deletion KitX Rules
2 changes: 1 addition & 1 deletion KitX Script
2 changes: 1 addition & 1 deletion KitX Test
Loading

0 comments on commit 54dc2a9

Please sign in to comment.