Skip to content

Commit e117965

Browse files
committed
fix(content): finalize language picker integration
1 parent a5afe50 commit e117965

File tree

7 files changed

+14
-18
lines changed

7 files changed

+14
-18
lines changed

lib/content_management/bloc/create_source/create_source_bloc.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import 'package:bloc/bloc.dart';
22
import 'package:core/core.dart';
33
import 'package:country_picker/country_picker.dart' as picker;
44
import 'package:data_repository/data_repository.dart';
5-
import 'package:language_picker/language_picker.dart' as language_picker;
65
import 'package:equatable/equatable.dart';
7-
import 'package:flutter/foundation.dart';
86
import 'package:flutter_news_app_web_dashboard_full_source_code/shared/shared.dart';
7+
import 'package:language_picker/languages.dart';
98
import 'package:uuid/uuid.dart';
109

1110
part 'create_source_event.dart';

lib/content_management/bloc/create_source/create_source_event.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ final class CreateSourceTypeChanged extends CreateSourceEvent {
4848
/// Event for when the source's language is changed.
4949
final class CreateSourceLanguageChanged extends CreateSourceEvent {
5050
const CreateSourceLanguageChanged(this.language);
51-
final language_picker.Language? language;
51+
final Language? language;
5252
@override
5353
List<Object?> get props => [language];
5454
}

lib/content_management/bloc/create_source/create_source_state.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ final class CreateSourceState extends Equatable {
3939
final String description;
4040
final String url;
4141
final SourceType? sourceType;
42-
final language_picker.Language? language;
42+
final Language? language;
4343
final Country? headquarters;
4444
final ContentStatus contentStatus;
4545
final HttpException? exception;
@@ -60,7 +60,7 @@ final class CreateSourceState extends Equatable {
6060
String? description,
6161
String? url,
6262
ValueGetter<SourceType?>? sourceType,
63-
ValueGetter<language_picker.Language?>? language,
63+
ValueGetter<Language?>? language,
6464
ValueGetter<Country?>? headquarters,
6565
ContentStatus? contentStatus,
6666
HttpException? exception,

lib/content_management/bloc/edit_source/edit_source_bloc.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import 'package:bloc/bloc.dart';
22
import 'package:core/core.dart';
33
import 'package:country_picker/country_picker.dart' as picker;
44
import 'package:data_repository/data_repository.dart';
5-
import 'package:language_picker/language_picker.dart' as language_picker;
65
import 'package:equatable/equatable.dart';
76
import 'package:flutter/foundation.dart';
87
import 'package:flutter_news_app_web_dashboard_full_source_code/l10n/app_localizations.dart';
98
import 'package:flutter_news_app_web_dashboard_full_source_code/shared/shared.dart';
9+
import 'package:language_picker/languages.dart';
1010

1111
part 'edit_source_event.dart';
1212
part 'edit_source_state.dart';

lib/content_management/bloc/edit_source/edit_source_event.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ final class EditSourceTypeChanged extends EditSourceEvent {
5656
/// Event triggered when the source language input changes.
5757
final class EditSourceLanguageChanged extends EditSourceEvent {
5858
const EditSourceLanguageChanged(this.language);
59-
final language_picker.Language? language;
59+
final Language? language;
6060

6161
@override
6262
List<Object?> get props => [language];

lib/content_management/bloc/edit_source/edit_source_state.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
part of 'edit_source_bloc.dart';
22

3-
import 'package:language_picker/language_picker.dart' as language_picker;
43
/// Represents the status of the edit source operation.
54
enum EditSourceStatus {
65
/// Initial state, before any data is loaded.
@@ -41,7 +40,7 @@ final class EditSourceState extends Equatable {
4140
final String description;
4241
final String url;
4342
final SourceType? sourceType;
44-
final language_picker.Language? language;
43+
final Language? language;
4544
final Country? headquarters;
4645
final ContentStatus contentStatus;
4746
final HttpException? exception;
@@ -63,7 +62,7 @@ final class EditSourceState extends Equatable {
6362
String? description,
6463
String? url,
6564
ValueGetter<SourceType?>? sourceType,
66-
ValueGetter<language_picker.Language?>? language,
65+
ValueGetter<Language?>? language,
6766
ValueGetter<Country?>? headquarters,
6867
ContentStatus? contentStatus,
6968
HttpException? exception,

lib/content_management/view/create_source_page.dart

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,13 @@ class _CreateSourceViewState extends State<_CreateSourceView> {
160160
.add(CreateSourceUrlChanged(value)),
161161
),
162162
const SizedBox(height: AppSpacing.lg),
163-
TextFormField(
163+
LanguagePickerFormField(
164+
labelText: l10n.language,
164165
initialValue: state.language,
165-
decoration: InputDecoration(
166-
labelText: l10n.language,
167-
border: const OutlineInputBorder(),
168-
),
169-
onChanged: (value) => context
170-
.read<CreateSourceBloc>()
171-
.add(CreateSourceLanguageChanged(value)),
166+
onChanged: (language) =>
167+
context.read<CreateSourceBloc>().add(
168+
CreateSourceLanguageChanged(language),
169+
),
172170
),
173171
const SizedBox(height: AppSpacing.lg),
174172
DropdownButtonFormField<SourceType?>(

0 commit comments

Comments
 (0)