Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/pub/packages/smooth_app/uuid-4…
Browse files Browse the repository at this point in the history
….5.0
  • Loading branch information
monsieurtanuki authored Sep 19, 2024
2 parents 13cc9bb + e199455 commit 0eb4c85
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v4

- name: crowdin action
uses: crowdin/[email protected].2
uses: crowdin/[email protected].3
continue-on-error: true
with:
# Upload sources to Crowdin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:carousel_slider/carousel_controller.dart';
import 'package:carousel_slider/carousel_slider.dart';
import 'package:flutter/material.dart';
import 'package:smooth_app/helpers/haptic_feedback_helper.dart';

Expand Down Expand Up @@ -34,7 +34,7 @@ class ExternalScanCarouselManager extends StatefulWidget {

class ExternalScanCarouselManagerState
extends State<ExternalScanCarouselManager> {
final CarouselController _controller = CarouselController();
final CarouselSliderController _controller = CarouselSliderController();

/// A hidden attribute to force to return to the Scanner tab
/// This value should only be accessed via [forceShowScannerTab], as it will
Expand Down Expand Up @@ -75,7 +75,7 @@ class ExternalScanCarouselManagerState
// Without an animation
void moveToSearchCard() => _controller.jumpToPage(0);

CarouselController get controller => _controller;
CarouselSliderController get controller => _controller;

bool updateShouldNotify(ExternalScanCarouselManagerState oldState) {
return oldState.currentBarcode != currentBarcode || _forceShowScannerTab;
Expand Down
4 changes: 2 additions & 2 deletions packages/smooth_app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ packages:
dependency: "direct main"
description:
name: carousel_slider
sha256: "9c695cc963bf1d04a47bd6021f68befce8970bcd61d24938e1fb0918cf5d9c42"
sha256: "7b006ec356205054af5beaef62e2221160ea36b90fb70a35e4deacd49d0349ae"
url: "https://pub.dev"
source: hosted
version: "4.2.1"
version: "5.0.0"
characters:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
async: 2.11.0
go_router: 14.2.7
barcode_widget: 2.0.4
carousel_slider: 4.2.1
carousel_slider: 5.0.0
cupertino_icons: 1.0.8
flutter_svg: 2.0.10+1
flutter_map: 7.0.2
Expand Down

0 comments on commit 0eb4c85

Please sign in to comment.