From 08b8d318a06fc4e33a8420a20b6ef145549840c5 Mon Sep 17 00:00:00 2001 From: iseruuuuu Date: Sat, 28 Oct 2023 14:25:08 +0900 Subject: [PATCH 1/4] =?UTF-8?q?add:=20=E7=B5=82=E4=BA=86=E3=81=AESnackBar?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/core/components/finish_snack_bar.dart | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 lib/core/components/finish_snack_bar.dart diff --git a/lib/core/components/finish_snack_bar.dart b/lib/core/components/finish_snack_bar.dart new file mode 100644 index 0000000..6491996 --- /dev/null +++ b/lib/core/components/finish_snack_bar.dart @@ -0,0 +1,26 @@ +import 'package:flutter/material.dart'; + +class FinishSnackBar extends StatelessWidget { + const FinishSnackBar({super.key}); + + @override + Widget build(BuildContext context) { + final theme = Theme.of(context); + final textTheme = theme.textTheme; + return DecoratedBox( + decoration: BoxDecoration( + color: const Color(0xFFE6E1E5), + borderRadius: BorderRadius.circular(4), + ), + child: Padding( + padding: const EdgeInsets.all(16), + child: Text( + 'FlutterKaigi2023は終了しました。たくさんの方にご参加いただきありがとうございました。', + style: textTheme.bodyMedium!.copyWith( + color: const Color(0xFF49454F), + ), + ), + ), + ); + } +} From a642dac9c61dbdfc680f25d6aa57e37cbbb436de Mon Sep 17 00:00:00 2001 From: iseruuuuu Date: Sat, 28 Oct 2023 14:25:29 +0900 Subject: [PATCH 2/4] =?UTF-8?q?add;=20=E3=83=8F=E3=83=B3=E3=82=BA=E3=82=AA?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E6=96=87=E8=A8=80=E3=82=92=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/features/event/hands-on/ui/hands_on_event.dart | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/features/event/hands-on/ui/hands_on_event.dart b/lib/features/event/hands-on/ui/hands_on_event.dart index 342f730..afdfe2b 100644 --- a/lib/features/event/hands-on/ui/hands_on_event.dart +++ b/lib/features/event/hands-on/ui/hands_on_event.dart @@ -12,11 +12,9 @@ class HandsOnEvent extends StatelessWidget { @override Widget build(BuildContext context) { - const text = - // ignore: lines_longer_than_80_chars - '今年のハンズオンは10月26日をもって終了しました。多くの皆様にご参加いただき誠にありがとうございました。FlutterKaigi本編にもご参加される方には先着15名の限定ノベルティを用意しております。ノベルティの配布は、受付とは別に会場内に設置した専用のコーナーで行いますのでご注意ください。'; + const text = '今年のハンズオンは10月26日をもって終了しました。多くの皆様にご参加いただき誠にありがとうございました。'; return WantedWidget( - title: 'Have a blast!', + title: 'Thanks for joining us!', ticketButtonTitle: 'イベント詳細ページ', content: text, ticketOnPressed: () async => launchUrlString( From acfaea5c63f6b433c1ed36dddca6013ee1cba436 Mon Sep 17 00:00:00 2001 From: iseruuuuu Date: Sat, 28 Oct 2023 14:25:49 +0900 Subject: [PATCH 3/4] =?UTF-8?q?HomePage=E3=81=ABSnackBar=E3=82=92=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app/home_page.dart | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/app/home_page.dart b/lib/app/home_page.dart index b6c95cc..5c41afb 100644 --- a/lib/app/home_page.dart +++ b/lib/app/home_page.dart @@ -1,6 +1,7 @@ import 'dart:math'; import 'package:confwebsite2023/app/router/router.dart'; +import 'package:confwebsite2023/core/components/finish_snack_bar.dart'; import 'package:confwebsite2023/core/components/responsive_widget.dart'; import 'package:confwebsite2023/core/theme.dart'; import 'package:confwebsite2023/features/access/ui/access_widget.dart'; @@ -151,7 +152,14 @@ class _MainPageBody extends StatelessWidget { controller: scrollController, slivers: [ const SliverToBoxAdapter( - child: Spaces.vertical_40, + child: Spaces.vertical_80, + ), + _Sliver( + padding: padding, + child: const FinishSnackBar(), + ), + const SliverToBoxAdapter( + child: Spaces.vertical_80, ), _Sliver( padding: padding, From 494a31208b3cfb8f64b54cca70471cf1a104da20 Mon Sep 17 00:00:00 2001 From: iseruuuuu Date: Thu, 2 Nov 2023 16:10:22 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E3=82=A2=E3=83=8A=E3=82=A6=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app/home_page.dart | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/app/home_page.dart b/lib/app/home_page.dart index 5c41afb..28e8953 100644 --- a/lib/app/home_page.dart +++ b/lib/app/home_page.dart @@ -5,7 +5,6 @@ import 'package:confwebsite2023/core/components/finish_snack_bar.dart'; import 'package:confwebsite2023/core/components/responsive_widget.dart'; import 'package:confwebsite2023/core/theme.dart'; import 'package:confwebsite2023/features/access/ui/access_widget.dart'; -import 'package:confwebsite2023/features/announcement/ui/announcement_section.dart'; import 'package:confwebsite2023/features/app_links/ui/app_links_section.dart'; import 'package:confwebsite2023/features/count_down/model/count_down_timer.dart'; import 'package:confwebsite2023/features/count_down/ui/count_down_section.dart'; @@ -34,7 +33,6 @@ class MainPage extends HookWidget { access: GlobalObjectKey('accessSectionKey'), event: GlobalObjectKey('eventSectionKey'), session: GlobalObjectKey('sessionSectionKey'), - announcement: GlobalObjectKey('announcementSectionKey'), sponsor: GlobalObjectKey('sponsorSectionKey'), staff: GlobalObjectKey('staffSectionKey'), ); @@ -62,10 +60,6 @@ class MainPage extends HookWidget { title: 'Event', onPressed: () async => scrollToSection(sectionKeys.event), ), - HeaderItemButtonData( - title: 'Announcement', - onPressed: () async => scrollToSection(sectionKeys.announcement), - ), HeaderItemButtonData( title: 'Sponsor', onPressed: () async => scrollToSection(sectionKeys.sponsor), @@ -113,7 +107,6 @@ class _MainPageBody extends StatelessWidget { GlobalObjectKey access, GlobalObjectKey event, GlobalObjectKey session, - GlobalObjectKey announcement, GlobalObjectKey sponsor, GlobalObjectKey staff }) sectionKeys; @@ -218,15 +211,6 @@ class _MainPageBody extends StatelessWidget { const SliverToBoxAdapter( child: Spaces.vertical_200, ), - _Sliver( - padding: padding, - child: AnnouncementSection( - key: sectionKeys.announcement, - ), - ), - const SliverToBoxAdapter( - child: Spaces.vertical_200, - ), _Sliver( padding: padding, child: SponsorsSection(