Skip to content

Commit

Permalink
refactor: AppWindow name
Browse files Browse the repository at this point in the history
  • Loading branch information
Merrit committed Jan 27, 2023
1 parent 000bb1b commit fd16e68
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 21 deletions.
4 changes: 2 additions & 2 deletions lib/app.dart
Expand Up @@ -8,7 +8,7 @@ import '../logs/log_page.dart';
import '../theme/theme.dart';
import 'loading/loading_page.dart';
import 'settings/settings.dart';
import 'window/nyrna_window.dart';
import 'window/app_window.dart';

class App extends StatefulWidget {
const App({Key? key}) : super(key: key);
Expand Down Expand Up @@ -37,7 +37,7 @@ class _AppState extends State<App> with TrayListener, WindowListener {
/// Only working on Windows for some reason.
/// Linux will use `flutter_window_close` instead.
if (settingsCubit.state.closeToTray) {
NyrnaWindow.instance.hide();
AppWindow.instance.hide();
return;
} else {
super.onWindowClose();
Expand Down
4 changes: 2 additions & 2 deletions lib/apps_list/apps_list_page.dart
Expand Up @@ -5,7 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import '../app/app.dart';
import '../settings/cubit/settings_cubit.dart';
import '../theme/theme.dart';
import '../window/nyrna_window.dart';
import '../window/app_window.dart';
import 'apps_list.dart';

/// The main screen for Nyrna.
Expand Down Expand Up @@ -57,7 +57,7 @@ class _AppsListPageState extends State<AppsListPage>
final updatedWindowSize = WidgetsBinding.instance.window.physicalSize;
if (_appWindowSize != updatedWindowSize) {
_appWindowSize = updatedWindowSize;
NyrnaWindow.instance.saveWindowSize();
AppWindow.instance.saveWindowSize();
}
super.didChangeMetrics();
}
Expand Down
8 changes: 4 additions & 4 deletions lib/main.dart
Expand Up @@ -23,7 +23,7 @@ import 'storage/storage_repository.dart';
import 'system_tray/system_tray_manager.dart';
import 'theme/theme.dart';
import 'url_launcher/url_launcher.dart';
import 'window/nyrna_window.dart';
import 'window/app_window.dart';

Future<void> main(List<String> args) async {
WidgetsFlutterBinding.ensureInitialized();
Expand Down Expand Up @@ -58,7 +58,7 @@ Future<void> main(List<String> args) async {
exit(0);
} else {}

final nyrnaWindow = NyrnaWindow(storage);
final appWindow = AppWindow(storage);

// Created outside runApp so it can be accessed for window settings below.
final settingsCubit = await SettingsCubit.init(
Expand Down Expand Up @@ -103,12 +103,12 @@ Future<void> main(List<String> args) async {
),
);

final systemTray = SystemTrayManager(nyrnaWindow);
final systemTray = SystemTrayManager(appWindow);
await systemTray.initialize();

bool? startHiddenInTray = await storage.getValue('startHiddenInTray');

if (startHiddenInTray != true) await nyrnaWindow.show();
if (startHiddenInTray != true) await appWindow.show();
}

/// Message to be displayed if Nyrna is called with an unknown argument.
Expand Down
6 changes: 3 additions & 3 deletions lib/settings/cubit/settings_cubit.dart
Expand Up @@ -9,7 +9,7 @@ import '../../apps_list/apps_list.dart';
import '../../core/core.dart';
import '../../hotkey/hotkey_service.dart';
import '../../storage/storage_repository.dart';
import '../../window/nyrna_window.dart';
import '../../window/app_window.dart';

part 'settings_state.dart';

Expand All @@ -28,7 +28,7 @@ class SettingsCubit extends Cubit<SettingsState> {
}) : super(initialState) {
settingsCubit = this;
_hotkeyService.updateHotkey(state.hotKey);
NyrnaWindow.instance.preventClose(state.closeToTray);
AppWindow.instance.preventClose(state.closeToTray);
}

static Future<SettingsCubit> init({
Expand Down Expand Up @@ -110,7 +110,7 @@ class SettingsCubit extends Cubit<SettingsState> {
Future<void> updateCloseToTray([bool? closeToTray]) async {
if (closeToTray == null) return;

await NyrnaWindow.instance.preventClose(closeToTray);
await AppWindow.instance.preventClose(closeToTray);
await _storage.saveValue(key: 'closeToTray', value: closeToTray);
emit(state.copyWith(closeToTray: closeToTray));
}
Expand Down
4 changes: 2 additions & 2 deletions lib/system_tray/system_tray_manager.dart
Expand Up @@ -3,10 +3,10 @@ import 'dart:io';
import 'package:tray_manager/tray_manager.dart';

import '../apps_list/apps_list.dart';
import '../window/nyrna_window.dart';
import '../window/app_window.dart';

class SystemTrayManager {
final NyrnaWindow _window;
final AppWindow _window;

SystemTrayManager(this._window);

Expand Down
6 changes: 3 additions & 3 deletions lib/window/nyrna_window.dart → lib/window/app_window.dart
Expand Up @@ -9,12 +9,12 @@ import '../logs/logs.dart';
import '../settings/settings.dart';
import '../storage/storage_repository.dart';

class NyrnaWindow {
class AppWindow {
final StorageRepository _storage;

static late final NyrnaWindow instance;
static late final AppWindow instance;

NyrnaWindow(this._storage) {
AppWindow(this._storage) {
instance = this;
_listenForWindowClose();
}
Expand Down
9 changes: 4 additions & 5 deletions test/settings/cubit/settings_cubit_test.dart
Expand Up @@ -6,7 +6,7 @@ import 'package:nyrna/apps_list/cubit/apps_list_cubit.dart';
import 'package:nyrna/hotkey/hotkey_service.dart';
import 'package:nyrna/settings/settings.dart';
import 'package:nyrna/storage/storage_repository.dart';
import 'package:nyrna/window/nyrna_window.dart';
import 'package:nyrna/window/app_window.dart';

class FakeDesktopIntegration extends Fake implements DesktopIntegration {
@override
Expand All @@ -22,7 +22,7 @@ class MockAppsListCubit extends Mock implements AppsListCubit {}

class MockHotkeyService extends Mock implements HotkeyService {}

class MockNyrnaWindow extends Mock implements NyrnaWindow {}
class MockAppWindow extends Mock implements AppWindow {}

class MockStorageRepository extends Mock implements StorageRepository {}

Expand All @@ -36,7 +36,7 @@ SettingsState get state => cubit.state;

void main() {
setUpAll((() {
NyrnaWindow.instance = MockNyrnaWindow();
AppWindow.instance = MockAppWindow();
appsListCubit = MockAppsListCubit();
when(() => appsListCubit.setAutoRefresh(
autoRefresh: any(named: 'autoRefresh'),
Expand All @@ -50,8 +50,7 @@ void main() {
when(() => hotkeyService.updateHotkey(any())).thenAnswer((_) async {});
when(() => hotkeyService.removeHotkey()).thenAnswer((_) async {});

when(() => NyrnaWindow.instance.preventClose(any()))
.thenAnswer((_) async {});
when(() => AppWindow.instance.preventClose(any())).thenAnswer((_) async {});

when(() => storage.getValue('hotkey')).thenAnswer((_) async {});
when(() => storage.deleteValue(any())).thenAnswer((_) async {});
Expand Down

0 comments on commit fd16e68

Please sign in to comment.