diff --git a/lib/view/page/container.dart b/lib/view/page/container.dart index 7faa8109..15566123 100644 --- a/lib/view/page/container.dart +++ b/lib/view/page/container.dart @@ -60,7 +60,7 @@ class _ContainerPageState extends State { builder: (_, __) => Consumer( builder: (_, ___, __) { return Scaffold( - appBar: CustomAppBar( + appBar: AppBar( centerTitle: true, title: TwoLineText(up: l10n.container, down: widget.spi.name), actions: [ diff --git a/lib/view/page/editor.dart b/lib/view/page/editor.dart index be6b7be9..e07756eb 100644 --- a/lib/view/page/editor.dart +++ b/lib/view/page/editor.dart @@ -107,7 +107,7 @@ class _EditorPageState extends State { } PreferredSizeWidget _buildAppBar() { - return CustomAppBar( + return AppBar( centerTitle: true, title: TwoLineText( up: widget.args?.title ?? diff --git a/lib/view/page/iperf.dart b/lib/view/page/iperf.dart index 2a75e88a..7cdb67ea 100644 --- a/lib/view/page/iperf.dart +++ b/lib/view/page/iperf.dart @@ -26,8 +26,8 @@ class _IPerfPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: const CustomAppBar( - title: Text('iperf'), + appBar: AppBar( + title: const Text('iperf'), ), body: _buildBody(), floatingActionButton: _buildFAB(), diff --git a/lib/view/page/private_key/edit.dart b/lib/view/page/private_key/edit.dart index 321a25aa..a37319d2 100644 --- a/lib/view/page/private_key/edit.dart +++ b/lib/view/page/private_key/edit.dart @@ -78,7 +78,7 @@ class _PrivateKeyEditPageState extends State { ); } - CustomAppBar _buildAppBar() { + AppBar _buildAppBar() { final actions = [ IconButton( tooltip: libL10n.delete, @@ -101,7 +101,7 @@ class _PrivateKeyEditPageState extends State { icon: const Icon(Icons.delete), ) ]; - return CustomAppBar( + return AppBar( title: Text(libL10n.edit), actions: widget.pki == null ? null : actions, ); diff --git a/lib/view/page/process.dart b/lib/view/page/process.dart index 16a9e9ea..cfe29bde 100644 --- a/lib/view/page/process.dart +++ b/lib/view/page/process.dart @@ -123,7 +123,7 @@ class _ProcessPageState extends State { ); } return Scaffold( - appBar: CustomAppBar( + appBar: AppBar( centerTitle: true, title: TwoLineText(up: widget.spi.name, down: l10n.process), actions: actions, diff --git a/lib/view/page/pve.dart b/lib/view/page/pve.dart index 10e33c43..dfadb8f5 100644 --- a/lib/view/page/pve.dart +++ b/lib/view/page/pve.dart @@ -52,7 +52,7 @@ final class _PvePageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar( + appBar: AppBar( title: TwoLineText(up: 'PVE', down: widget.spi.name), actions: [ ValBuilder( diff --git a/lib/view/page/server/detail/view.dart b/lib/view/page/server/detail/view.dart index 84c7f411..81f28eb8 100644 --- a/lib/view/page/server/detail/view.dart +++ b/lib/view/page/server/detail/view.dart @@ -87,7 +87,7 @@ class _ServerDetailPageState extends State final s = widget.spi.server; if (s == null) { return Scaffold( - appBar: const CustomAppBar(), + appBar: AppBar(), body: Center(child: Text(libL10n.empty)), ); } @@ -120,8 +120,8 @@ class _ServerDetailPageState extends State ); } - CustomAppBar _buildAppBar(Server si) { - return CustomAppBar( + AppBar _buildAppBar(Server si) { + return AppBar( title: Hero( tag: 'home_card_title_${si.spi.id}', transitionOnUserGestures: true, diff --git a/lib/view/page/server/edit.dart b/lib/view/page/server/edit.dart index ac000c2b..4230c436 100644 --- a/lib/view/page/server/edit.dart +++ b/lib/view/page/server/edit.dart @@ -110,7 +110,7 @@ class _ServerEditPageState extends State with AfterLayoutMixin { return GestureDetector( onTap: () => _focusScope.unfocus(), child: Scaffold( - appBar: CustomAppBar(title: Text(libL10n.edit), actions: actions), + appBar: AppBar(title: Text(libL10n.edit), actions: actions), body: _buildForm(), floatingActionButton: _buildFAB(), ), diff --git a/lib/view/page/setting/platform/android.dart b/lib/view/page/setting/platform/android.dart index 1f898973..4959e8bd 100644 --- a/lib/view/page/setting/platform/android.dart +++ b/lib/view/page/setting/platform/android.dart @@ -17,7 +17,7 @@ class _AndroidSettingsPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: const CustomAppBar(title: Text('Android')), + appBar: AppBar(title: const Text('Android')), body: ListView( padding: const EdgeInsets.symmetric(horizontal: 17), children: [ diff --git a/lib/view/page/setting/platform/ios.dart b/lib/view/page/setting/platform/ios.dart index 5063aec2..88b862d0 100644 --- a/lib/view/page/setting/platform/ios.dart +++ b/lib/view/page/setting/platform/ios.dart @@ -27,7 +27,7 @@ class _IOSSettingsPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: const CustomAppBar(title: Text('iOS')), + appBar: AppBar(title: const Text('iOS')), body: ListView( padding: const EdgeInsets.symmetric(horizontal: 17), children: [ diff --git a/lib/view/page/setting/seq/srv_detail_seq.dart b/lib/view/page/setting/seq/srv_detail_seq.dart index ccf6df8e..ed919529 100644 --- a/lib/view/page/setting/seq/srv_detail_seq.dart +++ b/lib/view/page/setting/seq/srv_detail_seq.dart @@ -17,7 +17,7 @@ class _ServerDetailOrderPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar(title: Text(l10n.serverDetailOrder)), + appBar: AppBar(title: Text(l10n.serverDetailOrder)), body: _buildBody(), ); } diff --git a/lib/view/page/setting/seq/srv_func_seq.dart b/lib/view/page/setting/seq/srv_func_seq.dart index e50ffc81..775cab86 100644 --- a/lib/view/page/setting/seq/srv_func_seq.dart +++ b/lib/view/page/setting/seq/srv_func_seq.dart @@ -17,7 +17,7 @@ class _ServerDetailOrderPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar(title: Text(l10n.sequence)), + appBar: AppBar(title: Text(l10n.sequence)), body: _buildBody(), ); } diff --git a/lib/view/page/setting/seq/srv_seq.dart b/lib/view/page/setting/seq/srv_seq.dart index d74970ba..b5b20108 100644 --- a/lib/view/page/setting/seq/srv_seq.dart +++ b/lib/view/page/setting/seq/srv_seq.dart @@ -16,7 +16,7 @@ class _ServerOrderPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar(title: Text(l10n.serverOrder)), + appBar: AppBar(title: Text(l10n.serverOrder)), body: _buildBody(), ); } diff --git a/lib/view/page/setting/seq/virt_key.dart b/lib/view/page/setting/seq/virt_key.dart index 30d2a1d9..d2d0f6ad 100644 --- a/lib/view/page/setting/seq/virt_key.dart +++ b/lib/view/page/setting/seq/virt_key.dart @@ -17,7 +17,7 @@ class _SSHVirtKeySettingPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar(title: Text(l10n.editVirtKeys)), + appBar: AppBar(title: Text(l10n.editVirtKeys)), body: Column( children: [ Padding( diff --git a/lib/view/page/snippet/edit.dart b/lib/view/page/snippet/edit.dart index c48ca410..2491d8a8 100644 --- a/lib/view/page/snippet/edit.dart +++ b/lib/view/page/snippet/edit.dart @@ -38,7 +38,7 @@ class _SnippetEditPageState extends State @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar( + appBar: AppBar( title: Text(libL10n.edit), actions: _buildAppBarActions(), ), diff --git a/lib/view/page/snippet/result.dart b/lib/view/page/snippet/result.dart index bc8f606c..f38ac6e9 100644 --- a/lib/view/page/snippet/result.dart +++ b/lib/view/page/snippet/result.dart @@ -11,7 +11,7 @@ class SnippetResultPage extends StatelessWidget { @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar(title: Text(l10n.result)), + appBar: AppBar(title: Text(l10n.result)), body: _buildBody(), ); } diff --git a/lib/view/page/storage/local.dart b/lib/view/page/storage/local.dart index 0fba4d90..396d87e0 100644 --- a/lib/view/page/storage/local.dart +++ b/lib/view/page/storage/local.dart @@ -53,7 +53,7 @@ class _LocalFilePageState extends State super.build(context); final title = _path.path.fileNameGetter ?? libL10n.file; return Scaffold( - appBar: CustomAppBar( + appBar: AppBar( title: AnimatedSwitcher( duration: Durations.short3, child: Text(title, key: ValueKey(title)), diff --git a/lib/view/page/storage/sftp.dart b/lib/view/page/storage/sftp.dart index c13a3858..d54535fb 100644 --- a/lib/view/page/storage/sftp.dart +++ b/lib/view/page/storage/sftp.dart @@ -62,7 +62,7 @@ class _SftpPageState extends State with AfterLayoutMixin { if (isDesktop) children.add(_buildRefreshBtn()); return Scaffold( - appBar: CustomAppBar( + appBar: AppBar( title: TwoLineText(up: 'SFTP', down: widget.spi.name), actions: children, ), diff --git a/lib/view/page/storage/sftp_mission.dart b/lib/view/page/storage/sftp_mission.dart index 67490fd2..6d64658b 100644 --- a/lib/view/page/storage/sftp_mission.dart +++ b/lib/view/page/storage/sftp_mission.dart @@ -16,7 +16,7 @@ class _SftpMissionPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar( + appBar: AppBar( title: Text(l10n.mission, style: UIs.text18), ), body: _buildBody(), diff --git a/lib/view/page/systemd.dart b/lib/view/page/systemd.dart index f4963651..446e01c4 100644 --- a/lib/view/page/systemd.dart +++ b/lib/view/page/systemd.dart @@ -42,7 +42,7 @@ final class _SystemdPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: CustomAppBar( + appBar: AppBar( title: const Text('Systemd'), actions: isDesktop ? [Btn.icon(icon: const Icon(Icons.refresh), onTap: _pro.getUnits)]