diff --git a/CHANGELOG.md b/CHANGELOG.md index 01642d83..ad455dc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 0.1.0 +- Remove unnecessary import and update example project's dependency version. [#52](https://github.com/woltapp/wolt_modal_sheet/pull/52) - Add option to dynamically enable bottom sheet drag for a single page. [#45](https://github.com/woltapp/wolt_modal_sheet/pull/45) - Add theme extensions for wolt modal sheet. [#44](https://github.com/woltapp/wolt_modal_sheet/pull/44) - Enhancing Top Bar Configuration & Scroll Motion Animation. [#42](https://github.com/woltapp/wolt_modal_sheet/pull/42) diff --git a/example/pubspec.lock b/example/pubspec.lock index 94e017ad..f8ea2e91 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -182,6 +182,6 @@ packages: path: ".." relative: true source: path - version: "0.0.4" + version: "0.1.0" sdks: dart: ">=3.0.0 <4.0.0" diff --git a/lib/src/content/components/main_content/wolt_modal_sheet_main_content.dart b/lib/src/content/components/main_content/wolt_modal_sheet_main_content.dart index 8701706d..7c6a727e 100644 --- a/lib/src/content/components/main_content/wolt_modal_sheet_main_content.dart +++ b/lib/src/content/components/main_content/wolt_modal_sheet_main_content.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; import 'package:wolt_modal_sheet/src/content/components/main_content/wolt_modal_sheet_hero_image.dart'; -import 'package:wolt_modal_sheet/src/modal_page/wolt_modal_sheet_page.dart'; -import 'package:wolt_modal_sheet/src/modal_type/wolt_modal_type.dart'; import 'package:wolt_modal_sheet/src/theme/wolt_modal_sheet_default_theme_data.dart'; import 'package:wolt_modal_sheet/wolt_modal_sheet.dart'; @@ -49,9 +47,8 @@ class _WoltModalSheetMainContentState extends State { defaultThemeData.heroImageHeight); final pageHasTopBarLayer = page.hasTopBarLayer ?? themeData?.hasTopBarLayer ?? defaultThemeData.hasTopBarLayer; - final navBarHeight = page.navBarHeight ?? - themeData?.navBarHeight ?? - defaultThemeData.navBarHeight; + final navBarHeight = + page.navBarHeight ?? themeData?.navBarHeight ?? defaultThemeData.navBarHeight; final topBarHeight = pageHasTopBarLayer || page.leadingNavBarWidget != null || page.trailingNavBarWidget != null ? navBarHeight diff --git a/lib/src/content/components/main_content/wolt_modal_sheet_top_bar_title_flow.dart b/lib/src/content/components/main_content/wolt_modal_sheet_top_bar_title_flow.dart index 4f9bdc47..3534145c 100644 --- a/lib/src/content/components/main_content/wolt_modal_sheet_top_bar_title_flow.dart +++ b/lib/src/content/components/main_content/wolt_modal_sheet_top_bar_title_flow.dart @@ -1,6 +1,5 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:wolt_modal_sheet/src/modal_page/wolt_modal_sheet_page.dart'; import 'package:wolt_modal_sheet/src/theme/wolt_modal_sheet_default_theme_data.dart'; import 'package:wolt_modal_sheet/src/utils/wolt_layout_transformation_utils.dart'; import 'package:wolt_modal_sheet/wolt_modal_sheet.dart'; @@ -26,9 +25,8 @@ class WoltModalSheetTopBarTitleFlow extends StatelessWidget { Widget build(BuildContext context) { final themeData = Theme.of(context).extension(); final defaultThemeData = WoltModalSheetDefaultThemeData(context); - final topBarHeight = page.navBarHeight ?? - themeData?.navBarHeight ?? - defaultThemeData.navBarHeight; + final topBarHeight = + page.navBarHeight ?? themeData?.navBarHeight ?? defaultThemeData.navBarHeight; final heroImageHeight = page.heroImage == null ? 0.0 : (page.heroImageHeight ?? themeData?.heroImageHeight ?? defaultThemeData.heroImageHeight); @@ -71,9 +69,8 @@ class _TopBarTitleFlowDelegate extends FlowDelegate { WoltModalSheetTopBarTitleFlow._topBarTitleTranslationYAmount; const topBarTitleTranslationYEnd = topBarTitleTranslationYStart + topBarTitleTranslationYAmount; - final topBarTitleTranslationYAndOpacityStartPoint = heroImageHeight == 0 - ? 8 - : heroImageHeight - topBarHeight; + final topBarTitleTranslationYAndOpacityStartPoint = + heroImageHeight == 0 ? 8 : heroImageHeight - topBarHeight; /// Top Bar Title translation Y final topBarTitleTranslationY = WoltLayoutTransformationUtils.calculateTransformationValue(