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

fix: add space on pages with extended FABs #187

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 1 commit into from
May 25, 2024
Merged

fix: add space on pages with extended FABs #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/view/page/channel/channel_home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ class ChannelHome extends ConsumerWidget {
),
itemCount: channel.pinnedNoteIds.length,
),
const SliverToBoxAdapter(child: SizedBox(height: 80.0)),
],
),
);
Expand Down
1 change: 1 addition & 0 deletions lib/view/page/post_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,7 @@ class PostPage extends HookConsumerWidget {
showFooter: false,
),
),
const SizedBox(height: 80.0),
],
),
),
Expand Down
54 changes: 32 additions & 22 deletions lib/view/page/settings/accounts_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,40 @@ class AccountsPage extends HookConsumerWidget {
? Center(child: Text(t.aria.noAccounts))
: ReorderableListView.builder(
itemBuilder: (context, index) {
final account = accounts[index];
final i = ref.watch(iNotifierProvider(account)).valueOrNull;
return ReorderableDragStartListenerWrapper(
key: ValueKey(index),
index: index,
child: Card(
color: Theme.of(context).colorScheme.surface,
elevation: 0.0,
clipBehavior: Clip.hardEdge,
child: ListTile(
leading: i != null
? UserAvatar(account: account, user: i, size: 40.0)
: null,
title: i != null
? UsernameWidget(account: account, user: i)
: null,
subtitle: Text(account.toString()),
trailing: const Icon(Icons.drag_handle),
onTap: () => context.push('/settings/accounts/$account'),
if (index < accounts.length) {
final account = accounts[index];
final i = ref.watch(iNotifierProvider(account)).valueOrNull;
return ReorderableDragStartListenerWrapper(
key: ValueKey(index),
index: index,
child: Card(
color: Theme.of(context).colorScheme.surface,
elevation: 0.0,
clipBehavior: Clip.hardEdge,
child: ListTile(
leading: i != null
? UserAvatar(account: account, user: i, size: 40.0)
: null,
title: i != null
? UsernameWidget(account: account, user: i)
: null,
subtitle: Text(account.toString()),
trailing: const Icon(Icons.drag_handle),
onTap: () =>
context.push('/settings/accounts/$account'),
),
),
),
);
);
} else {
return ReorderableDragStartListener(
key: ValueKey(index),
index: index,
enabled: false,
child: const SizedBox(height: 80.0),
);
}
},
itemCount: accounts.length,
itemCount: accounts.length + 1,
onReorder: (oldIndex, newIndex) => ref
.read(accountsNotifierProvider.notifier)
.reorder(oldIndex, newIndex),
Expand Down
1 change: 1 addition & 0 deletions lib/view/page/settings/tab_settings_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,7 @@ class TabSettingsPage extends HookConsumerWidget {
tabSettings.value.copyWith(withSensitive: value),
),
],
const SizedBox(height: 80.0),
],
),
),
Expand Down
14 changes: 8 additions & 6 deletions lib/view/page/settings/theme_manage_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,9 @@ class ThemeManagePage extends ConsumerWidget {
child: SizedBox(
width: 800.0,
child: codes.isNotEmpty
? ListView(
children: List.generate(
codes.length,
(index) {
? ListView.builder(
itemBuilder: (context, index) {
if (index < codes.length) {
final theme = themes[index];
return ExpansionTile(
leading: Icon(
Expand Down Expand Up @@ -185,8 +184,11 @@ class ThemeManagePage extends ConsumerWidget {
),
],
);
},
),
} else {
return const SizedBox(height: 80.0);
}
},
itemCount: codes.length + 1,
)
: Center(child: Text(t.aria.noThemes)),
),
Expand Down