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

feat: add adaptive navigation for settings #127

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
May 4, 2024
Merged

feat: add adaptive navigation for settings #127

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
28b8fd4
refactor: set `ColorScheme.surface`
poppingmoon May 3, 2024
e60bd23
feat: add adaptive navigation for settings
poppingmoon May 4, 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
1 change: 1 addition & 0 deletions lib/provider/theme_data_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ThemeData themeData(ThemeDataRef ref, Brightness brightness) {
brightness: colors.isDark ? Brightness.dark : Brightness.light,
primary: colors.accent,
onPrimary: colors.fgOnAccent,
surface: colors.panel,
onSurface: colors.fg,
onSurfaceVariant: colors.fg,
background: colors.bg,
Expand Down
2 changes: 1 addition & 1 deletion lib/provider/theme_data_provider.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

193 changes: 101 additions & 92 deletions lib/view/page/about_aria_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,109 +19,118 @@ class AboutAriaPage extends HookConsumerWidget {

return Scaffold(
appBar: AppBar(title: Text(t.aria.aboutAria)),
body: ListView(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
ClipRRect(
borderRadius: BorderRadius.circular(16.0),
child: Assets.a.image(width: 80.0, height: 80.0),
),
const Text('Aria'),
FutureBuilder(
future: PackageInfo.fromPlatform(),
builder: (context, snapshot) {
if (snapshot case AsyncSnapshot(:final data?)) {
return Text(data.version);
} else {
return const SizedBox.shrink();
}
},
body: Center(
child: SizedBox(
width: 800.0,
child: ListView(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
ClipRRect(
borderRadius: BorderRadius.circular(16.0),
child: Assets.a.image(width: 80.0, height: 80.0),
),
const Text('Aria'),
FutureBuilder(
future: PackageInfo.fromPlatform(),
builder: (context, snapshot) {
if (snapshot case AsyncSnapshot(:final data?)) {
return Text(data.version);
} else {
return const SizedBox.shrink();
}
},
),
],
),
],
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Center(
child: Text.rich(
t.aria.acknowledgements(
miria: WidgetSpan(
alignment: PlaceholderAlignment.baseline,
baseline: TextBaseline.alphabetic,
child: InkWell(
onTap: () => launchUrl(
Uri.https('github.com', 'shiosyakeyakini-info/miria'),
),
onLongPress: () => showModalBottomSheet<void>(
context: context,
builder: (context) => const UrlSheet(
url: 'https://github.com/shiosyakeyakini-info/miria',
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Center(
child: Text.rich(
t.aria.acknowledgements(
miria: WidgetSpan(
alignment: PlaceholderAlignment.baseline,
baseline: TextBaseline.alphabetic,
child: InkWell(
onTap: () => launchUrl(
Uri.https(
'github.com',
'shiosyakeyakini-info/miria',
),
),
onLongPress: () => showModalBottomSheet<void>(
context: context,
builder: (context) => const UrlSheet(
url:
'https://github.com/shiosyakeyakini-info/miria',
),
),
child: Text(
'Miria',
style: TextStyle(color: colors.link),
),
),
),
child: Text(
'Miria',
style: TextStyle(color: colors.link),
),
),
),
misskey: WidgetSpan(
alignment: PlaceholderAlignment.baseline,
baseline: TextBaseline.alphabetic,
child: InkWell(
onTap: () => launchUrl(
Uri.https('github.com', 'misskey-dev/misskey'),
),
onLongPress: () => showModalBottomSheet<void>(
context: context,
builder: (context) => const UrlSheet(
url: 'https://github.com/misskey-dev/misskey',
misskey: WidgetSpan(
alignment: PlaceholderAlignment.baseline,
baseline: TextBaseline.alphabetic,
child: InkWell(
onTap: () => launchUrl(
Uri.https('github.com', 'misskey-dev/misskey'),
),
onLongPress: () => showModalBottomSheet<void>(
context: context,
builder: (context) => const UrlSheet(
url: 'https://github.com/misskey-dev/misskey',
),
),
child: Text(
'Misskey',
style: TextStyle(color: colors.link),
),
),
),
child: Text(
'Misskey',
style: TextStyle(color: colors.link),
),
),
),
),
),
),
),
const Divider(),
ListTile(
leading: const Icon(Icons.code),
title: Text(t.misskey.aboutMisskey_.source),
onTap: () => launchUrl(
Uri.https('github.com', 'poppingmoon/aria'),
mode: LaunchMode.externalApplication,
),
),
ListTile(
leading: const Icon(Icons.alternate_email),
title: Text(t.misskey.contact),
onTap: () => context.push('/misskey.io/users/9qaqpdbgn1nk03sc'),
),
ListTile(
leading: const Icon(Icons.list),
title: Text(t.misskey.license),
onTap: () async {
final packageInfo = await PackageInfo.fromPlatform();
if (!context.mounted) return;
showLicensePage(
context: context,
applicationVersion: packageInfo.version,
applicationIcon: ClipRRect(
borderRadius: BorderRadius.circular(16.0),
child: Assets.a.image(width: 80.0, height: 80.0),
const Divider(),
ListTile(
leading: const Icon(Icons.code),
title: Text(t.misskey.aboutMisskey_.source),
onTap: () => launchUrl(
Uri.https('github.com', 'poppingmoon/aria'),
mode: LaunchMode.externalApplication,
),
applicationLegalese: 'Licensed under AGPL v3',
);
},
),
ListTile(
leading: const Icon(Icons.alternate_email),
title: Text(t.misskey.contact),
onTap: () => context.push('/misskey.io/users/9qaqpdbgn1nk03sc'),
),
ListTile(
leading: const Icon(Icons.list),
title: Text(t.misskey.license),
onTap: () async {
final packageInfo = await PackageInfo.fromPlatform();
if (!context.mounted) return;
showLicensePage(
context: context,
applicationVersion: packageInfo.version,
applicationIcon: ClipRRect(
borderRadius: BorderRadius.circular(16.0),
child: Assets.a.image(width: 80.0, height: 80.0),
),
applicationLegalese: 'Licensed under AGPL v3',
);
},
),
],
),
],
),
),
);
}
Expand Down
115 changes: 60 additions & 55 deletions lib/view/page/about_misskey_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,64 +12,69 @@ class AboutMisskeyPage extends ConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
return Scaffold(
appBar: AppBar(title: Text(t.misskey.aboutMisskey)),
body: ListView(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
ClipRRect(
borderRadius: BorderRadius.circular(16.0),
child: Assets.misskey.packages.frontend.assets.aboutIcon
.image(width: 80.0, height: 80.0),
body: Center(
child: SizedBox(
width: 800.0,
child: ListView(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
ClipRRect(
borderRadius: BorderRadius.circular(16.0),
child: Assets.misskey.packages.frontend.assets.aboutIcon
.image(width: 80.0, height: 80.0),
),
const Text('Misskey'),
],
),
const Text('Misskey'),
],
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Text(t.misskey.aboutMisskey_.about),
TextButton(
onPressed: () => launchUrl(
Uri.https('misskey-hub.net', 'docs/about-misskey'),
mode: LaunchMode.externalApplication,
),
child: Text(t.misskey.learnMore),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
children: [
Text(t.misskey.aboutMisskey_.about),
TextButton(
onPressed: () => launchUrl(
Uri.https('misskey-hub.net', 'docs/about-misskey'),
mode: LaunchMode.externalApplication,
),
child: Text(t.misskey.learnMore),
),
],
),
],
),
),
const Divider(),
ListTile(
leading: const Icon(Icons.code),
title: Text(
'${t.misskey.aboutMisskey_.source} (${t.misskey.aboutMisskey_.original})',
),
onTap: () => launchUrl(
Uri.https('github.com', 'misskey-dev/misskey'),
mode: LaunchMode.externalApplication,
),
),
ListTile(
leading: const Icon(Icons.translate),
title: Text(t.misskey.aboutMisskey_.translation),
onTap: () => launchUrl(
Uri.https('crowdin.com', 'project/misskey'),
mode: LaunchMode.externalApplication,
),
),
ListTile(
leading: const Icon(Icons.savings),
title: Text(t.misskey.aboutMisskey_.donate),
onTap: () => launchUrl(
Uri.https('www.patreon.com', 'syuilo'),
mode: LaunchMode.externalApplication,
),
),
const Divider(),
ListTile(
leading: const Icon(Icons.code),
title: Text(
'${t.misskey.aboutMisskey_.source} (${t.misskey.aboutMisskey_.original})',
),
onTap: () => launchUrl(
Uri.https('github.com', 'misskey-dev/misskey'),
mode: LaunchMode.externalApplication,
),
),
ListTile(
leading: const Icon(Icons.translate),
title: Text(t.misskey.aboutMisskey_.translation),
onTap: () => launchUrl(
Uri.https('crowdin.com', 'project/misskey'),
mode: LaunchMode.externalApplication,
),
),
ListTile(
leading: const Icon(Icons.savings),
title: Text(t.misskey.aboutMisskey_.donate),
onTap: () => launchUrl(
Uri.https('www.patreon.com', 'syuilo'),
mode: LaunchMode.externalApplication,
),
),
],
),
],
),
),
);
}
Expand Down
9 changes: 3 additions & 6 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,7 +6,6 @@ import '../../i18n/strings.g.dart';
import '../../model/account.dart';
import '../../model/antenna_settings.dart';
import '../../provider/api/antennas_notifier_provider.dart';
import '../../provider/misskey_colors_provider.dart';
import '../dialog/antenna_settings_dialog.dart';
import '../widget/error_message.dart';

Expand All @@ -18,8 +17,6 @@ class AntennasPage extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final antennas = ref.watch(antennasNotifierProvider(account));
final colors =
ref.watch(misskeyColorsProvider(Theme.of(context).brightness));

return Scaffold(
appBar: AppBar(title: Text(t.misskey.antennas)),
Expand All @@ -33,7 +30,7 @@ class AntennasPage extends ConsumerWidget {
width: 800.0,
margin: const EdgeInsets.symmetric(horizontal: 8.0),
child: ListTileTheme(
tileColor: colors.panel,
tileColor: Theme.of(context).colorScheme.surface,
child: ListView(
children: [
Container(
Expand All @@ -44,7 +41,7 @@ class AntennasPage extends ConsumerWidget {
topLeft: Radius.circular(8.0),
topRight: Radius.circular(8.0),
),
color: colors.panel,
color: Theme.of(context).colorScheme.surface,
),
),
...ListTile.divideTiles(
Expand Down Expand Up @@ -72,7 +69,7 @@ class AntennasPage extends ConsumerWidget {
bottomLeft: Radius.circular(8.0),
bottomRight: Radius.circular(8.0),
),
color: colors.panel,
color: Theme.of(context).colorScheme.surface,
),
),
],
Expand Down
Loading