Move some files

analysis_options.yaml

@@ -13,7 +13,7 @@ analyzer:
   exclude:
     - "**/*.g.dart"
     - "**/*.freezed.dart"
-    - lib/src/utils/lichess_icons.dart
+    - lib/src/common/lichess_icons.dart
   errors:
     invalid_annotation_target: ignore
 

lib/main.dart

@@ -6,9 +6,9 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:logging/logging.dart';
 
 import 'src/app.dart';
-import 'src/sound.dart';
+import 'src/common/sound.dart';
+import 'src/common/shared_preferences.dart';
 import 'src/features/authentication/data/auth_repository.dart';
-import 'src/features/settings/data/settings_repository.dart';
 
 void main() async {
   if (kDebugMode) {

lib/src/app.dart

@@ -12,7 +12,7 @@ import 'features/settings/ui/settings_screen.dart';
 import 'features/settings/ui/theme_mode_screen.dart';
 import 'features/settings/ui/theme_mode_notifier.dart';
 import 'features/tv/ui/tv_screen.dart';
-import './utils/lichess_icons.dart';
+import 'common/lichess_icons.dart';
 
 class App extends ConsumerWidget {
   const App({super.key});

lib/src/common/http.dart

@@ -6,8 +6,8 @@ import 'package:fpdart/fpdart.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import 'constants.dart';
-import 'utils/errors.dart';
+import '../constants.dart';
+import 'errors.dart';
 
 const retries = [
   Duration(milliseconds: 200),

lib/src/common/shared_preferences.dart

@@ -0,0 +1,7 @@
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+// see lib/src/main.dart for initialization
+final sharedPreferencesProvider = Provider<SharedPreferences>((ref) {
+  throw UnimplementedError();
+});

lib/src/common/sound.dart

@@ -2,7 +2,7 @@ import 'package:flutter/services.dart' show rootBundle;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:soundpool/soundpool.dart';
 
-import './features/settings/data/settings_repository.dart';
+import '../features/settings/data/settings_repository.dart';
 
 class SoundService {
   SoundService(this._pool, this._settings);

lib/src/features/authentication/data/auth_repository.dart

@@ -5,10 +5,10 @@ import 'package:flutter_appauth/flutter_appauth.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import 'package:lichess_mobile/src/common/errors.dart';
+import 'package:lichess_mobile/src/common/http.dart';
 import 'package:lichess_mobile/src/utils/in_memory_store.dart';
-import 'package:lichess_mobile/src/utils/errors.dart';
 import 'package:lichess_mobile/src/constants.dart';
-import 'package:lichess_mobile/src/http.dart';
 import '../domain/account.codegen.dart';
 
 const redirectUri = 'org.lichess.mobile://login-callback';

lib/src/features/game/data/game_repository.dart

@@ -5,8 +5,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:dartchess/dartchess.dart';
 
-import 'package:lichess_mobile/src/utils/errors.dart';
-import 'package:lichess_mobile/src/http.dart';
+import 'package:lichess_mobile/src/common/errors.dart';
+import 'package:lichess_mobile/src/common/http.dart';
 import 'package:lichess_mobile/src/constants.dart';
 
 class GameRepository {

lib/src/features/game/ui/play_screen.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:lichess_mobile/src/utils/lichess_icons.dart';
+import 'package:lichess_mobile/src/common/lichess_icons.dart';
 import '../../authentication/ui/auth_widget.dart';
 import './time_control_modal.dart';
 

lib/src/features/game/ui/time_control_modal.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:lichess_mobile/src/utils/lichess_icons.dart';
+import 'package:lichess_mobile/src/common/lichess_icons.dart';
 
 class TimeControlModal extends StatefulWidget {
   const TimeControlModal({super.key});

lib/src/features/settings/data/settings_repository.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import 'package:lichess_mobile/src/common/shared_preferences.dart';
+
 const prefix = 'SettingsRepository';
 
 class SettingsRepository {
@@ -45,11 +47,6 @@ class SettingsRepository {
   static const soundMutedKey = '$prefix.soundMuted';
 }
 
-// see lib/src/main.dart for initialization
-final sharedPreferencesProvider = Provider<SharedPreferences>((ref) {
-  throw UnimplementedError();
-});
-
 final settingsRepositoryProvider = Provider<SettingsRepository>((ref) {
   final sharedPrefs = ref.watch(sharedPreferencesProvider);
   return SettingsRepository(prefs: sharedPrefs);

lib/src/features/settings/ui/settings_screen.dart

@@ -3,9 +3,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lichess_mobile/src/utils/l10n_context.dart';
+import 'package:lichess_mobile/src/common/lichess_icons.dart';
 
 import '../../../constants.dart';
-import '../../../utils/lichess_icons.dart';
 import '../../authentication/data/auth_repository.dart';
 import '../../authentication/domain/account.codegen.dart';
 

lib/src/features/tv/data/tv_repository.dart

@@ -3,7 +3,7 @@ import 'package:http/http.dart' as http;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logging/logging.dart';
 
-import 'package:lichess_mobile/src/http.dart';
+import 'package:lichess_mobile/src/common/http.dart';
 import 'package:lichess_mobile/src/constants.dart';
 
 class TvRepository {

lib/src/features/tv/ui/tv_stream.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import 'package:lichess_mobile/src/sound.dart';
+import 'package:lichess_mobile/src/common/sound.dart';
 import '../domain/fen_event.dart';
 import '../domain/featured_game.dart';
 import '../domain/featured_position.dart';