Browse Source

Merge pull request #1068 from nextcloud/fix/neon/notch-clipping

pull/1074/head
Kate 1 year ago committed by GitHub
parent
commit
b617373c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      packages/neon/neon/lib/src/pages/account_settings.dart
  2. 4
      packages/neon/neon/lib/src/pages/home.dart
  3. 4
      packages/neon/neon/lib/src/pages/login.dart
  4. 4
      packages/neon/neon/lib/src/pages/login_check_account.dart
  5. 4
      packages/neon/neon/lib/src/pages/login_check_server_status.dart
  6. 4
      packages/neon/neon/lib/src/pages/login_flow.dart
  7. 4
      packages/neon/neon/lib/src/pages/login_qr_code.dart
  8. 4
      packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart
  9. 4
      packages/neon/neon/lib/src/pages/route_not_found.dart
  10. 4
      packages/neon/neon/lib/src/pages/settings.dart
  11. 4
      packages/neon/neon/lib/src/widgets/app_bar.dart
  12. 4
      packages/neon/neon_files/lib/pages/details.dart
  13. 4
      packages/neon/neon_news/lib/pages/article.dart
  14. 4
      packages/neon/neon_news/lib/pages/feed.dart
  15. 4
      packages/neon/neon_news/lib/pages/folder.dart
  16. 4
      packages/neon/neon_notes/lib/pages/category.dart
  17. 4
      packages/neon/neon_notes/lib/pages/note.dart

4
packages/neon/neon/lib/src/pages/account_settings.dart

@ -144,12 +144,14 @@ class AccountSettingsPage extends StatelessWidget {
return Scaffold(
resizeToAvoidBottomInset: false,
appBar: appBar,
body: Center(
body: SafeArea(
child: Center(
child: ConstrainedBox(
constraints: NeonDialogTheme.of(context).constraints,
child: body,
),
),
),
);
}
}

4
packages/neon/neon/lib/src/pages/home.dart

@ -157,7 +157,9 @@ class _HomePageState extends State<HomePage> {
return const SizedBox();
}
return activeAppIDSnapshot.requireData.page;
return SafeArea(
child: activeAppIDSnapshot.requireData.page,
);
},
);
},

4
packages/neon/neon/lib/src/pages/login.dart

@ -51,7 +51,8 @@ class _LoginPageState extends State<LoginPage> {
leading: const CloseButton(),
)
: null,
body: Center(
body: SafeArea(
child: Center(
child: ConstrainedBox(
constraints: NeonDialogTheme.of(context).constraints,
child: SingleChildScrollView(
@ -121,6 +122,7 @@ class _LoginPageState extends State<LoginPage> {
),
),
),
),
);
}
}

4
packages/neon/neon/lib/src/pages/login_check_account.dart

@ -54,7 +54,8 @@ class _LoginCheckAccountPageState extends State<LoginCheckAccountPage> {
@override
Widget build(final BuildContext context) => Scaffold(
appBar: AppBar(),
body: Center(
body: SafeArea(
child: Center(
child: Padding(
padding: const EdgeInsets.all(10),
child: ConstrainedBox(
@ -110,6 +111,7 @@ class _LoginCheckAccountPageState extends State<LoginCheckAccountPage> {
),
),
),
),
);
Widget _buildAccountTile(final Result<Account> result) {

4
packages/neon/neon/lib/src/pages/login_check_server_status.dart

@ -51,7 +51,8 @@ class _LoginCheckServerStatusPageState extends State<LoginCheckServerStatusPage>
@override
Widget build(final BuildContext context) => Scaffold(
appBar: AppBar(),
body: Center(
body: SafeArea(
child: Center(
child: Padding(
padding: const EdgeInsets.all(10),
child: ConstrainedBox(
@ -90,6 +91,7 @@ class _LoginCheckServerStatusPageState extends State<LoginCheckServerStatusPage>
),
),
),
),
);
void _onContinue() {

4
packages/neon/neon/lib/src/pages/login_flow.dart

@ -57,7 +57,8 @@ class _LoginFlowPageState extends State<LoginFlowPage> {
@override
Widget build(final BuildContext context) => Scaffold(
appBar: AppBar(),
body: Center(
body: SafeArea(
child: Center(
child: Padding(
padding: const EdgeInsets.all(10),
child: ResultBuilder.behaviorSubject(
@ -87,5 +88,6 @@ class _LoginFlowPageState extends State<LoginFlowPage> {
),
),
),
),
);
}

4
packages/neon/neon/lib/src/pages/login_qr_code.dart

@ -23,7 +23,8 @@ class _LoginQRcodePageState extends State<LoginQRcodePage> {
@override
Widget build(final BuildContext context) => Scaffold(
appBar: AppBar(),
body: ReaderWidget(
body: SafeArea(
child: ReaderWidget(
codeFormat: Format.qrCode,
showGallery: false,
showToggleCamera: false,
@ -59,6 +60,7 @@ class _LoginQRcodePageState extends State<LoginQRcodePage> {
}
},
),
),
);
}

4
packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart

@ -61,12 +61,14 @@ class NextcloudAppSettingsPage extends StatelessWidget {
return Scaffold(
resizeToAvoidBottomInset: false,
appBar: appBar,
body: Center(
body: SafeArea(
child: Center(
child: ConstrainedBox(
constraints: NeonDialogTheme.of(context).constraints,
child: body,
),
),
),
);
}
}

4
packages/neon/neon/lib/src/pages/route_not_found.dart

@ -59,8 +59,10 @@ class _RouteNotFoundPageState extends State<RouteNotFoundPage> {
},
),
),
body: Center(
body: SafeArea(
child: Center(
child: Text(NeonLocalizations.of(context).errorRouteNotFound(widget.uri.toString())),
),
),
);
}

4
packages/neon/neon/lib/src/pages/settings.dart

@ -370,12 +370,14 @@ class _SettingsPageState extends State<SettingsPage> {
return Scaffold(
resizeToAvoidBottomInset: false,
appBar: appBar,
body: Center(
body: SafeArea(
child: Center(
child: ConstrainedBox(
constraints: NeonDialogTheme.of(context).constraints,
child: body,
),
),
),
);
}

4
packages/neon/neon/lib/src/widgets/app_bar.dart

@ -233,7 +233,9 @@ class _NotificationIconButtonState extends State<NotificationIconButton> {
],
),
),
body: app.page,
body: SafeArea(
child: app.page,
),
);
await Navigator.of(context).push(

4
packages/neon/neon_files/lib/pages/details.dart

@ -16,7 +16,8 @@ class FilesDetailsPage extends StatelessWidget {
appBar: AppBar(
title: Text(details.name),
),
body: ListView(
body: SafeArea(
child: ListView(
primary: true,
children: [
ColoredBox(
@ -70,5 +71,6 @@ class FilesDetailsPage extends StatelessWidget {
),
],
),
),
);
}

4
packages/neon/neon_news/lib/pages/article.dart

@ -167,7 +167,8 @@ class _NewsArticlePageState extends State<NewsArticlePage> {
],
],
),
body: widget.useWebView
body: SafeArea(
child: widget.useWebView
? WebViewWidget(
controller: _webviewController!,
)
@ -190,5 +191,6 @@ class _NewsArticlePageState extends State<NewsArticlePage> {
),
),
),
),
);
}

4
packages/neon/neon_news/lib/pages/feed.dart

@ -16,7 +16,8 @@ class NewsFeedPage extends StatelessWidget {
appBar: AppBar(
title: Text(feed.title),
),
body: NewsArticlesView(
body: SafeArea(
child: NewsArticlesView(
bloc: NewsArticlesBloc(
bloc,
bloc.options,
@ -26,5 +27,6 @@ class NewsFeedPage extends StatelessWidget {
),
newsBloc: bloc,
),
),
);
}

4
packages/neon/neon_news/lib/pages/folder.dart

@ -16,10 +16,12 @@ class NewsFolderPage extends StatelessWidget {
appBar: AppBar(
title: Text(folder.name),
),
body: NewsFolderView(
body: SafeArea(
child: NewsFolderView(
bloc: bloc,
folder: folder,
),
),
floatingActionButton: NewsFeedFloatingActionButton(
bloc: bloc,
folderID: folder.id,

4
packages/neon/neon_notes/lib/pages/category.dart

@ -16,10 +16,12 @@ class NotesCategoryPage extends StatelessWidget {
appBar: AppBar(
title: Text(category.name.isNotEmpty ? category.name : NotesLocalizations.of(context).categoryUncategorized),
),
body: NotesView(
body: SafeArea(
child: NotesView(
bloc: bloc,
category: category.name,
),
),
floatingActionButton: NotesFloatingActionButton(
bloc: bloc,
category: category.name,

4
packages/neon/neon_notes/lib/pages/note.dart

@ -141,7 +141,8 @@ class _NotesNotePageState extends State<NotesNotePage> {
),
],
),
body: GestureDetector(
body: SafeArea(
child: GestureDetector(
onTap: () {
setState(() {
_showEditor = true;
@ -180,5 +181,6 @@ class _NotesNotePageState extends State<NotesNotePage> {
),
),
),
),
);
}

Loading…
Cancel
Save