Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
import 'dart:async';
import 'dart:ui';

import 'package:equatable/equatable.dart';
import 'package:hacki/cubits/cubits.dart';
import 'package:hydrated_bloc/hydrated_bloc.dart';

part 'thread_navigation_button_state.dart';

class ThreadNavigationButtonCubit
extends HydratedCubit<ThreadNavigationButtonState> {
ThreadNavigationButtonCubit() : super(ThreadNavigationButtonState.init());
ThreadNavigationButtonCubit({required PreferenceCubit preferenceCubit})
: _preferenceCubit = preferenceCubit,
super(ThreadNavigationButtonState.init()) {
_areSkipButtonsEnabledStreamSubscription = _preferenceCubit.stream
.map((PreferenceState s) => s.areSkipButtonsEnabled)
.distinct()
.listen((bool enabled) {
if (!enabled) {
updateButtonPosition(defaultOffset.dx, defaultOffset.dy);
}
});
}

final PreferenceCubit _preferenceCubit;
late final StreamSubscription<bool> _areSkipButtonsEnabledStreamSubscription;

void updateButtonPosition(double dx, double dy) =>
emit(state.copyWith(dx: dx, dy: dy));
Expand All @@ -30,4 +46,10 @@ class ThreadNavigationButtonCubit
_buttonPositionDyKey: state.dy,
};
}

@override
Future<void> close() {
_areSkipButtonsEnabledStreamSubscription.cancel();
return super.close();
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
part of 'thread_navigation_button_cubit.dart';

const Offset defaultOffset = Offset(16, 180);
const Offset defaultOffset = Offset(16, 120);

class ThreadNavigationButtonState extends Equatable {
const ThreadNavigationButtonState({required this.dx, required this.dy});
Expand Down
4 changes: 3 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ class HackiApp extends StatelessWidget {
),
BlocProvider<ThreadNavigationButtonCubit>(
lazy: false,
create: (_) => ThreadNavigationButtonCubit(),
create: (BuildContext context) => ThreadNavigationButtonCubit(
preferenceCubit: context.read<PreferenceCubit>(),
),
),
],
child: BlocConsumer<PreferenceCubit, PreferenceState>(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: hacki
description: A Hacker News client.
version: 3.8.0+380
version: 3.8.1+381
publish_to: none

environment:
Expand Down