优化焦点效果

WoAiNianChu · Jan 9, 2023 · b733476 · b733476
1 parent b2cad31
commit b733476
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 52 deletions.
diff --git a/lib/app/modules/countries/views/countries_view.dart b/lib/app/modules/countries/views/countries_view.dart
@@ -26,7 +26,7 @@ class CountriesView extends GetView<CountriesController> {
       itemBuilder: (BuildContext context, int index) {
         final item = controller.countries[index];
         return Obx(() => DPadDetector(
-          focusColor: Colors.red,
+          focusColor: Colors.blue,
             onMenuTap: () {},
             onTap: () {
               controller.selectItem(index);

diff --git a/lib/utils/widget/dpad_detector.dart b/lib/utils/widget/dpad_detector.dart
@@ -108,21 +108,29 @@ class _DPadDetectorState extends State<DPadDetector> {
         onLongPress: () {
           widget.onMenuTap?.call();
         },
-        child: CustomAnimation<double>(
-          control: hasFocus
-              ? CustomAnimationControl.playReverse
-              : CustomAnimationControl.play,
-          tween: Tween(begin: 0, end: 1),
-          duration: const Duration(milliseconds: 250),
-          builder: (context, child, value) {
+        child: PlayAnimationBuilder<double>(
+          tween: Tween(begin: 2.0, end: 1.0),
+          duration: const Duration(seconds: 1),
+          child: widget.child,
+          // builder: (context, value, child) {
+          //   return Container(
+          //     width: value,
+          //     height: value,
+          //     color: Colors.green,
+          //     child: child, // use child inside the animation
+          //   );
+          // },
+          builder: (context, value, child) {
             return Container(
-              margin: EdgeInsets.all(value * 8),
+              margin: EdgeInsets.all(value * 2),
               // color: Colors.transparent,
               decoration: BoxDecoration(
-                color: hasFocus?widget.focusColor.withOpacity(value):Colors.transparent,
+                color: hasFocus
+                    ? widget.focusColor.withOpacity(value * 0.4)
+                    : Colors.transparent,
                 border: Border.all(
-                  color: widget.focusColor.withOpacity(value * 0.2),
-                  width: value,
+                  color: widget.focusColor.withOpacity(value * 0.1),
+                  width: hasFocus ? value * 4 : value,
                 ),
                 borderRadius: BorderRadius.circular(widget.focusRadius),
               ),

diff --git a/macos/Podfile b/macos/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.11'
+platform :osx, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -29,6 +29,6 @@ SPEC CHECKSUMS:
   path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
   shared_preferences_macos: 8b221d457159a85f478c0b9d2f19aeae9feff475
 
-PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
+PODFILE CHECKSUM: 8d40c19d3cbdb380d870685c3a564c989f1efa52
 
 COCOAPODS: 1.11.3
diff --git a/pubspec.lock b/pubspec.lock
@@ -146,13 +146,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_hls_parser:
-    dependency: "direct main"
-    description:
-      name: flutter_hls_parser
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -345,13 +338,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.3"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.11.1"
   platform:
     dependency: transitive
     description:
@@ -387,13 +373,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.3"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.2.1"
   rational:
     dependency: transitive
     description:
@@ -491,7 +470,7 @@ packages:
       name: simple_animations
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.1"
+    version: "5.0.0+3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -546,20 +525,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.1"
-  supercharged:
-    dependency: transitive
-    description:
-      name: supercharged
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.1"
-  supercharged_dart:
-    dependency: transitive
-    description:
-      name: supercharged_dart
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.1"
   synchronized:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -8,11 +8,10 @@ environment:
 dependencies: 
   cupertino_icons: ^1.0.2
   get: ^4.6.5
-  flutter_hls_parser: ^2.0.0
   dio: ^4.0.6
   flustars: ^2.0.1
   logger: ^1.1.0
-  simple_animations: ^3.1.1
+  simple_animations: ^5.0.0+3
   m3u_nullsafe: ^1.0.4
   file_saver: ^0.1.1
   flutter: