diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f08fb9d6..c5c2158d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,28 +1,28 @@ -name: Android build & release - -on: - push: - branches: [ main ] - -jobs: - flutter_test: - name: Flutter Test and Analyse - runs-on: ubuntu-latest - steps: - - name: Clone Repository - uses: actions/checkout@v4 - - name: Set up Flutter - uses: subosito/flutter-action@v2 - with: - channel: "stable" - - run: flutter --version - - run: flutter pub get - - run: flutter pub upgrade - - run: flutter build apk --debug --no-tree-shake-icons --debug --dart-define SERVER-URL=${{ secrets.SERVER_URL }} --dart-define IRBS-SERVER-URL=${{ secrets.IRBS_SERVER_URL }} --dart-define SECURITY-KEY=${{ secrets.SECURITY_KEY }} --dart-define GMAP_KEY=${{ secrets.GMAP_KEY }} --dart-define GITHUB_ISSUE_TOKEN=${{ secrets.GIT_TOKEN }} - - name: Create Release - uses: ncipollo/release-action@v1 - with: - artifacts: "build/app/outputs/flutter-apk/app-debug.apk" - tag: v1.0.${{ github.run_number }} - token: ${{ secrets.GIT_TOKEN }} - +#name: Android build & release +# +#on: +# push: +# branches: [ main ] +# +#jobs: +# flutter_test: +# name: Flutter Test and Analyse +# runs-on: ubuntu-latest +# steps: +# - name: Clone Repository +# uses: actions/checkout@v4 +# - name: Set up Flutter +# uses: subosito/flutter-action@v2 +# with: +# channel: "stable" +# - run: flutter --version +# - run: flutter pub get +# - run: flutter pub upgrade +# - run: flutter build apk --debug --no-tree-shake-icons --debug --dart-define SERVER-URL=${{ secrets.SERVER_URL }} --dart-define IRBS-SERVER-URL=${{ secrets.IRBS_SERVER_URL }} --dart-define SECURITY-KEY=${{ secrets.SECURITY_KEY }} --dart-define GMAP_KEY=${{ secrets.GMAP_KEY }} --dart-define GITHUB_ISSUE_TOKEN=${{ secrets.GIT_TOKEN }} +# - name: Create Release +# uses: ncipollo/release-action@v1 +# with: +# artifacts: "build/app/outputs/flutter-apk/app-debug.apk" +# tag: v1.0.${{ github.run_number }} +# token: ${{ secrets.GIT_TOKEN }} +# diff --git a/lib/pages/ip/ip_carousel.dart b/lib/pages/ip/ip_carousel.dart index ce4e36e8..a17c8341 100644 --- a/lib/pages/ip/ip_carousel.dart +++ b/lib/pages/ip/ip_carousel.dart @@ -1,4 +1,4 @@ -import 'package:carousel_slider/carousel_slider.dart' as carousel_slider; +import 'package:carousel_slider/carousel_slider.dart'; import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:flutter/material.dart'; import 'package:onestop_dev/functions/ip/ip_calculator.dart'; @@ -34,7 +34,7 @@ class RouterPage extends StatefulWidget { class _RouterPageState extends State { int page = 1; Widget seven = const Column(); - final buttonCarouselController = carousel_slider.CarouselController(); + final buttonCarouselController = CarouselSliderController(); TextEditingController roomController = TextEditingController(); TextEditingController blockController = TextEditingController(); TextEditingController floorController = TextEditingController(); @@ -127,7 +127,7 @@ class _RouterPageState extends State { //crossAxisAlignment: CrossAxisAlignment.start, //mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - carousel_slider.CarouselSlider( + CarouselSlider( items: [1, 2, 3, 4, 5, 6, 7, 8].map((i) { return Builder( builder: (BuildContext context) { @@ -275,7 +275,7 @@ class _RouterPageState extends State { ); }).toList(), carouselController: buttonCarouselController, - options: carousel_slider.CarouselOptions( + options: CarouselOptions( onPageChanged: (index, reason) { setState(() { page = index + 1; //<-- Page index diff --git a/pubspec.lock b/pubspec.lock index 7faba37b..f064974b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "72.0.0" _flutterfire_internals: dependency: transitive description: @@ -17,6 +17,11 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.35" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.2" alphabet_scroll_view: dependency: "direct main" description: @@ -29,10 +34,10 @@ packages: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.7.0" ansicolor: dependency: transitive description: @@ -133,18 +138,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04 url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.12" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe + sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0 url: "https://pub.dev" source: hosted - version: "7.3.1" + version: "7.3.2" built_collection: dependency: transitive description: @@ -206,10 +211,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" change_app_package_name: dependency: "direct dev" description: @@ -951,7 +956,7 @@ packages: description: path: "packages/irbs" ref: HEAD - resolved-ref: "14743476d4a2ec8e0e44e53ea4571f95c79dc38e" + resolved-ref: cde28b1797e1d1a04191318bbd6e6e79fc74370b url: "https://github.com/swciitg/irbs.git" source: git version: "1.0.0" @@ -991,18 +996,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -1035,6 +1040,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.7.0" + macros: + dependency: transitive + description: + name: macros + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + url: "https://pub.dev" + source: hosted + version: "0.1.2-main.4" map_launcher: dependency: "direct main" description: @@ -1055,18 +1068,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: @@ -1337,10 +1350,10 @@ packages: dependency: "direct main" description: name: sembast - sha256: a49ce14fb0d81bee9f8941061a38f4b790d19c0ab01abe35a529c1fcef0512a1 + sha256: "21557d8106821c758d948e96f071c4c39d8135abcc5a215694d93a220bf78034" url: "https://pub.dev" source: hosted - version: "3.7.2" + version: "3.7.3" shared_preferences: dependency: "direct main" description: @@ -1478,10 +1491,10 @@ packages: dependency: transitive description: name: sqflite_common - sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4" + sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e" url: "https://pub.dev" source: hosted - version: "2.5.4" + version: "2.5.4+2" stack_trace: dependency: transitive description: @@ -1550,10 +1563,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255 url: "https://pub.dev" source: hosted - version: "3.1.0+1" + version: "3.2.0" term_glyph: dependency: transitive description: @@ -1566,10 +1579,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" timeago: dependency: "direct main" description: @@ -1734,10 +1747,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.4" watcher: dependency: transitive description: @@ -1843,5 +1856,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 36e3c1ad..f156bd9a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.0.6+68 +version: 3.0.7+69 environment: sdk: ">=2.17.0 <3.0.0" @@ -63,7 +63,6 @@ dependencies: file_picker: ^5.2.5 shared_preferences: ^2.0.12 barcode_widget: ^2.0.3 - carousel_slider: ^4.2.1 url_launcher: ^6.0.20 alphabet_scroll_view: ^0.3.1 cached_network_image: ^3.3.1 @@ -94,6 +93,7 @@ dependencies: flutter_cache_manager: ^3.3.1 connectivity_plus: ^6.0.3 fluttertoast: ^8.2.8 + carousel_slider: ^5.0.0 dev_dependencies: flutter_test: