From d38fbbcf9687a7c272c8b82bec8804b80255c808 Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Sat, 11 May 2024 13:47:34 +0200 Subject: [PATCH 1/3] fix: resolve mismatched virtual navigation button colours --- .../navigation/presentation/widgets/app_navigation_bar.dart | 5 ++++- .../video_select/presentation/pages/video_select_page.dart | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart b/lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart index 1a0d317..7248969 100644 --- a/lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart +++ b/lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart @@ -58,11 +58,14 @@ class _AppNavigationBarViewState extends State<_AppNavigationBarView> { Widget build(BuildContext context) { final l10n = context.l10n; final bottomNavigationBarColor = context.colorScheme.secondaryContainer; + final iconBrightness = context.theme.brightness == Brightness.light + ? Brightness.dark + : Brightness.light; return AnnotatedRegion( value: SystemUiOverlayStyle( systemNavigationBarColor: bottomNavigationBarColor, - systemNavigationBarIconBrightness: context.theme.brightness, + systemNavigationBarIconBrightness: iconBrightness, ), child: Scaffold( body: PageView( diff --git a/lib/src/features/video_select/presentation/pages/video_select_page.dart b/lib/src/features/video_select/presentation/pages/video_select_page.dart index 0cc55d6..5419e3d 100644 --- a/lib/src/features/video_select/presentation/pages/video_select_page.dart +++ b/lib/src/features/video_select/presentation/pages/video_select_page.dart @@ -71,7 +71,10 @@ class _PreviewVideoViewState extends State<_PreviewVideoView> systemOverlayStyle: SystemUiOverlayStyle( systemNavigationBarColor: context.colorScheme.secondaryContainer, - systemNavigationBarIconBrightness: context.theme.brightness, + systemNavigationBarIconBrightness: + context.theme.brightness == Brightness.light + ? Brightness.dark + : Brightness.light, ), ), // BottomAppBarTheme is used for the bottom bar in the picker. From 3a76533111c49614270c70b437b90099833a732c Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Sat, 11 May 2024 14:00:37 +0200 Subject: [PATCH 2/3] refactor: change default merge settings --- .../settings_bottom_sheet_cubit.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/features/merge/presentation/cubits/settings_bottom_sheet_cubit/settings_bottom_sheet_cubit.dart b/lib/src/features/merge/presentation/cubits/settings_bottom_sheet_cubit/settings_bottom_sheet_cubit.dart index 1ddf275..59b4b4c 100644 --- a/lib/src/features/merge/presentation/cubits/settings_bottom_sheet_cubit/settings_bottom_sheet_cubit.dart +++ b/lib/src/features/merge/presentation/cubits/settings_bottom_sheet_cubit/settings_bottom_sheet_cubit.dart @@ -30,7 +30,7 @@ final class SettingsBottomSheetCubit extends Cubit { isAudioOn: true, playbackSpeed: PlaybackSpeed.one, videoResolution: VideoResolution.original, - videoAspectRatio: VideoAspectRatio.independent, + videoAspectRatio: VideoAspectRatio.firstVideo, ); Future init() async { From 929c9f302dffbee6b6133973c9fe4ae252f600a7 Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Sat, 11 May 2024 14:05:46 +0200 Subject: [PATCH 3/3] refactor: update systemNavigationBarDividerColor --- .../navigation/presentation/widgets/app_navigation_bar.dart | 1 + .../video_select/presentation/pages/video_select_page.dart | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart b/lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart index 7248969..692128c 100644 --- a/lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart +++ b/lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart @@ -65,6 +65,7 @@ class _AppNavigationBarViewState extends State<_AppNavigationBarView> { return AnnotatedRegion( value: SystemUiOverlayStyle( systemNavigationBarColor: bottomNavigationBarColor, + systemNavigationBarDividerColor: bottomNavigationBarColor, systemNavigationBarIconBrightness: iconBrightness, ), child: Scaffold( diff --git a/lib/src/features/video_select/presentation/pages/video_select_page.dart b/lib/src/features/video_select/presentation/pages/video_select_page.dart index 5419e3d..6ddec66 100644 --- a/lib/src/features/video_select/presentation/pages/video_select_page.dart +++ b/lib/src/features/video_select/presentation/pages/video_select_page.dart @@ -71,6 +71,8 @@ class _PreviewVideoViewState extends State<_PreviewVideoView> systemOverlayStyle: SystemUiOverlayStyle( systemNavigationBarColor: context.colorScheme.secondaryContainer, + systemNavigationBarDividerColor: + context.colorScheme.secondaryContainer, systemNavigationBarIconBrightness: context.theme.brightness == Brightness.light ? Brightness.dark