这是indexloc提供的服务，不要输入任何密码
Skip to content

feat: create antenna on tap create button #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 16, 2024
Merged

feat: create antenna on tap create button #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd8587a
fix: correct title of AntennaDialog
poppingmoon Jun 16, 2024
a5feea5
feat: create antenna on tap create button
poppingmoon Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions lib/view/dialog/antenna_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import 'package:misskey_dart/misskey_dart.dart';
import '../../extension/user_extension.dart';
import '../../i18n/strings.g.dart';
import '../../model/account.dart';
import '../../model/antenna_settings.dart';
import '../../provider/api/antennas_notifier_provider.dart';
import '../../util/future_with_dialog.dart';
import 'antenna_settings_dialog.dart';

class AntennaDialog extends HookConsumerWidget {
const AntennaDialog({
Expand All @@ -25,7 +27,7 @@ class AntennaDialog extends HookConsumerWidget {
antennas?.where((antenna) => antenna.src == AntennaSource.users);

return SimpleDialog(
title: Text(t.misskey.addToList),
title: Text(t.misskey.addToAntenna),
children: [
...?userAntennas?.map(
(antenna) => CheckboxListTile(
Expand Down Expand Up @@ -56,7 +58,31 @@ class AntennaDialog extends HookConsumerWidget {
ListTile(
leading: const Icon(Icons.add),
title: Text(t.misskey.create),
onTap: () async {},
onTap: () async {
final result = await showDialog<AntennaSettings>(
context: context,
builder: (context) => AntennaSettingsDialog(
account: account,
settings: const AntennaSettings(src: AntennaSource.users),
),
);
if (!ref.context.mounted) return;
if (result != null) {
await futureWithDialog(
ref.context,
ref.read(antennasNotifierProvider(account).notifier).create(
name: result.name ?? '',
src: result.src,
keywords: result.keywords,
excludeKeywords: result.excludeKeywords,
users: result.users,
caseSensitive: result.caseSensitive,
withReplies: result.withReplies,
withFile: result.withFile,
),
);
}
},
),
],
);
Expand Down
3 changes: 2 additions & 1 deletion lib/view/dialog/antenna_settings_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ class AntennaSettingsDialog extends HookConsumerWidget {
lists?.firstWhereOrNull((list) => list.id == settings.value.userListId);

return AlertDialog(
title: Text(this.settings == null ? t.misskey.create : t.misskey.edit),
title:
Text(this.settings?.name == null ? t.misskey.create : t.misskey.edit),
content: Column(
children: [
ListTile(
Expand Down
25 changes: 15 additions & 10 deletions lib/view/page/antennas_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import '../../i18n/strings.g.dart';
import '../../model/account.dart';
import '../../model/antenna_settings.dart';
import '../../provider/api/antennas_notifier_provider.dart';
import '../../util/future_with_dialog.dart';
import '../dialog/antenna_settings_dialog.dart';
import '../widget/error_message.dart';

Expand Down Expand Up @@ -88,17 +89,21 @@ class AntennasPage extends ConsumerWidget {
context: context,
builder: (context) => AntennaSettingsDialog(account: account),
);
if (!context.mounted) return;
if (result != null) {
await ref.read(antennasNotifierProvider(account).notifier).create(
name: result.name ?? '',
src: result.src,
keywords: result.keywords,
excludeKeywords: result.excludeKeywords,
users: result.users,
caseSensitive: result.caseSensitive,
withReplies: result.withReplies,
withFile: result.withFile,
);
await futureWithDialog(
context,
ref.read(antennasNotifierProvider(account).notifier).create(
name: result.name ?? '',
src: result.src,
keywords: result.keywords,
excludeKeywords: result.excludeKeywords,
users: result.users,
caseSensitive: result.caseSensitive,
withReplies: result.withReplies,
withFile: result.withFile,
),
);
}
},
child: const Icon(Icons.add),
Expand Down