Skip to content

Commit c5e4eb6

Browse files
committed
style: format
1 parent bf18995 commit c5e4eb6

File tree

4 files changed

+18
-36
lines changed

4 files changed

+18
-36
lines changed

lib/app/bloc/app_state.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ enum AppStatus {
1717

1818
final class AppState extends Equatable {
1919
const AppState({
20-
required this.environment, this.status = AppStatus.initial,
20+
required this.environment,
21+
this.status = AppStatus.initial,
2122
this.user,
2223
this.appSettings,
2324
});

lib/bootstrap.dart

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,11 @@ Future<Widget> bootstrap(
9191
logger: Logger('DataInMemory<UserContentPreferences>'),
9292
);
9393
appSettingsClient = DataInMemory<AppSettings>(
94-
// Changed from UserAppSettings
9594
toJson: (i) => i.toJson(),
9695
getId: (i) => i.id,
9796
logger: Logger(
9897
'DataInMemory<AppSettings>',
99-
), // Changed from UserAppSettings
98+
),
10099
);
101100
remoteConfigClient = DataInMemory<RemoteConfig>(
102101
toJson: (i) => i.toJson(),
@@ -159,12 +158,11 @@ Future<Widget> bootstrap(
159158
logger: Logger('DataApi<UserContentPreferences>'),
160159
);
161160
appSettingsClient = DataApi<AppSettings>(
162-
// Changed from UserAppSettings
163161
httpClient: httpClient,
164-
modelName: 'app_settings', // Changed from user_app_settings
165-
fromJson: AppSettings.fromJson, // Changed from UserAppSettings.fromJson
162+
modelName: 'app_settings',
163+
fromJson: AppSettings.fromJson,
166164
toJson: (settings) => settings.toJson(),
167-
logger: Logger('DataApi<AppSettings>'), // Changed from UserAppSettings
165+
logger: Logger('DataApi<AppSettings>'),
168166
);
169167
remoteConfigClient = DataApi<RemoteConfig>(
170168
httpClient: httpClient,
@@ -218,8 +216,7 @@ Future<Widget> bootstrap(
218216
dataClient: userContentPreferencesClient,
219217
);
220218
final appSettingsRepository = DataRepository<AppSettings>(
221-
// Changed from UserAppSettings
222-
dataClient: appSettingsClient, // Changed from UserAppSettings
219+
dataClient: appSettingsClient,
223220
);
224221
final remoteConfigRepository = DataRepository<RemoteConfig>(
225222
dataClient: remoteConfigClient,

lib/settings/bloc/settings_bloc.dart

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ part 'settings_state.dart';
1010

1111
class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
1212
SettingsBloc({
13-
required DataRepository<AppSettings>
14-
appSettingsRepository, // Changed from UserAppSettings
15-
}) : _appSettingsRepository =
16-
appSettingsRepository, // Changed from UserAppSettings
13+
required DataRepository<AppSettings> appSettingsRepository,
14+
}) : _appSettingsRepository = appSettingsRepository,
1715
super(const SettingsInitial()) {
1816
on<SettingsLoaded>(_onSettingsLoaded);
1917
on<SettingsBaseThemeChanged>(_onSettingsBaseThemeChanged);
@@ -33,15 +31,13 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
3331
emit(SettingsLoadInProgress(appSettings: state.appSettings));
3432
try {
3533
final appSettings = await _appSettingsRepository.read(
36-
// Changed from userAppSettingsRepository
3734
id: event.userId!,
3835
);
3936
emit(SettingsLoadSuccess(appSettings: appSettings));
4037
} on NotFoundException {
4138
// If settings are not found, create default settings for the user.
4239
// This ensures that a user always has a valid settings object.
4340
final defaultSettings = AppSettings(
44-
// Changed from UserAppSettings
4541
id: event.userId!,
4642
displaySettings: const DisplaySettings(
4743
baseTheme: AppBaseTheme.system,
@@ -57,13 +53,9 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
5753
),
5854
),
5955
feedSettings: const FeedSettings(
60-
// Changed from FeedDisplayPreferences
61-
feedItemDensity:
62-
FeedItemDensity.standard, // Changed from headlineDensity
63-
feedItemImageStyle: FeedItemImageStyle
64-
.largeThumbnail, // Changed from headlineImageStyle
65-
feedItemClickBehavior:
66-
FeedItemClickBehavior.defaultBehavior, // Added new field
56+
feedItemDensity: FeedItemDensity.standard,
57+
feedItemImageStyle: FeedItemImageStyle.largeThumbnail,
58+
feedItemClickBehavior: FeedItemClickBehavior.defaultBehavior,
6759
),
6860
);
6961
await _appSettingsRepository.create(item: defaultSettings);
@@ -74,20 +66,19 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
7466
emit(
7567
SettingsLoadFailure(
7668
UnknownException('An unexpected error occurred: $e'),
77-
appSettings: state.appSettings, // Changed from userAppSettings
69+
appSettings: state.appSettings,
7870
),
7971
);
8072
}
8173
}
8274

8375
Future<void> _updateSettings(
84-
AppSettings updatedSettings, // Changed from UserAppSettings
76+
AppSettings updatedSettings,
8577
Emitter<SettingsState> emit,
8678
) async {
8779
emit(SettingsUpdateInProgress(appSettings: updatedSettings));
8880
try {
8981
final result = await _appSettingsRepository.update(
90-
// Changed from userAppSettingsRepository
9182
id: updatedSettings.id,
9283
item: updatedSettings,
9384
);
@@ -98,7 +89,7 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
9889
emit(
9990
SettingsUpdateFailure(
10091
UnknownException('An unexpected error occurred: $e'),
101-
appSettings: state.appSettings, // Changed from userAppSettings
92+
appSettings: state.appSettings,
10293
),
10394
);
10495
}

lib/settings/view/settings_page.dart

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ class SettingsPage extends StatelessWidget {
2020
Widget build(BuildContext context) {
2121
return BlocProvider(
2222
create: (context) => SettingsBloc(
23-
appSettingsRepository:
24-
context
25-
.read<
26-
DataRepository<AppSettings>
27-
>(),
23+
appSettingsRepository: context.read<DataRepository<AppSettings>>(),
2824
)..add(SettingsLoaded(userId: context.read<AppBloc>().state.user?.id)),
2925
child: const _SettingsView(),
3026
);
@@ -90,11 +86,10 @@ class _SettingsViewState extends State<_SettingsView> {
9086
);
9187
// Trigger AppBloc to reload settings for immediate UI update
9288
if (state.appSettings != null) {
93-
9489
context.read<AppBloc>().add(
9590
AppUserAppSettingsChanged(
9691
state.appSettings!,
97-
),
92+
),
9893
);
9994
}
10095
} else if (state is SettingsUpdateFailure) {
@@ -108,8 +103,7 @@ class _SettingsViewState extends State<_SettingsView> {
108103
}
109104
},
110105
builder: (context, state) {
111-
if (state.appSettings == null &&
112-
state is! SettingsLoadInProgress) {
106+
if (state.appSettings == null && state is! SettingsLoadInProgress) {
113107
// If settings are null and not loading, try to load them
114108
context.read<SettingsBloc>().add(
115109
SettingsLoaded(userId: context.read<AppBloc>().state.user?.id),
@@ -134,7 +128,6 @@ class _SettingsViewState extends State<_SettingsView> {
134128
},
135129
);
136130
} else if (state.appSettings != null) {
137-
138131
final appSettings = state.appSettings!;
139132
return ListView(
140133
padding: const EdgeInsets.all(AppSpacing.lg),

0 commit comments

Comments
 (0)