From 2af20926f7b4736ba946d34a3a9fcda03fd19688 Mon Sep 17 00:00:00 2001 From: Npepperlinux Date: Sun, 10 Nov 2024 13:10:30 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D?= =?UTF-8?q?=E3=83=AB=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=A7`isArchived`?= =?UTF-8?q?=E3=82=92=E6=98=8E=E7=A2=BA=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/l10n/app_ja.arb | 1 + lib/view/channels_page/channel_detail_info.dart | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb index 55369c6e0..bb3497262 100644 --- a/lib/l10n/app_ja.arb +++ b/lib/l10n/app_ja.arb @@ -124,6 +124,7 @@ } } }, + "thisChannelIsArchived": "このチャンネルはアーカイブされています", "favorited": "お気に入り中", "willFavorite": "お気に入りに入れるで", "willFollow": "フォローするで", diff --git a/lib/view/channels_page/channel_detail_info.dart b/lib/view/channels_page/channel_detail_info.dart index b1b21a744..281f7328d 100644 --- a/lib/view/channels_page/channel_detail_info.dart +++ b/lib/view/channels_page/channel_detail_info.dart @@ -180,7 +180,15 @@ class ChannelDetailArea extends ConsumerWidget { ), ), ), - const Padding(padding: EdgeInsets.only(top: 10)), + const Padding(padding: EdgeInsets.only(top: 5)), + if (channel.isArchived) + Card( + child: Padding( + padding: const EdgeInsets.all(10), + child: Text(S.of(context).thisChannelIsArchived), + ), + ), + const Padding(padding: EdgeInsets.only(top: 5)), Align( alignment: Alignment.centerRight, child: Wrap( From 7b2c3d68b3d7dd20060ce879b5d0c828f5dae586 Mon Sep 17 00:00:00 2001 From: 4sterisk <4sterisk@ymail.ne.jp> Date: Sun, 10 Nov 2024 19:04:20 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=A2=E3=83=BC=E3=82=AB=E3=82=A4?= =?UTF-8?q?=E3=83=96=E6=99=82=E3=81=AB=E3=81=AF=E3=83=8E=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E9=9D=9E=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../channels_page/channel_detail_page.dart | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/view/channels_page/channel_detail_page.dart b/lib/view/channels_page/channel_detail_page.dart index b5b660a56..87cab08d0 100644 --- a/lib/view/channels_page/channel_detail_page.dart +++ b/lib/view/channels_page/channel_detail_page.dart @@ -70,18 +70,21 @@ class ChannelDetailFloatingActionButton extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { final channelDetail = ref.watch(channelDetailProvider(channelId)); return switch (channelDetail) { - AsyncData(:final value) => FloatingActionButton( - child: const Icon(Icons.edit), - onPressed: () async { - if (!context.mounted) return; - await context.pushRoute( - NoteCreateRoute( - initialAccount: ref.read(accountContextProvider).postAccount, - channel: value.channel, - ), - ); - }, - ), + AsyncData(:final value) => (value.channel.isArchived) + ? const SizedBox.shrink() + : FloatingActionButton( + child: const Icon(Icons.edit), + onPressed: () async { + if (!context.mounted) return; + await context.pushRoute( + NoteCreateRoute( + initialAccount: + ref.read(accountContextProvider).postAccount, + channel: value.channel, + ), + ); + }, + ), _ => const SizedBox.shrink(), }; } From 3ed72b43bfad53757e865c032a3356a9a24dbeeb Mon Sep 17 00:00:00 2001 From: Npepperlinux Date: Tue, 19 Nov 2024 12:50:20 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D?= =?UTF-8?q?=E3=83=AB=E6=A6=82=E8=A6=81=E4=B8=8B=E9=83=A8=E3=81=AB=E7=A9=BA?= =?UTF-8?q?=E7=99=BD=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/view/channels_page/channel_detail_info.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/view/channels_page/channel_detail_info.dart b/lib/view/channels_page/channel_detail_info.dart index 2c9a796b7..66f143b52 100644 --- a/lib/view/channels_page/channel_detail_info.dart +++ b/lib/view/channels_page/channel_detail_info.dart @@ -225,6 +225,7 @@ class ChannelDetailArea extends ConsumerWidget { MfmText(mfmText: channel.description ?? ""), for (final pinnedNote in channel.pinnedNotes ?? []) MisskeyNote(note: pinnedNote), + const Padding(padding: EdgeInsets.only(bottom: 80)), ], ); }