Skip to content

Commit

Permalink
Merge pull request #283 from Crequency/dev=main
Browse files Browse the repository at this point in the history
[Pull Request] Daily merge
  • Loading branch information
Dynesshely authored Mar 26, 2024
2 parents b5b071c + a0f7b80 commit 8fd1617
Show file tree
Hide file tree
Showing 23 changed files with 116 additions and 217 deletions.
56 changes: 56 additions & 0 deletions .cheese/references.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
[
{
"Name": "Common.Activity",
"Location": "Reference/Common.Activity",
"Url": "git@github.com:Crequency/Common.Activity.git",
"Branch": "dev=main",
"RemoteBranch": "origin/dev=main",
"Type": 1,
"InSubmodule": false
},
{
"Name": "Common.Algorithm",
"Location": "Reference/Common.Algorithm",
"Url": "git@github.com:Crequency/Common.Algorithm.git",
"Branch": "dev=main",
"RemoteBranch": "origin/dev=main",
"Type": 1,
"InSubmodule": false
},
{
"Name": "Common.BasicHelper",
"Location": "Reference/Common.BasicHelper",
"Url": "git@github.com:Crequency/Common.BasicHelper.git",
"Branch": "dev=main",
"RemoteBranch": "origin/dev=main",
"Type": 1,
"InSubmodule": false
},
{
"Name": "Common.Update",
"Location": "Reference/Common.Update",
"Url": "git@github.com:Crequency/Common.Update.git",
"Branch": "dev=main",
"RemoteBranch": "origin/dev=main",
"Type": 1,
"InSubmodule": false
},
{
"Name": "Csharpell",
"Location": "Reference/Csharpell",
"Url": "git@github.com:Dynesshely/Csharpell.git",
"Branch": "dev=main",
"RemoteBranch": "origin/dev=main",
"Type": 1,
"InSubmodule": false
},
{
"Name": "XamlMultiLanguageEditor",
"Location": "KitX SDK/Reference/XamlMultiLanguageEditor",
"Url": "git@github.com:Dynesshely/XamlMultiLanguageEditor.git",
"Branch": "dev=main",
"RemoteBranch": "origin/dev=main",
"Type": 1,
"InSubmodule": true
}
]
5 changes: 5 additions & 0 deletions .github/workflows/build-loaders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ jobs:
dotnet-version: |
8.0.x
- name: Initialize References
run: |
dotnet tool install --global Cheese
cheese reference --setup --convert-ssl-link-to-https-link
- name: Build Loaders
working-directory: "KitX SDK/KitX Loaders"
run: |
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/build-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ jobs:
dotnet-version: |
8.0.x
- name: Initialize References
run: |
dotnet tool install --global Cheese
cheese reference --setup --convert-ssl-link-to-https-link
- name: Build Plugins
working-directory: "KitX SDK/KitX Plugins"
run: |
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ jobs:
dotnet-version: |
8.0.x
- name: Initialize References
run: |
dotnet tool install --global Cheese
cheese reference --setup --convert-ssl-link-to-https-link
- name: Build Contracts
working-directory: "KitX Standard/KitX Contracts"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-auto-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
run: |
pull_request_number=${{ github.event.pull_request.number }}
current_title="${{ github.event.pull_request.title }}"
updated_title=$(python3 "./ToolKits/Actions/pr_format.py" "$current_title")
updated_title=$(python3 "./.github/scripts/pr_format.py" "$current_title")
curl -X PATCH \
-H "Authorization: Bearer ${{ secrets.GITHUBTOKEN }}" \
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ jobs:
dotnet-version: |
8.0.x
- name: Initialize References
run: |
dotnet tool install --global Cheese
cheese reference --setup --convert-ssl-link-to-https-link
- name: Add to GitHub Repo
run: |
nuget sources add -name github -Source https://nuget.pkg.github.com/Crequency/index.json -Username Crequency -Password ${{ secrets.GitHubToken }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
KitX\ Build/
KitX\ Publish/

## Ignore for refernces
Reference/

## Ignore for IDE settings
.idea/
.vscode/
Expand Down
15 changes: 0 additions & 15 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,6 @@
[submodule "KitX SDK"]
path = KitX SDK
url = git@github.com:Crequency/KitX-SDK.git
[submodule "Reference/Common.BasicHelper"]
path = Reference/Common.BasicHelper
url = git@github.com:Crequency/Common.BasicHelper.git
[submodule "Reference/Common.Activity"]
path = Reference/Common.Activity
url = git@github.com:Crequency/Common.Activity.git
[submodule "Reference/Common.Update"]
path = Reference/Common.Update
url = git@github.com:Crequency/Common.Update.git
[submodule "Reference/Common.Algorithm"]
path = Reference/Common.Algorithm
url = git@github.com:Crequency/Common.Algorithm.git
[submodule "KitX Standard"]
path = KitX Standard
url = git@github.com:Crequency/KitX-Standard.git
[submodule "Reference/CSharpell"]
path = Reference/CSharpell
url = git@github.com:Dynesshely/CSharpell.git
2 changes: 1 addition & 1 deletion KitX Clients/KitX Dashboard
Submodule KitX Dashboard updated 97 files
+110 −110 .github/workflows/auto-build.yml
+7 −0 KitX Dashboard/App.axaml
+5 −5 KitX Dashboard/App.axaml.cs
+42 −11 KitX Dashboard/AppFramework.cs
+2 −2 KitX Dashboard/Configuration/AppConfig.cs
+3 −2 KitX Dashboard/Configuration/ConfigBase.cs
+8 −0 KitX Dashboard/Configuration/ConfigFetcher.cs
+0 −1 KitX Dashboard/Configuration/MarketConfig.cs
+2 −2 KitX Dashboard/Configuration/PluginsConfig.cs
+9 −0 KitX Dashboard/Configuration/SecurityConfig.cs
+10 −2 KitX Dashboard/ConstantTable.cs
+3 −3 KitX Dashboard/Converters/ActivityStatusConverters.cs
+4 −4 KitX Dashboard/Converters/AvaloniaEditDocumentConverters.cs
+4 −4 KitX Dashboard/Converters/Base64Converters.cs
+29 −0 KitX Dashboard/Converters/ComparisonConverters.cs
+3 −3 KitX Dashboard/Converters/DeviceInfoConverters.cs
+31 −0 KitX Dashboard/Converters/EnumerableConverters.cs
+3 −3 KitX Dashboard/Converters/OperatingSystemUtils.cs
+3 −3 KitX Dashboard/Converters/PluginInfoConverters.cs
+2 −2 KitX Dashboard/Converters/Selection2VisibleConverter.cs
+2 −2 KitX Dashboard/Converters/StringOverLengthConverter.cs
+1 −2 KitX Dashboard/Converters/WindowAttributesConverter.cs
+2 −0 KitX Dashboard/ExitCodes.cs
+2 −2 KitX Dashboard/Generators/GreetingTextGenerator.cs
+10 −2 KitX Dashboard/Instances.cs
+5 −2 KitX Dashboard/KitX.Dashboard.csproj
+196 −181 KitX Dashboard/Languages/en-us.axaml
+196 −181 KitX Dashboard/Languages/fr-fr.axaml
+196 −181 KitX Dashboard/Languages/ja-jp.axaml
+196 −181 KitX Dashboard/Languages/ko-kr.axaml
+196 −181 KitX Dashboard/Languages/ru-ru.axaml
+196 −181 KitX Dashboard/Languages/zh-cn.axaml
+196 −181 KitX Dashboard/Languages/zh-tw.axaml
+5 −5 KitX Dashboard/Managers/ActivityManager.cs
+3 −3 KitX Dashboard/Managers/AnouncementManager.cs
+7 −4 KitX Dashboard/Managers/ConfigManager.cs
+8 −5 KitX Dashboard/Managers/FileWatcherManager.cs
+4 −4 KitX Dashboard/Managers/KeyHookManager.cs
+7 −0 KitX Dashboard/Managers/ManagerBase.cs
+6 −6 KitX Dashboard/Managers/PluginsManager.cs
+263 −0 KitX Dashboard/Managers/SecurityManager.cs
+4 −4 KitX Dashboard/Managers/StatisticsManager.cs
+2 −2 KitX Dashboard/Managers/TasksManager.cs
+4 −4 KitX Dashboard/Managers/WebManager.cs
+275 −4 KitX Dashboard/Models/DeviceCase.cs
+3 −3 KitX Dashboard/Models/PluginInstallation.cs
+11 −13 KitX Dashboard/Network/DevicesNetwork/DevicesDiscoveryServer.cs
+37 −23 KitX Dashboard/Network/DevicesNetwork/DevicesOrganizer.cs
+35 −6 KitX Dashboard/Network/DevicesNetwork/DevicesServer.cs
+0 −22 KitX Dashboard/Network/DevicesNetwork/DevicesServerControllers/DeviceController.cs
+200 −0 KitX Dashboard/Network/DevicesNetwork/DevicesServerControllers/V1/DeviceController.cs
+123 −0 KitX Dashboard/Network/DevicesNetwork/DevicesServerControllers/V1/PluginController.cs
+11 −10 KitX Dashboard/Network/NetworkHelper.cs
+6 −4 KitX Dashboard/Network/PluginsNetwork/PluginConnector.cs
+23 −6 KitX Dashboard/Network/PluginsNetwork/PluginsServer.cs
+3 −3 KitX Dashboard/Program.cs
+7 −7 KitX Dashboard/Services/DebugService.cs
+12 −2 KitX Dashboard/Services/EventService.cs
+2 −2 KitX Dashboard/Styles/FontsStyles.axaml
+2 −2 KitX Dashboard/ViewLocator.cs
+4 −4 KitX Dashboard/ViewModels/AnouncementsWindowViewModel.cs
+34 −16 KitX Dashboard/ViewModels/AppViewModel.cs
+5 −5 KitX Dashboard/ViewModels/DebugWindowViewModel.cs
+148 −0 KitX Dashboard/ViewModels/ExchangeDeviceKeyWindowViewModel.cs
+2 −2 KitX Dashboard/ViewModels/MainWindowViewModel.cs
+2 −2 KitX Dashboard/ViewModels/Pages/Controls/Home_ActivityLogViewModel.cs
+3 −3 KitX Dashboard/ViewModels/Pages/Controls/Home_CountViewModel.cs
+2 −2 KitX Dashboard/ViewModels/Pages/Controls/Home_RecentUseViewModel.cs
+7 −7 KitX Dashboard/ViewModels/Pages/Controls/PluginBarViewModel.cs
+4 −4 KitX Dashboard/ViewModels/Pages/Controls/Settings_AboutViewModel.cs
+4 −4 KitX Dashboard/ViewModels/Pages/Controls/Settings_GeneralViewModel.cs
+8 −8 KitX Dashboard/ViewModels/Pages/Controls/Settings_PerformenceViewModel.cs
+6 −6 KitX Dashboard/ViewModels/Pages/Controls/Settings_PersonaliseViewModel.cs
+11 −11 KitX Dashboard/ViewModels/Pages/Controls/Settings_UpdateViewModel.cs
+4 −4 KitX Dashboard/ViewModels/Pages/DevicePageViewModel.cs
+2 −2 KitX Dashboard/ViewModels/Pages/HomePageViewModel.cs
+3 −3 KitX Dashboard/ViewModels/Pages/LibPageViewModel.cs
+8 −8 KitX Dashboard/ViewModels/Pages/RepoPageViewModel.cs
+2 −2 KitX Dashboard/ViewModels/Pages/SettingsPageViewModel.cs
+4 −4 KitX Dashboard/ViewModels/PluginDetailWindowViewModel.cs
+6 −6 KitX Dashboard/ViewModels/PluginsLaunchWindowViewModel.cs
+3 −3 KitX Dashboard/Views/AnouncementsWindow.axaml.cs
+1 −1 KitX Dashboard/Views/DebugWindow.axaml
+185 −0 KitX Dashboard/Views/ExchangeDeviceKeyWindow.axaml
+231 −0 KitX Dashboard/Views/ExchangeDeviceKeyWindow.axaml.cs
+3 −4 KitX Dashboard/Views/MainWindow.axaml.cs
+5 −5 KitX Dashboard/Views/Pages/Controls/AppLogo.axaml.cs
+2 −2 KitX Dashboard/Views/Pages/Controls/PluginBar.axaml.cs
+8 −16 KitX Dashboard/Views/Pages/Controls/Settings_About.axaml
+0 −2 KitX Dashboard/Views/Pages/Controls/Settings_About.axaml.cs
+148 −69 KitX Dashboard/Views/Pages/DevicePage.axaml
+2 −2 KitX Dashboard/Views/Pages/HomePage.axaml.cs
+4 −4 KitX Dashboard/Views/Pages/RepoPage.axaml.cs
+2 −3 KitX Dashboard/Views/Pages/SettingsPage.axaml.cs
+2 −2 KitX Dashboard/Views/PluginDetailWindow.axaml.cs
+2 −2 KitX Dashboard/Views/PluginsLaunchWindow.axaml.cs
+11 −5 KitX Dashboard/Views/ViewInstances.cs
2 changes: 1 addition & 1 deletion KitX Clients/KitX Installer
2 changes: 1 addition & 1 deletion KitX Clients/KitX Mobile
Submodule KitX Mobile updated 88 files
+1 −0 .flutter
+64 −0 .github/scripts/set-sign-info.ps1
+32 −43 .github/workflows/build_apk.yml
+5 −1 .gitignore
+3 −0 .gitmodules
+18 −9 KitX Mobile.code-workspace
+4 −0 README.md
+2 −1 kitx_mobile/.gitignore
+35 −4 kitx_mobile/android/app/build.gradle
+13 −1 kitx_mobile/android/app/src/main/AndroidManifest.xml
+0 −16 kitx_mobile/android/build.gradle
+1 −1 kitx_mobile/android/gradle/wrapper/gradle-wrapper.properties
+1 −4 kitx_mobile/android/settings.gradle
+87 −86 kitx_mobile/dependencies-analyzer.py
+10 −2 kitx_mobile/lib/data/app_info.dart
+2 −2 kitx_mobile/lib/data/local_network_info.dart
+153 −146 kitx_mobile/lib/data/third_party_licenses_provider.dart
+37 −32 kitx_mobile/lib/pages/about_page.dart
+1 −1 kitx_mobile/lib/pages/account_page.dart
+16 −6 kitx_mobile/lib/pages/controls/device_card.dart
+59 −23 kitx_mobile/lib/pages/controls/home_page_drawer.dart
+7 −2 kitx_mobile/lib/pages/controls/repo_button.dart
+4 −2 kitx_mobile/lib/pages/devices_page.dart
+9 −9 kitx_mobile/lib/pages/home_page.dart
+2 −0 kitx_mobile/lib/pages/pages.dart
+92 −0 kitx_mobile/lib/pages/plugins_page.dart
+33 −1 kitx_mobile/lib/pages/settings_page.dart
+8 −4 kitx_mobile/lib/pages/test_page.dart
+1 −1 kitx_mobile/lib/pages/test_pages/device_info_test.dart
+22 −24 kitx_mobile/lib/pages/test_pages/network_info_test.dart
+11 −12 kitx_mobile/lib/pages/test_pages/sensors_display_stands/acceleration_display_stand.dart
+0 −166 kitx_mobile/lib/pages/test_pages/sensors_display_stands/device_rotation_display_stand.dart
+163 −56 kitx_mobile/lib/pages/test_pages/sensors_display_stands/gyroscope_display_stand.dart
+24 −14 kitx_mobile/lib/pages/test_pages/sensors_display_stands/vibration_display_stand.dart
+6 −1 kitx_mobile/lib/services/devices_discovery_service.dart
+9 −5 kitx_mobile/lib/services/devices_service.dart
+23 −25 kitx_mobile/lib/utils/converters/size_converter.dart
+0 −31 kitx_mobile/lib/utils/emulators/acceleration_emulator.dart
+100 −45 kitx_mobile/lib/utils/emulators/rotation_emulator.dart
+2 −1 kitx_mobile/lib/utils/handlers/permissions_handlers.dart
+22 −10 kitx_mobile/lib/utils/translation.dart
+1,081 −0 kitx_mobile/pubspec.lock
+27 −28 kitx_mobile/pubspec.yaml
+21 −0 kitx_mobile/self-sign-local.ps1
+12 −10 kitx_mobile/update-version.py
+29 −0 kitx_mobile_internal_plugins/.gitignore
+10 −0 kitx_mobile_internal_plugins/.metadata
+3 −0 kitx_mobile_internal_plugins/CHANGELOG.md
+1 −0 kitx_mobile_internal_plugins/LICENSE
+15 −0 kitx_mobile_internal_plugins/README.md
+4 −0 kitx_mobile_internal_plugins/analysis_options.yaml
+1 −0 kitx_mobile_internal_plugins/lib/interface/interface.dart
+15 −0 kitx_mobile_internal_plugins/lib/interface/internal_plugin.dart
+65 −0 kitx_mobile_internal_plugins/lib/interface/settings_page.dart
+52 −0 kitx_mobile_internal_plugins/lib/kitx_mobile_internal_plugins.dart
+21 −0 kitx_mobile_internal_plugins/lib/plugins/native_async/native_async.dart
+12 −0 kitx_mobile_internal_plugins/lib/plugins/native_async/settings_page.dart
+21 −0 kitx_mobile_internal_plugins/lib/plugins/notification_service_provider/notification_service_provider.dart
+12 −0 kitx_mobile_internal_plugins/lib/plugins/notification_service_provider/settings_page.dart
+1 −0 kitx_mobile_internal_plugins/lib/plugins/plugins.dart
+21 −0 kitx_mobile_internal_plugins/lib/plugins/sensors_data_provider/sensors_data_provider.dart
+12 −0 kitx_mobile_internal_plugins/lib/plugins/sensors_data_provider/settings_page.dart
+55 −0 kitx_mobile_internal_plugins/pubspec.yaml
+12 −0 kitx_mobile_internal_plugins/test/kitx_mobile_internal_plugins_test.dart
+1 −0 metadata/en-US/full_description.txt
+ metadata/en-US/images/icon.png
+ metadata/en-US/images/phoneScreenshots/screenshot-dark-about-page.jpg
+ metadata/en-US/images/phoneScreenshots/screenshot-dark-home-page.jpg
+ metadata/en-US/images/phoneScreenshots/screenshot-dark-navigation.jpg
+ metadata/en-US/images/phoneScreenshots/screenshot-dark-settings-page.jpg
+ metadata/en-US/images/phoneScreenshots/screenshot-light-about-page.jpg
+ metadata/en-US/images/phoneScreenshots/screenshot-light-home-page.jpg
+ metadata/en-US/images/phoneScreenshots/screenshot-light-navigation.jpg
+ metadata/en-US/images/phoneScreenshots/screenshot-light-settings-page.jpg
+1 −0 metadata/en-US/short_description.txt
+1 −0 metadata/en-US/title.txt
+1 −0 metadata/zh-CN/full_description.txt
+ metadata/zh-CN/images/icon.png
+ metadata/zh-CN/images/phoneScreenshots/screenshot-dark-about-page.jpg
+ metadata/zh-CN/images/phoneScreenshots/screenshot-dark-home-page.jpg
+ metadata/zh-CN/images/phoneScreenshots/screenshot-dark-navigation.jpg
+ metadata/zh-CN/images/phoneScreenshots/screenshot-dark-settings-page.jpg
+ metadata/zh-CN/images/phoneScreenshots/screenshot-light-about-page.jpg
+ metadata/zh-CN/images/phoneScreenshots/screenshot-light-home-page.jpg
+ metadata/zh-CN/images/phoneScreenshots/screenshot-light-navigation.jpg
+ metadata/zh-CN/images/phoneScreenshots/screenshot-light-settings-page.jpg
+1 −0 metadata/zh-CN/short_description.txt
+1 −0 metadata/zh-CN/title.txt
2 changes: 1 addition & 1 deletion KitX Clients/KitX Website
2 changes: 1 addition & 1 deletion KitX SDK
Loading

0 comments on commit 8fd1617

Please sign in to comment.