diff --git a/liquid_menu_final/.metadata b/liquid_menu_final/.metadata index 4adf4bf..9cef17b 100644 --- a/liquid_menu_final/.metadata +++ b/liquid_menu_final/.metadata @@ -4,7 +4,27 @@ # This file should be version controlled and should not be manually edited. version: - revision: f139b11009aeb8ed2a3a3aa8b0066e482709dde3 - channel: stable + revision: "b0850beeb25f6d5b10426284f506557f66181b36" + channel: "stable" project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: b0850beeb25f6d5b10426284f506557f66181b36 + base_revision: b0850beeb25f6d5b10426284f506557f66181b36 + - platform: web + create_revision: b0850beeb25f6d5b10426284f506557f66181b36 + base_revision: b0850beeb25f6d5b10426284f506557f66181b36 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/liquid_menu_final/analysis_options.yaml b/liquid_menu_final/analysis_options.yaml new file mode 100644 index 0000000..0d29021 --- /dev/null +++ b/liquid_menu_final/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/liquid_menu_final/lib/ui/views/home_view.dart b/liquid_menu_final/lib/ui/views/home_view.dart index 20795e5..802f125 100644 --- a/liquid_menu_final/lib/ui/views/home_view.dart +++ b/liquid_menu_final/lib/ui/views/home_view.dart @@ -7,7 +7,7 @@ class HomeView extends StatefulWidget { } class _HomeViewState extends State with TickerProviderStateMixin { - AnimationController _animationController; + late AnimationController _animationController; @override Widget build(BuildContext context) { diff --git a/liquid_menu_final/lib/ui/widgets/liquid.dart b/liquid_menu_final/lib/ui/widgets/liquid.dart index 1259bef..5f01680 100644 --- a/liquid_menu_final/lib/ui/widgets/liquid.dart +++ b/liquid_menu_final/lib/ui/widgets/liquid.dart @@ -1,10 +1,7 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:liquid_menu/core/viewmodels/home_model.dart'; import 'package:liquid_menu/ui/shared/globals.dart'; import 'package:lottie/lottie.dart'; -import 'package:neumorphic/neumorphic.dart'; import 'package:provider/provider.dart'; class Liquid extends StatelessWidget { @@ -12,8 +9,8 @@ class Liquid extends StatelessWidget { final AnimationController controller; Liquid({ - @required this.isFlipped, - @required this.controller, + required this.isFlipped, + required this.controller, }); @override @@ -36,7 +33,8 @@ class Liquid extends StatelessWidget { boxShadow: [ BoxShadow( blurRadius: 30.0, - color: !isFlipped ? Colors.grey[350] : Colors.white, + color: + !isFlipped ? Colors.grey[350] ?? Colors.white : Colors.white, offset: Offset(isFlipped ? -20 : 20, isFlipped ? -30 : 30), ), ], @@ -71,30 +69,30 @@ class Liquid extends StatelessWidget { ), ), ), - isFlipped - ? SizedBox() - : GestureDetector( - onTap: () { - model.openLiquidMenu(controller); - }, - child: NeuCard( - curveType: model.isOpening - ? CurveType.emboss - : CurveType.concave, - width: 88, - height: 88, - bevel: 16, - decoration: NeumorphicDecoration( - color: - model.isOpening ? Global.activeColor : Colors.white, - borderRadius: BorderRadius.circular(8), - ), - child: Icon( - model.isOpening ? Icons.lock_open : Icons.lock, - color: Colors.pinkAccent, - ), - ), + if (isFlipped) + SizedBox() + else + GestureDetector( + onTap: () { + model.openLiquidMenu(controller); + }, + // curveType: model.isOpening + // ? CurveType.emboss + // : CurveType.concave, + // bevel: 16, + child: Container( + width: 88, + height: 88, + decoration: BoxDecoration( + color: model.isOpening ? Global.activeColor : Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: Icon( + model.isOpening ? Icons.lock_open : Icons.lock, + color: Colors.pinkAccent, ), + ), + ), ], ), ), diff --git a/liquid_menu_final/pubspec.lock b/liquid_menu_final/pubspec.lock index 993adc0..34d28ec 100644 --- a/liquid_menu_final/pubspec.lock +++ b/liquid_menu_final/pubspec.lock @@ -5,72 +5,74 @@ packages: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" source: hosted - version: "2.0.11" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" + version: "3.6.1" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "0.5.0" - charcode: + version: "1.3.0" + clock: dependency: transitive description: - name: charcode - url: "https://pub.dartlang.org" + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.14.11" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "1.18.0" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "3.0.5" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" + source: hosted + version: "1.0.8" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -81,90 +83,102 @@ packages: description: flutter source: sdk version: "0.0.0" - image: + http: dependency: transitive description: - name: image - url: "https://pub.dartlang.org" + name: http + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" source: hosted - version: "2.1.4" - logging: + version: "1.2.2" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: dependency: transitive description: - name: logging - url: "https://pub.dartlang.org" + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" source: hosted - version: "0.11.4" + version: "3.0.1" lottie: dependency: "direct main" description: name: lottie - url: "https://pub.dartlang.org" + sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" + url: "https://pub.dev" source: hosted - version: "0.3.3" + version: "3.1.2" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" source: hosted - version: "0.12.6" + version: "0.12.16+1" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + url: "https://pub.dev" + source: hosted + version: "0.8.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + url: "https://pub.dev" source: hosted - version: "1.1.8" + version: "1.12.0" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.4" - neumorphic: - dependency: "direct main" - description: - name: neumorphic - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "1.0.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.4" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" + version: "1.9.0" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" - source: hosted - version: "4.0.5" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "6.1.2" sky_engine: dependency: transitive description: flutter @@ -174,65 +188,82 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.5.5" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.9.3" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + url: "https://pub.dev" source: hosted - version: "0.2.11" + version: "0.7.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" source: hosted - version: "1.1.6" + version: "1.3.2" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" source: hosted - version: "2.0.8" - xml: + version: "14.2.1" + web: dependency: transitive description: - name: xml - url: "https://pub.dartlang.org" + name: web + sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062 + url: "https://pub.dev" source: hosted - version: "3.5.0" + version: "1.0.0" sdks: - dart: ">=2.7.0 <3.0.0" - flutter: ">=1.12.1" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/liquid_menu_final/pubspec.yaml b/liquid_menu_final/pubspec.yaml index 96fd22e..886d6f0 100644 --- a/liquid_menu_final/pubspec.yaml +++ b/liquid_menu_final/pubspec.yaml @@ -3,16 +3,15 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">3.0.0" dependencies: flutter: sdk: flutter - cupertino_icons: ^0.1.2 - provider: ^4.0.5 - lottie: ^0.3.3 - neumorphic: + cupertino_icons: + provider: + lottie: dev_dependencies: diff --git a/liquid_menu_final/web/favicon.png b/liquid_menu_final/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/liquid_menu_final/web/favicon.png differ diff --git a/liquid_menu_final/web/icons/Icon-192.png b/liquid_menu_final/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/liquid_menu_final/web/icons/Icon-192.png differ diff --git a/liquid_menu_final/web/icons/Icon-512.png b/liquid_menu_final/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/liquid_menu_final/web/icons/Icon-512.png differ diff --git a/liquid_menu_final/web/icons/Icon-maskable-192.png b/liquid_menu_final/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/liquid_menu_final/web/icons/Icon-maskable-192.png differ diff --git a/liquid_menu_final/web/icons/Icon-maskable-512.png b/liquid_menu_final/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/liquid_menu_final/web/icons/Icon-maskable-512.png differ diff --git a/liquid_menu_final/web/index.html b/liquid_menu_final/web/index.html new file mode 100644 index 0000000..fd953c9 --- /dev/null +++ b/liquid_menu_final/web/index.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + liquid_menu_final + + + + + + diff --git a/liquid_menu_final/web/manifest.json b/liquid_menu_final/web/manifest.json new file mode 100644 index 0000000..0f88419 --- /dev/null +++ b/liquid_menu_final/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "liquid_menu_final", + "short_name": "liquid_menu_final", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +}