Skip to content

Commit 64687c8

Browse files
Restoring old format for irrelevant changes
1 parent 86bf83b commit 64687c8

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

modules/ensemble/lib/framework/view/page.dart

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import 'package:ensemble/widget/helpers/controllers.dart';
2424
import 'package:ensemble/widget/helpers/unfocus.dart';
2525
import 'package:flutter/material.dart';
2626

27-
2827
class SinglePageController extends WidgetController {
2928
TextStyleComposite? _textStyle;
3029
int? maxLines;
@@ -284,11 +283,9 @@ class PageState extends State<Page>
284283
/// create AppBar that is part of a CustomScrollView
285284
Widget? buildSliverAppBar(SinglePageModel pageModel, bool hasDrawer) {
286285
if (pageModel.headerModel != null) {
287-
dynamic appBar = _buildAppBar(
288-
pageModel.headerModel!,
289-
scrollableView: true,
290-
showNavigationIcon: pageModel.runtimeStyles?['showNavigationIcon'],
291-
);
286+
dynamic appBar = _buildAppBar(pageModel.headerModel!,
287+
scrollableView: true,
288+
showNavigationIcon: pageModel.runtimeStyles?['showNavigationIcon']);
292289
if (appBar is SliverAppBar || appBar is AnimatedAppBar) {
293290
return appBar;
294291
}
@@ -320,9 +317,7 @@ class PageState extends State<Page>
320317

321318
/// fixed AppBar
322319
dynamic _buildAppBar(HeaderModel headerModel,
323-
{required bool scrollableView,
324-
bool? showNavigationIcon,
325-
}) {
320+
{required bool scrollableView, bool? showNavigationIcon}) {
326321
Widget? titleWidget;
327322

328323

@@ -616,6 +611,7 @@ class PageState extends State<Page>
616611
if (appBar != null) {
617612
slivers.add(appBar);
618613
}
614+
619615
// body
620616
slivers.add(SliverToBoxAdapter(
621617
child: getBody(appBar != null),

modules/ensemble/lib/page_model.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ class SinglePageModel extends PageModel with HasStyles {
382382
background = ViewUtil.buildModel(
383383
headerData['flexibleBackground'], customViewDefinitions);
384384
}
385+
385386
styles = EnsembleThemeManager.yamlToDart(headerData['styles']);
386387
classList = HasStyles.toClassList(
387388
headerData[ViewUtil.classNameAttribute] as String?);
@@ -394,14 +395,12 @@ class SinglePageModel extends PageModel with HasStyles {
394395
leadingWidget != null ||
395396
classList != null) {
396397
headerModel = HeaderModel(
397-
398-
titleText: titleText,
399-
titleWidget: titleWidget,
400-
flexibleBackground: background,
401-
leadingWidget: leadingWidget,
402-
inlineStyles: styles,
403-
classList: classList,
404-
);
398+
titleText: titleText,
399+
titleWidget: titleWidget,
400+
flexibleBackground: background,
401+
leadingWidget: leadingWidget,
402+
inlineStyles: styles,
403+
classList: classList);
405404
}
406405
}
407406

@@ -556,6 +555,7 @@ class HeaderModel extends Object with HasStyles {
556555

557556
WidgetModel? flexibleBackground;
558557
}
558+
559559
class FooterItems extends Object with HasStyles {
560560
final List<WidgetModel> children;
561561
Map<String, dynamic>? inlineStyles;

0 commit comments

Comments
 (0)