Skip to content

Commit

Permalink
rename identifier
Browse files Browse the repository at this point in the history
  • Loading branch information
cp-sidhdhi-p committed Oct 3, 2024
1 parent 870235b commit a561693
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion data/lib/api/team/team_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ abstract class TeamModel with _$TeamModel {
required String name,
required String name_lowercase,
String? city,
String? initials,
String? name_initial,
String? profile_img_url,
String? created_by,
DateTime? created_at,
Expand Down
38 changes: 19 additions & 19 deletions data/lib/api/team/team_model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ mixin _$TeamModel {
String get name => throw _privateConstructorUsedError;
String get name_lowercase => throw _privateConstructorUsedError;
String? get city => throw _privateConstructorUsedError;
String? get initials => throw _privateConstructorUsedError;
String? get name_initial => throw _privateConstructorUsedError;
String? get profile_img_url => throw _privateConstructorUsedError;
String? get created_by => throw _privateConstructorUsedError;
DateTime? get created_at => throw _privateConstructorUsedError;
Expand All @@ -49,7 +49,7 @@ abstract class $TeamModelCopyWith<$Res> {
String name,
String name_lowercase,
String? city,
String? initials,
String? name_initial,
String? profile_img_url,
String? created_by,
DateTime? created_at,
Expand All @@ -74,7 +74,7 @@ class _$TeamModelCopyWithImpl<$Res, $Val extends TeamModel>
Object? name = null,
Object? name_lowercase = null,
Object? city = freezed,
Object? initials = freezed,
Object? name_initial = freezed,
Object? profile_img_url = freezed,
Object? created_by = freezed,
Object? created_at = freezed,
Expand All @@ -98,9 +98,9 @@ class _$TeamModelCopyWithImpl<$Res, $Val extends TeamModel>
? _value.city
: city // ignore: cast_nullable_to_non_nullable
as String?,
initials: freezed == initials
? _value.initials
: initials // ignore: cast_nullable_to_non_nullable
name_initial: freezed == name_initial
? _value.name_initial
: name_initial // ignore: cast_nullable_to_non_nullable
as String?,
profile_img_url: freezed == profile_img_url
? _value.profile_img_url
Expand Down Expand Up @@ -139,7 +139,7 @@ abstract class _$$TeamModelImplCopyWith<$Res>
String name,
String name_lowercase,
String? city,
String? initials,
String? name_initial,
String? profile_img_url,
String? created_by,
DateTime? created_at,
Expand All @@ -162,7 +162,7 @@ class __$$TeamModelImplCopyWithImpl<$Res>
Object? name = null,
Object? name_lowercase = null,
Object? city = freezed,
Object? initials = freezed,
Object? name_initial = freezed,
Object? profile_img_url = freezed,
Object? created_by = freezed,
Object? created_at = freezed,
Expand All @@ -186,9 +186,9 @@ class __$$TeamModelImplCopyWithImpl<$Res>
? _value.city
: city // ignore: cast_nullable_to_non_nullable
as String?,
initials: freezed == initials
? _value.initials
: initials // ignore: cast_nullable_to_non_nullable
name_initial: freezed == name_initial
? _value.name_initial
: name_initial // ignore: cast_nullable_to_non_nullable
as String?,
profile_img_url: freezed == profile_img_url
? _value.profile_img_url
Expand Down Expand Up @@ -223,7 +223,7 @@ class _$TeamModelImpl implements _TeamModel {
required this.name,
required this.name_lowercase,
this.city,
this.initials,
this.name_initial,
this.profile_img_url,
this.created_by,
this.created_at,
Expand All @@ -244,7 +244,7 @@ class _$TeamModelImpl implements _TeamModel {
@override
final String? city;
@override
final String? initials;
final String? name_initial;
@override
final String? profile_img_url;
@override
Expand All @@ -265,7 +265,7 @@ class _$TeamModelImpl implements _TeamModel {

@override
String toString() {
return 'TeamModel(id: $id, name: $name, name_lowercase: $name_lowercase, city: $city, initials: $initials, profile_img_url: $profile_img_url, created_by: $created_by, created_at: $created_at, created_time: $created_time, players: $players)';
return 'TeamModel(id: $id, name: $name, name_lowercase: $name_lowercase, city: $city, name_initial: $name_initial, profile_img_url: $profile_img_url, created_by: $created_by, created_at: $created_at, created_time: $created_time, players: $players)';
}

@override
Expand All @@ -278,8 +278,8 @@ class _$TeamModelImpl implements _TeamModel {
(identical(other.name_lowercase, name_lowercase) ||
other.name_lowercase == name_lowercase) &&
(identical(other.city, city) || other.city == city) &&
(identical(other.initials, initials) ||
other.initials == initials) &&
(identical(other.name_initial, name_initial) ||
other.name_initial == name_initial) &&
(identical(other.profile_img_url, profile_img_url) ||
other.profile_img_url == profile_img_url) &&
(identical(other.created_by, created_by) ||
Expand All @@ -299,7 +299,7 @@ class _$TeamModelImpl implements _TeamModel {
name,
name_lowercase,
city,
initials,
name_initial,
profile_img_url,
created_by,
created_at,
Expand All @@ -326,7 +326,7 @@ abstract class _TeamModel implements TeamModel {
required final String name,
required final String name_lowercase,
final String? city,
final String? initials,
final String? name_initial,
final String? profile_img_url,
final String? created_by,
final DateTime? created_at,
Expand All @@ -346,7 +346,7 @@ abstract class _TeamModel implements TeamModel {
@override
String? get city;
@override
String? get initials;
String? get name_initial;
@override
String? get profile_img_url;
@override
Expand Down
4 changes: 2 additions & 2 deletions data/lib/api/team/team_model.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion khelo/lib/ui/flow/home/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
children: [
ImageAvatar(
initial:
matchTeam.team.initials ?? matchTeam.team.name.initials(limit: 1),
matchTeam.team.name_initial ?? matchTeam.team.name.initials(limit: 1),
imageUrl: matchTeam.team.profile_img_url,
size: 32,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class TeamSelectionView extends StatelessWidget {
)
: (team.profile_img_url == null)
? Text(
team.initials ?? team.name.initials(limit: 1),
team.name_initial ?? team.name.initials(limit: 1),
style: AppTextStyle.subtitle1.copyWith(
color: context.colorScheme.textDisabled),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class CommentaryOverOverview extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
children: [
ImageAvatar(
initial: team?.initials ?? team?.name.initials(limit: 1) ?? "?",
initial: team?.name_initial ?? team?.name.initials(limit: 1) ?? "?",
imageUrl: team?.profile_img_url,
size: 35,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class FinalScoreView extends ConsumerWidget {
return Row(
children: [
ImageAvatar(
initial: team.team.initials ?? team.team.name.initials(limit: 1),
initial: team.team.name_initial ?? team.team.name.initials(limit: 1),
imageUrl: team.team.profile_img_url,
size: 32,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class _MatchDetailTabScreenState extends ConsumerState<MatchDetailTabScreen> {
String _getScreenTitle(BuildContext context, MatchDetailTabState state) {
if (state.match != null) {
String title = state.match!.teams
.map((e) => e.team.initials ?? e.team.name.initials(limit: 3))
.map((e) => e.team.name_initial ?? e.team.name.initials(limit: 3))
.join(" ${context.l10n.common_versus_short_title} ");
return title;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class _AddTossDetailScreenState extends ConsumerState<AddTossDetailScreen> {
(team) => _tossCellView(
context: context,
imageUrl: team.team.profile_img_url,
initial: team.team.initials ??
initial: team.team.name_initial ??
team.team.name.initials(limit: 1),
title: team.team.name,
isSelected: tossWinnerTeamId == team.team.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class _AddPenaltyRunSheetState extends ConsumerState<AddPenaltyRunSheet> {
title: firstTeam?.name ?? "",
imageUrl: firstTeam?.profile_img_url,
outerPadding: 32,
initial: firstTeam?.initials ??
initial: firstTeam?.name_initial ??
firstTeam?.name.initials(limit: 1) ??
"?",
isSelected: selectedTeamId == firstTeam?.id,
Expand All @@ -168,7 +168,7 @@ class _AddPenaltyRunSheetState extends ConsumerState<AddPenaltyRunSheet> {
UserCellView(
title: secondTeam?.name ?? "",
imageUrl: secondTeam?.profile_img_url,
initial: secondTeam?.initials ??
initial: secondTeam?.name_initial ??
secondTeam?.name.initials(limit: 1) ??
"?",
outerPadding: 32,
Expand Down
6 changes: 3 additions & 3 deletions khelo/lib/ui/flow/team/add_team/add_team_view_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class AddTeamViewNotifier extends StateNotifier<AddTeamState> {
void setData({TeamModel? editTeam}) {
state.nameController.text = editTeam?.name ?? "";
state.locationController.text = editTeam?.city ?? "";
state.nameInitialsController.text = editTeam?.initials ?? "";
state.nameInitialsController.text = editTeam?.name_initial ?? "";
state = state.copyWith(
editTeam: editTeam, teamMembers: editTeam?.players ?? []);
}
Expand Down Expand Up @@ -111,7 +111,7 @@ class AddTeamViewNotifier extends StateNotifier<AddTeamState> {
name_lowercase: name.caseAndSpaceInsensitive,
profile_img_url: imageUrl,
city: location.toLowerCase(),
initials: initials.isNotEmpty ? initials : null,
name_initial: initials.isNotEmpty ? initials : null,
created_by: state.currentUser!.id,
players: players,
created_at: state.editTeam?.created_at ?? DateTime.now(),
Expand Down Expand Up @@ -143,7 +143,7 @@ class AddTeamViewNotifier extends StateNotifier<AddTeamState> {
name_lowercase: name.caseAndSpaceInsensitive,
profile_img_url: imageUrl,
city: location.toLowerCase(),
initials: initials.isNotEmpty ? initials : null,
name_initial: initials.isNotEmpty ? initials : null,
created_by: state.currentUser!.id,
players: players,
created_at: state.editTeam?.created_at ?? DateTime.now(),
Expand Down
2 changes: 1 addition & 1 deletion khelo/lib/ui/flow/team/detail/team_detail_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class _TeamDetailScreenState extends ConsumerState<TeamDetailScreen> {
children: [
// profile view
ImageAvatar(
initial: state.team?.initials ?? state.team?.name.initials(limit: 1) ?? "?",
initial: state.team?.name_initial ?? state.team?.name.initials(limit: 1) ?? "?",
imageUrl: state.team?.profile_img_url,
size: 48,
),
Expand Down
2 changes: 1 addition & 1 deletion khelo/lib/ui/flow/team/search_team/search_team_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ class _SearchTeamScreenState extends ConsumerState<SearchTeamScreen> {
dense: true,
contentPadding: EdgeInsets.zero,
leading: ImageAvatar(
initial: team.initials ?? team.name.initials(limit: 1),
initial: team.name_initial ?? team.name.initials(limit: 1),
imageUrl: team.profile_img_url,
size: 40,
),
Expand Down
2 changes: 1 addition & 1 deletion khelo/lib/ui/flow/team/team_list_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class _TeamListScreenState extends ConsumerState<TeamListScreen>
child: ListTile(
contentPadding: EdgeInsets.zero,
leading: ImageAvatar(
initial: team.initials ?? team.name.initials(limit: 1),
initial: team.name_initial ?? team.name.initials(limit: 1),
imageUrl: team.profile_img_url,
size: 40,
),
Expand Down

0 comments on commit a561693

Please sign in to comment.