diff --git a/.github/workflows/github-actions-release-android.yml b/.github/workflows/github-actions-release-android.yml index d5ddde6..1f9f103 100644 --- a/.github/workflows/github-actions-release-android.yml +++ b/.github/workflows/github-actions-release-android.yml @@ -1,10 +1,10 @@ name: Release Android app on: -# push: -# branches: [ main ] -# pull_request: -# branches: [ main ] + push: + branches: [ main ] + pull_request: + branches: [ main ] workflow_dispatch: @@ -38,6 +38,6 @@ jobs: with: artifacts: 'build/app/outputs/apk/release/skyle_ik-android.zip' token: ${{ secrets.RELEASES_TOKEN }} - tag: '1.1.0' + tag: '1.1.1' commit: main allowUpdates: true \ No newline at end of file diff --git a/.github/workflows/github-actions-release-ios.yml b/.github/workflows/github-actions-release-ios.yml index 554a346..8a9321d 100644 --- a/.github/workflows/github-actions-release-ios.yml +++ b/.github/workflows/github-actions-release-ios.yml @@ -1,10 +1,10 @@ name: Release iPadOS app on: -# push: -# branches: [ main ] -# pull_request: -# branches: [ main ] + push: + branches: [ main ] + pull_request: + branches: [ main ] workflow_dispatch: @@ -35,6 +35,6 @@ jobs: with: artifacts: 'build/ios/iphoneos/skyle_ik-ios.zip' token: ${{ secrets.RELEASES_TOKEN }} - tag: '1.1.0' + tag: '1.1.1' commit: main allowUpdates: true \ No newline at end of file diff --git a/.github/workflows/github-actions-release-linux.yml b/.github/workflows/github-actions-release-linux.yml index 57e4681..aea7208 100644 --- a/.github/workflows/github-actions-release-linux.yml +++ b/.github/workflows/github-actions-release-linux.yml @@ -1,10 +1,10 @@ name: Release linux app on: - # push: - # branches: [ main ] - # pull_request: - # branches: [ main ] + push: + branches: [ main ] + pull_request: + branches: [ main ] workflow_dispatch: @@ -35,6 +35,6 @@ jobs: with: artifacts: 'build/linux/x64/release/bundle/skyle_ik-linux.zip' token: ${{ secrets.RELEASES_TOKEN }} - tag: '1.1.0' + tag: '1.1.1' commit: main allowUpdates: true diff --git a/.github/workflows/github-actions-release-macos.yml b/.github/workflows/github-actions-release-macos.yml index 42bb95a..0e28519 100644 --- a/.github/workflows/github-actions-release-macos.yml +++ b/.github/workflows/github-actions-release-macos.yml @@ -1,10 +1,10 @@ name: Release macOS app on: - # push: - # branches: [ main ] - # pull_request: - # branches: [ main ] + push: + branches: [ main ] + pull_request: + branches: [ main ] workflow_dispatch: @@ -34,6 +34,6 @@ jobs: with: artifacts: 'build/macos/Build/Products/Release/skyle_ik-macos/skyle_ik-macos.zip' token: ${{ secrets.RELEASES_TOKEN }} - tag: '1.1.0' + tag: '1.1.1' commit: main allowUpdates: true \ No newline at end of file diff --git a/.github/workflows/github-actions-release-windows.yml b/.github/workflows/github-actions-release-windows.yml index 048d89e..583b136 100644 --- a/.github/workflows/github-actions-release-windows.yml +++ b/.github/workflows/github-actions-release-windows.yml @@ -1,10 +1,10 @@ name: Release Windows app on: -# push: -# branches: [ main ] -# pull_request: -# branches: [ main ] + push: + branches: [ main ] + pull_request: + branches: [ main ] workflow_dispatch: @@ -33,6 +33,6 @@ jobs: with: artifacts: 'build/windows/runner/Release/skyle_ik-windows.zip' token: ${{ secrets.RELEASES_TOKEN }} - tag: '1.1.0' + tag: '1.1.1' commit: main allowUpdates: true \ No newline at end of file diff --git a/lib/ui/main/main_view.dart b/lib/ui/main/main_view.dart index 999d6d4..14bb3b2 100644 --- a/lib/ui/main/main_view.dart +++ b/lib/ui/main/main_view.dart @@ -121,11 +121,18 @@ class _CalibrationPointsSelection extends ConsumerWidget { properties: GazeButtonProperties( key: GlobalKey(), backgroundColor: backgroundColor, - borderColor: borderColor, gazeInteractive: points != item, - child: CalibrationPointsView( - points: item.array, - color: Colors.yellow, + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + border: Border.all( + color: borderColor, + width: 3, + )), + child: CalibrationPointsView( + points: item.array, + color: Colors.yellow, + ), ), route: MainRoutes.home.path, ), diff --git a/macos/Podfile.lock b/macos/Podfile.lock index a40a8a1..80ccbca 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - device_info_plus_macos (0.0.1): + - device_info_plus (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) - path_provider_macos (0.0.1): @@ -10,15 +10,15 @@ PODS: - FlutterMacOS DEPENDENCIES: - - device_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos`) + - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`) - window_size (from `Flutter/ephemeral/.symlinks/plugins/window_size/macos`) EXTERNAL SOURCES: - device_info_plus_macos: - :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos + device_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos FlutterMacOS: :path: Flutter/ephemeral path_provider_macos: @@ -29,7 +29,7 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/window_size/macos SPEC CHECKSUMS: - device_info_plus_macos: 1ad388a1ef433505c4038e7dd9605aadd1e2e9c7 + device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 diff --git a/pubspec.yaml b/pubspec.yaml index 7dc6de7..dae25af 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: A simple example application to calibrate the Skyle eye-tracker. publish_to: 'none' -version: 1.0.0+1 +version: 1.1.1 environment: sdk: '>=2.18.0 <3.0.0'