From 49b301450a0f668a8db55bfdf5f0f06c672a646d Mon Sep 17 00:00:00 2001 From: tomokisun Date: Sat, 16 Dec 2023 02:44:10 +0900 Subject: [PATCH] =?UTF-8?q?style:=20=F0=9F=92=84=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app.dart | 4 +++- lib/components/gradient_scaffold.dart | 2 +- lib/feature/home/components/top_music_box_pane.dart | 2 +- lib/feature/home/components/top_music_pane.dart | 2 +- lib/feature/home/components/top_recommended_pane.dart | 2 +- lib/feature/home/components/top_sound_pane.dart | 2 +- lib/feature/home/components/top_story_pane.dart | 2 +- lib/util/formatter/date_time_formatter.dart | 8 ++------ lib/util/formatter/number_formatter.dart | 2 +- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/lib/app.dart b/lib/app.dart index c512963..f09df4f 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -16,9 +16,11 @@ class App extends StatelessWidget { home: const Root(), theme: ThemeData( primaryColor: AppColor.black, - backgroundColor: AppColor.black, scaffoldBackgroundColor: AppColor.black, fontFamily: FontFamily.notoSansJpRegular, + colorScheme: const ColorScheme.dark( + background: AppColor.black, + ), ), navigatorObservers: [ FirebaseAnalyticsObserver(analytics: firebaseAnalytics), diff --git a/lib/components/gradient_scaffold.dart b/lib/components/gradient_scaffold.dart index 9eb6548..679cad6 100644 --- a/lib/components/gradient_scaffold.dart +++ b/lib/components/gradient_scaffold.dart @@ -12,12 +12,12 @@ class GradientScaffold extends Scaffold { appBar: appBar, bottomNavigationBar: bottomNavigationBar, body: Container( - child: body, width: double.infinity, height: double.infinity, decoration: const BoxDecoration( gradient: AppGradient.primary, ), + child: body, ), ); } diff --git a/lib/feature/home/components/top_music_box_pane.dart b/lib/feature/home/components/top_music_box_pane.dart index b49ab90..c80df1f 100644 --- a/lib/feature/home/components/top_music_box_pane.dart +++ b/lib/feature/home/components/top_music_box_pane.dart @@ -31,7 +31,7 @@ class TopMusicBoxPane extends StatelessWidget { child: Row( children: [ const SizedBox(width: 8), - ...musicBoxes.map((d) => ProductCard(key, d)).toList(), + ...musicBoxes.map((d) => ProductCard(key, d)), const SizedBox(width: 8), ], ), diff --git a/lib/feature/home/components/top_music_pane.dart b/lib/feature/home/components/top_music_pane.dart index 380aabf..cc2d9ac 100644 --- a/lib/feature/home/components/top_music_pane.dart +++ b/lib/feature/home/components/top_music_pane.dart @@ -31,7 +31,7 @@ class TopMusicPane extends StatelessWidget { child: Row( children: [ const SizedBox(width: 8), - ...musics.map((d) => ProductCard(key, d)).toList(), + ...musics.map((d) => ProductCard(key, d)), const SizedBox(width: 8), ], ), diff --git a/lib/feature/home/components/top_recommended_pane.dart b/lib/feature/home/components/top_recommended_pane.dart index 2d8143d..a04046b 100644 --- a/lib/feature/home/components/top_recommended_pane.dart +++ b/lib/feature/home/components/top_recommended_pane.dart @@ -31,7 +31,7 @@ class TopRecommendedPane extends StatelessWidget { child: Row( children: [ const SizedBox(width: 8), - ...recommendations.map((d) => ProductCard(key, d)).toList(), + ...recommendations.map((d) => ProductCard(key, d)), const SizedBox(width: 8), ], ), diff --git a/lib/feature/home/components/top_sound_pane.dart b/lib/feature/home/components/top_sound_pane.dart index 719a9a6..9a17fae 100644 --- a/lib/feature/home/components/top_sound_pane.dart +++ b/lib/feature/home/components/top_sound_pane.dart @@ -31,7 +31,7 @@ class TopSoundPane extends StatelessWidget { child: Row( children: [ const SizedBox(width: 8), - ...sounds.map((d) => ProductCard(key, d)).toList(), + ...sounds.map((d) => ProductCard(key, d)), const SizedBox(width: 8), ], ), diff --git a/lib/feature/home/components/top_story_pane.dart b/lib/feature/home/components/top_story_pane.dart index bc35a23..268394d 100644 --- a/lib/feature/home/components/top_story_pane.dart +++ b/lib/feature/home/components/top_story_pane.dart @@ -31,7 +31,7 @@ class TopStoryPane extends StatelessWidget { child: Row( children: [ const SizedBox(width: 8), - ...stories.map((d) => ProductCard(key, d)).toList(), + ...stories.map((d) => ProductCard(key, d)), const SizedBox(width: 8), ], ), diff --git a/lib/util/formatter/date_time_formatter.dart b/lib/util/formatter/date_time_formatter.dart index 1a769b9..61954f5 100644 --- a/lib/util/formatter/date_time_formatter.dart +++ b/lib/util/formatter/date_time_formatter.dart @@ -4,17 +4,13 @@ class DateTimeFormatter { static String hourAndMinute(DateTime? dateTime) { if (dateTime == null) return ''; final format = NumberFormat('00'); - return format.format(dateTime.hour) + ':' + format.format(dateTime.minute); + return '${format.format(dateTime.hour)}:${format.format(dateTime.minute)}'; } static String monthMinute(DateTime? dateTime) { if (dateTime == null) return ''; final format = NumberFormat('00'); - return format.format(dateTime.month) + - '/' + - format.format(dateTime.day) + - ' ' + - hourAndMinute(dateTime); + return '${format.format(dateTime.month)}/${format.format(dateTime.day)} ${hourAndMinute(dateTime)}'; } static String monthAndDay(DateTime? dateTime) { diff --git a/lib/util/formatter/number_formatter.dart b/lib/util/formatter/number_formatter.dart index 7467c25..37b5155 100644 --- a/lib/util/formatter/number_formatter.dart +++ b/lib/util/formatter/number_formatter.dart @@ -4,7 +4,7 @@ class NumberFormatter { static String hourAndMinute(DateTime? dateTime) { if (dateTime == null) return ''; final format = NumberFormat('00'); - return format.format(dateTime.hour) + ':' + format.format(dateTime.minute); + return '${format.format(dateTime.hour)}:${format.format(dateTime.minute)}'; } static String comma(int value) {