Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hotfix: resolve small issues on version 2.0.0 #36

Merged
merged 3 commits into from
May 11, 2024
Merged

hotfix: resolve small issues on version 2.0.0 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d38fbbc
fix: resolve mismatched virtual navigation button colours
BBarisKilic May 11, 2024
3a76533
refactor: change default merge settings
BBarisKilic May 11, 2024
929c9f3
refactor: update systemNavigationBarDividerColor
BBarisKilic May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...es/merge/presentation/cubits/settings_bottom_sheet_cubit/settings_bottom_sheet_cubit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class SettingsBottomSheetCubit extends Cubit<SettingsBottomSheetState> {
isAudioOn: true,
playbackSpeed: PlaybackSpeed.one,
videoResolution: VideoResolution.original,
videoAspectRatio: VideoAspectRatio.independent,
videoAspectRatio: VideoAspectRatio.firstVideo,
);

Future<void> init() async {
Expand Down
6 changes: 5 additions & 1 deletion lib/src/features/navigation/presentation/widgets/app_navigation_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,15 @@ 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,
systemNavigationBarDividerColor: bottomNavigationBarColor,
systemNavigationBarIconBrightness: iconBrightness,
),
child: Scaffold(
body: PageView(
Expand Down
7 changes: 6 additions & 1 deletion lib/src/features/video_select/presentation/pages/video_select_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ class _PreviewVideoViewState extends State<_PreviewVideoView>
systemOverlayStyle: SystemUiOverlayStyle(
systemNavigationBarColor:
context.colorScheme.secondaryContainer,
systemNavigationBarIconBrightness: context.theme.brightness,
systemNavigationBarDividerColor:
context.colorScheme.secondaryContainer,
systemNavigationBarIconBrightness:
context.theme.brightness == Brightness.light
? Brightness.dark
: Brightness.light,
),
),
// BottomAppBarTheme is used for the bottom bar in the picker.
Expand Down
Loading