fix: Problem solved.

mathrunet · Sep 5, 2022 · e939687 · e939687
1 parent 2114d27
commit e939687
Show file tree

Hide file tree

Showing 22 changed files with 16 additions and 30 deletions.
diff --git a/packages/katana_module/lib/katana_module.dart b/packages/katana_module/lib/katana_module.dart
@@ -8,7 +8,6 @@
 /// [YouTube]: https://www.youtube.com/c/mathrunetchannel
 library katana_module;
 
-import "package:flutter/material.dart";
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:katana_routing/katana_routing.dart';

diff --git a/packages/katana_routing/example/lib/main.dart b/packages/katana_routing/example/lib/main.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// ignore_for_file: public_member_api_docs
-import 'package:flutter/material.dart';
 import 'package:katana_routing/katana_routing.dart';
 
 void main() {

diff --git a/packages/masamune/lib/property/default_text_button_style.dart b/packages/masamune/lib/property/default_text_button_style.dart
@@ -16,8 +16,8 @@ class DefaultTextButtonStyle extends ButtonStyle {
     return DefaultTextButtonStyle._(
       TextButton.styleFrom(
         padding: padding,
-        primary: color,
-        onSurface: color,
+        foregroundColor: color,
+        disabledForegroundColor: color,
         backgroundColor: backgroundColor,
         shape: RoundedRectangleBorder(
           side: borderWidth <= 0 || borderColor == Colors.transparent

diff --git a/packages/masamune/lib/property/mobile/asset.dart b/packages/masamune/lib/property/mobile/asset.dart
@@ -174,7 +174,9 @@ class ImageMemoryCache {
       throw StateError('$file is empty and cannot be loaded as an image.');
     }
 
-    return PaintingBinding.instance.instantiateImageCodec(bytes);
+    return PaintingBinding.instance.instantiateImageCodecFromBuffer(
+      await ImmutableBuffer.fromUint8List(bytes),
+    );
   }
 
   static ImageStreamCompleter? _getCache(String? key) {

diff --git a/packages/masamune_cli/bin/command/appbuild/aab.dart b/packages/masamune_cli/bin/command/appbuild/aab.dart
@@ -8,7 +8,6 @@ class AppBuildAabCliCommand extends CliCommand {
 
   @override
   Future<void> exec(YamlMap yaml, List<String> args) async {
-    final build = yaml["build"] as YamlMap;
     final bin = yaml["bin"] as YamlMap;
     final flutter = bin["flutter"] as String?;
     final generateProcess = await Process.start(

diff --git a/packages/masamune_cli/bin/command/appbuild/apk.dart b/packages/masamune_cli/bin/command/appbuild/apk.dart
@@ -8,7 +8,6 @@ class AppBuildApkCliCommand extends CliCommand {
 
   @override
   Future<void> exec(YamlMap yaml, List<String> args) async {
-    final build = yaml["build"] as YamlMap;
     final bin = yaml["bin"] as YamlMap;
     final flutter = bin["flutter"] as String?;
     final generateProcess = await Process.start(

diff --git a/packages/masamune_media/lib/dialog/mobile/mobile.dart b/packages/masamune_media/lib/dialog/mobile/mobile.dart
@@ -1,9 +1,7 @@
 /// For mobile.
 library masamune_media.dialog.mobile;
 
-import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:masamune/masamune.dart';
 import 'package:masamune_media/masamune_media.dart';
 
 part 'ui_media_dialog.dart';
diff --git a/packages/masamune_media/lib/dialog/others/others.dart b/packages/masamune_media/lib/dialog/others/others.dart
@@ -1,9 +1,7 @@
 /// For others.
 library masamune_media.dialog.others;
 
-import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:masamune/masamune.dart';
 import 'package:masamune_media/masamune_media.dart';
 
 part 'ui_media_dialog.dart';
diff --git a/packages/masamune_module/lib/component/detail/detail.dart b/packages/masamune_module/lib/component/detail/detail.dart
@@ -403,7 +403,7 @@ class DetailModuleTagsWidget extends ModuleWidget<DetailModule> {
               visualDensity: VisualDensity.compact,
               padding: const EdgeInsets.fromLTRB(0, 8, 8, 8),
               alignment: Alignment.centerLeft,
-              primary: context.theme.textColor.withOpacity(0.5),
+              foregroundColor: context.theme.textColor.withOpacity(0.5),
             ),
             child: Text(
               "#$e",
@@ -455,7 +455,7 @@ class DetailModuleActionWidget extends ModuleWidget<DetailModule> {
           if (module.enableLike)
             TextButton.icon(
               style: TextButton.styleFrom(
-                primary:
+                foregroundColor:
                     like ? context.theme.primaryColor : context.theme.textColor,
               ),
               icon: const Icon(Icons.thumb_up),

diff --git a/packages/masamune_module/lib/component/media/single_media.dart b/packages/masamune_module/lib/component/media/single_media.dart
@@ -110,7 +110,7 @@ class SingleMediaModuleHomePage extends PageModuleWidget<SingleMediaModule> {
               ? Center(
                   child: TextButton.icon(
                     style: TextButton.styleFrom(
-                      primary: context.theme.textColorOnPrimary,
+                      foregroundColor: context.theme.textColorOnPrimary,
                       backgroundColor: context.theme.primaryColor,
                     ),
                     label: Text("Add".localize()),

diff --git a/packages/masamune_module/lib/component/menu/menu.dart b/packages/masamune_module/lib/component/menu/menu.dart
@@ -1,4 +1,3 @@
-import 'package:masamune/masamune.dart';
 import 'package:masamune_module/masamune_module.dart';
 
 @immutable

diff --git a/packages/masamune_module/lib/component/user/user.dart b/packages/masamune_module/lib/component/user/user.dart
@@ -251,7 +251,7 @@ class UserModuleHomePage extends PageModuleWidget<UserModule> {
                 shape: StadiumBorder(
                   side: BorderSide(color: context.theme.textColor, width: 2),
                 ),
-                primary: context.theme.textColor,
+                foregroundColor: context.theme.textColor,
                 backgroundColor: context.theme.scaffoldBackgroundColor,
               ),
             )
@@ -264,7 +264,7 @@ class UserModuleHomePage extends PageModuleWidget<UserModule> {
                 shape: StadiumBorder(
                   side: BorderSide(color: context.theme.textColor, width: 2),
                 ),
-                primary: context.theme.textColor,
+                foregroundColor: context.theme.textColor,
                 backgroundColor: context.theme.scaffoldBackgroundColor,
               ),
             )

diff --git a/packages/masamune_notion/lib/src/notion_block.dart b/packages/masamune_notion/lib/src/notion_block.dart
@@ -199,7 +199,7 @@ class _NotionBlockState extends State<NotionBlock> {
     switch (block.type) {
       case "divider":
         return const Padding(
-          padding: const EdgeInsets.symmetric(vertical: 4),
+          padding: EdgeInsets.symmetric(vertical: 4),
           child: Divid(),
         );
       case "bulleted_list_item":

diff --git a/packages/masamune_ui/lib/component/ui_bottom_call_action.dart b/packages/masamune_ui/lib/component/ui_bottom_call_action.dart
@@ -39,7 +39,7 @@ class UIBottomCallAction extends StatelessWidget {
                 style: TextButton.styleFrom(
                   backgroundColor:
                       buttonBackgroundColor ?? context.theme.primaryColor,
-                  primary: buttonColor ?? context.theme.textColorOnPrimary,
+                  foregroundColor: buttonColor ?? context.theme.textColorOnPrimary,
                   elevation: 0.0,
                   padding: buttonPadding,
                   shape: RoundedRectangleBorder(

diff --git a/packages/masamune_ui/lib/form/form.dart b/packages/masamune_ui/lib/form/form.dart
@@ -16,7 +16,6 @@ import 'package:flutter_rating_bar/flutter_rating_bar.dart';
 import 'package:intl/intl.dart';
 // ignore: import_of_legacy_library_into_null_safe
 // import 'package:datetime_picker_formfield/datetime_picker_formfield.dart';
-import 'package:masamune/masamune.dart';
 import 'package:masamune_ui/masamune_ui.dart';
 import 'package:multi_select_flutter/multi_select_flutter.dart';
 

diff --git a/packages/masamune_ui/lib/form/mobile/mobile.dart b/packages/masamune_ui/lib/form/mobile/mobile.dart
@@ -4,7 +4,6 @@ library masamune_ui.form.mobile;
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:masamune/masamune.dart';
 import 'package:masamune_ui/masamune_ui.dart';
 
 part 'form_item_media.dart';

diff --git a/packages/masamune_ui/lib/form/others/others.dart b/packages/masamune_ui/lib/form/others/others.dart
@@ -3,7 +3,6 @@ library masamune_ui.form.others;
 
 import 'dart:convert';
 
-import 'package:masamune/masamune.dart';
 import 'package:masamune_ui/masamune_ui.dart';
 
 part 'form_item_media.dart';

diff --git a/packages/masamune_ui/lib/list/list.dart b/packages/masamune_ui/lib/list/list.dart
@@ -14,7 +14,6 @@ import 'package:collapsible/collapsible.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:loading_animations/loading_animations.dart';
-import 'package:masamune/masamune.dart';
 import 'package:masamune_ui/masamune_ui.dart';
 
 export 'package:flutter_slidable/flutter_slidable.dart'

diff --git a/packages/masamune_ui/lib/list/next_button.dart b/packages/masamune_ui/lib/list/next_button.dart
@@ -74,8 +74,8 @@ class _NextButtonState extends State<NextButton> {
       );
     } else {
       final style = TextButton.styleFrom(
-        primary: widget.primaryColor,
-        onSurface: widget.onSurfaceColor,
+        foregroundColor: widget.primaryColor,
+        disabledForegroundColor: widget.onSurfaceColor,
         backgroundColor: widget.backgroundColor,
         shadowColor: widget.shadowColor,
         surfaceTintColor: widget.surfaceTintColor,

diff --git a/packages/masamune_ui/lib/ui/ui.dart b/packages/masamune_ui/lib/ui/ui.dart
@@ -14,7 +14,6 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:loading_animations/loading_animations.dart';
-import 'package:masamune/masamune.dart';
 import 'package:masamune_ui/masamune_ui.dart';
 
 part 'ui_scaffold.dart';

diff --git a/packages/masamune_ui/lib/ui/ui_scaffold.dart b/packages/masamune_ui/lib/ui/ui_scaffold.dart
@@ -1082,7 +1082,7 @@ class _WebMainAppBar extends StatelessWidget implements PreferredSizeWidget {
                               context.rootNavigator.pushNamed(e.path!);
                             },
                             style: TextButton.styleFrom(
-                              primary: foregroundColor ??
+                              foregroundColor: foregroundColor ??
                                   context.theme.appBarTheme.foregroundColor ??
                                   context.theme.textColorOnPrimary,
                             ),
@@ -1097,7 +1097,7 @@ class _WebMainAppBar extends StatelessWidget implements PreferredSizeWidget {
                               context.rootNavigator.pushNamed(e.path!);
                             },
                             style: TextButton.styleFrom(
-                              primary: foregroundColor ??
+                              foregroundColor: foregroundColor ??
                                   context.theme.appBarTheme.foregroundColor ??
                                   context.theme.textColorOnPrimary,
                             ),

diff --git a/packages/masamune_ui/lib/variable/variable.dart b/packages/masamune_ui/lib/variable/variable.dart
@@ -5,7 +5,6 @@ library masamune_ui.variable;
 
 import 'dart:convert';
 
-import 'package:masamune/masamune.dart';
 import 'package:masamune_ui/masamune_ui.dart';
 
 part 'form/text_form_config.dart';