Skip to content

Commit

Permalink
Show user detail sheet on name tap (#70)
Browse files Browse the repository at this point in the history
* show detail sheet

* show user detail sheet in match detail screen

* temp

* format code

* add tap event on name only
  • Loading branch information
cp-sidhdhi-p authored Jul 5, 2024
1 parent 1992364 commit d12480c
Show file tree
Hide file tree
Showing 16 changed files with 261 additions and 202 deletions.
14 changes: 7 additions & 7 deletions data/.flutter-plugins
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# This is a generated file; do not edit or check into version control.
cloud_firestore=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore-4.17.5/
cloud_firestore_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore_web-3.12.5/
cloud_firestore=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore-5.0.0/
cloud_firestore_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/cloud_firestore_web-4.0.0/
device_info_plus=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/device_info_plus-10.1.0/
firebase_auth=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth-4.20.0/
firebase_auth_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth_web-5.12.0/
firebase_core=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core-2.32.0/
firebase_auth=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth-5.0.0/
firebase_auth_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_auth_web-5.12.1/
firebase_core=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core-3.0.0/
firebase_core_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_core_web-2.17.1/
firebase_storage=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage-11.7.7/
firebase_storage_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage_web-3.9.7/
firebase_storage=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage-12.0.0/
firebase_storage_web=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/firebase_storage_web-3.9.8/
flutter_timezone=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/flutter_timezone-1.0.8/
package_info_plus=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/package_info_plus-8.0.0/
path_provider_linux=/Users/sidhdhi.p/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
Expand Down
2 changes: 1 addition & 1 deletion data/.flutter-plugins-dependencies

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions data/lib/api/ball_score/ball_score_model.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// ignore_for_file: non_constant_identifier_names

import 'package:data/api/user/user_models.dart';
import 'package:data/extensions/double_extensions.dart';
import 'package:data/extensions/int_extensions.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
Expand Down Expand Up @@ -151,7 +152,7 @@ class OverSummary with _$OverSummary {
@freezed
class BatsmanSummary with _$BatsmanSummary {
const factory BatsmanSummary({
@Default(Player()) Player player,
@Default(UserModel(id: '')) UserModel player,
Player? ballBy,
Player? catchBy,
WicketType? wicketType,
Expand All @@ -166,7 +167,7 @@ class BatsmanSummary with _$BatsmanSummary {
@freezed
class BowlerSummary with _$BowlerSummary {
const factory BowlerSummary({
@Default(Player()) Player player,
@Default(UserModel(id: '')) UserModel player,
@Default(0) int runsConceded,
@Default(0) int maiden,
@Default(0) double overDelivered,
Expand Down Expand Up @@ -294,12 +295,15 @@ extension OverSummaryMetaData on OverSummary {
ballScores.sort((a, b) => a.time.compareTo(b.time));

final configuredStriker = striker.addBall(ball,
ballBy: ball.player_out_id == striker.player.id ? bowler.player : null,
ballBy: ball.player_out_id == striker.player.id
? Player(id: bowler.player.id, name: bowler.player.name ?? "")
: null,
catchBy: ball.player_out_id == striker.player.id ? catchBy : null);

final configuredNonStriker = nonStriker.addBall(ball,
ballBy:
ball.player_out_id == nonStriker.player.id ? bowler.player : null,
ballBy: ball.player_out_id == nonStriker.player.id
? Player(id: bowler.player.id, name: bowler.player.name ?? "")
: null,
catchBy: ball.player_out_id == nonStriker.player.id ? catchBy : null);

final outPlayersList = outPlayers.toList();
Expand Down
52 changes: 26 additions & 26 deletions data/lib/api/ball_score/ball_score_model.freezed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1992,7 +1992,7 @@ abstract class _OverSummary implements OverSummary {

/// @nodoc
mixin _$BatsmanSummary {
Player get player => throw _privateConstructorUsedError;
UserModel get player => throw _privateConstructorUsedError;
Player? get ballBy => throw _privateConstructorUsedError;
Player? get catchBy => throw _privateConstructorUsedError;
WicketType? get wicketType => throw _privateConstructorUsedError;
Expand All @@ -2014,7 +2014,7 @@ abstract class $BatsmanSummaryCopyWith<$Res> {
_$BatsmanSummaryCopyWithImpl<$Res, BatsmanSummary>;
@useResult
$Res call(
{Player player,
{UserModel player,
Player? ballBy,
Player? catchBy,
WicketType? wicketType,
Expand All @@ -2024,7 +2024,7 @@ abstract class $BatsmanSummaryCopyWith<$Res> {
int sixes,
int fours});

$PlayerCopyWith<$Res> get player;
$UserModelCopyWith<$Res> get player;
$PlayerCopyWith<$Res>? get ballBy;
$PlayerCopyWith<$Res>? get catchBy;
}
Expand Down Expand Up @@ -2056,7 +2056,7 @@ class _$BatsmanSummaryCopyWithImpl<$Res, $Val extends BatsmanSummary>
player: null == player
? _value.player
: player // ignore: cast_nullable_to_non_nullable
as Player,
as UserModel,
ballBy: freezed == ballBy
? _value.ballBy
: ballBy // ignore: cast_nullable_to_non_nullable
Expand Down Expand Up @@ -2094,8 +2094,8 @@ class _$BatsmanSummaryCopyWithImpl<$Res, $Val extends BatsmanSummary>

@override
@pragma('vm:prefer-inline')
$PlayerCopyWith<$Res> get player {
return $PlayerCopyWith<$Res>(_value.player, (value) {
$UserModelCopyWith<$Res> get player {
return $UserModelCopyWith<$Res>(_value.player, (value) {
return _then(_value.copyWith(player: value) as $Val);
});
}
Expand Down Expand Up @@ -2134,7 +2134,7 @@ abstract class _$$BatsmanSummaryImplCopyWith<$Res>
@override
@useResult
$Res call(
{Player player,
{UserModel player,
Player? ballBy,
Player? catchBy,
WicketType? wicketType,
Expand All @@ -2145,7 +2145,7 @@ abstract class _$$BatsmanSummaryImplCopyWith<$Res>
int fours});

@override
$PlayerCopyWith<$Res> get player;
$UserModelCopyWith<$Res> get player;
@override
$PlayerCopyWith<$Res>? get ballBy;
@override
Expand Down Expand Up @@ -2177,7 +2177,7 @@ class __$$BatsmanSummaryImplCopyWithImpl<$Res>
player: null == player
? _value.player
: player // ignore: cast_nullable_to_non_nullable
as Player,
as UserModel,
ballBy: freezed == ballBy
? _value.ballBy
: ballBy // ignore: cast_nullable_to_non_nullable
Expand Down Expand Up @@ -2218,7 +2218,7 @@ class __$$BatsmanSummaryImplCopyWithImpl<$Res>
class _$BatsmanSummaryImpl implements _BatsmanSummary {
const _$BatsmanSummaryImpl(
{this.player = const Player(),
{this.player = const UserModel(id: ''),
this.ballBy,
this.catchBy,
this.wicketType,
Expand All @@ -2230,7 +2230,7 @@ class _$BatsmanSummaryImpl implements _BatsmanSummary {

@override
@JsonKey()
final Player player;
final UserModel player;
@override
final Player? ballBy;
@override
Expand Down Expand Up @@ -2290,7 +2290,7 @@ class _$BatsmanSummaryImpl implements _BatsmanSummary {

abstract class _BatsmanSummary implements BatsmanSummary {
const factory _BatsmanSummary(
{final Player player,
{final UserModel player,
final Player? ballBy,
final Player? catchBy,
final WicketType? wicketType,
Expand All @@ -2301,7 +2301,7 @@ abstract class _BatsmanSummary implements BatsmanSummary {
final int fours}) = _$BatsmanSummaryImpl;

@override
Player get player;
UserModel get player;
@override
Player? get ballBy;
@override
Expand All @@ -2326,7 +2326,7 @@ abstract class _BatsmanSummary implements BatsmanSummary {

/// @nodoc
mixin _$BowlerSummary {
Player get player => throw _privateConstructorUsedError;
UserModel get player => throw _privateConstructorUsedError;
int get runsConceded => throw _privateConstructorUsedError;
int get maiden => throw _privateConstructorUsedError;
double get overDelivered => throw _privateConstructorUsedError;
Expand All @@ -2346,15 +2346,15 @@ abstract class $BowlerSummaryCopyWith<$Res> {
_$BowlerSummaryCopyWithImpl<$Res, BowlerSummary>;
@useResult
$Res call(
{Player player,
{UserModel player,
int runsConceded,
int maiden,
double overDelivered,
int wicket,
int noBalls,
int wideBalls});

$PlayerCopyWith<$Res> get player;
$UserModelCopyWith<$Res> get player;
}

/// @nodoc
Expand Down Expand Up @@ -2382,7 +2382,7 @@ class _$BowlerSummaryCopyWithImpl<$Res, $Val extends BowlerSummary>
player: null == player
? _value.player
: player // ignore: cast_nullable_to_non_nullable
as Player,
as UserModel,
runsConceded: null == runsConceded
? _value.runsConceded
: runsConceded // ignore: cast_nullable_to_non_nullable
Expand Down Expand Up @@ -2412,8 +2412,8 @@ class _$BowlerSummaryCopyWithImpl<$Res, $Val extends BowlerSummary>

@override
@pragma('vm:prefer-inline')
$PlayerCopyWith<$Res> get player {
return $PlayerCopyWith<$Res>(_value.player, (value) {
$UserModelCopyWith<$Res> get player {
return $UserModelCopyWith<$Res>(_value.player, (value) {
return _then(_value.copyWith(player: value) as $Val);
});
}
Expand All @@ -2428,7 +2428,7 @@ abstract class _$$BowlerSummaryImplCopyWith<$Res>
@override
@useResult
$Res call(
{Player player,
{UserModel player,
int runsConceded,
int maiden,
double overDelivered,
Expand All @@ -2437,7 +2437,7 @@ abstract class _$$BowlerSummaryImplCopyWith<$Res>
int wideBalls});

@override
$PlayerCopyWith<$Res> get player;
$UserModelCopyWith<$Res> get player;
}

/// @nodoc
Expand All @@ -2463,7 +2463,7 @@ class __$$BowlerSummaryImplCopyWithImpl<$Res>
player: null == player
? _value.player
: player // ignore: cast_nullable_to_non_nullable
as Player,
as UserModel,
runsConceded: null == runsConceded
? _value.runsConceded
: runsConceded // ignore: cast_nullable_to_non_nullable
Expand Down Expand Up @@ -2496,7 +2496,7 @@ class __$$BowlerSummaryImplCopyWithImpl<$Res>
class _$BowlerSummaryImpl implements _BowlerSummary {
const _$BowlerSummaryImpl(
{this.player = const Player(),
{this.player = const UserModel(id: ''),
this.runsConceded = 0,
this.maiden = 0,
this.overDelivered = 0,
Expand All @@ -2506,7 +2506,7 @@ class _$BowlerSummaryImpl implements _BowlerSummary {

@override
@JsonKey()
final Player player;
final UserModel player;
@override
@JsonKey()
final int runsConceded;
Expand Down Expand Up @@ -2561,7 +2561,7 @@ class _$BowlerSummaryImpl implements _BowlerSummary {

abstract class _BowlerSummary implements BowlerSummary {
const factory _BowlerSummary(
{final Player player,
{final UserModel player,
final int runsConceded,
final int maiden,
final double overDelivered,
Expand All @@ -2570,7 +2570,7 @@ abstract class _BowlerSummary implements BowlerSummary {
final int wideBalls}) = _$BowlerSummaryImpl;

@override
Player get player;
UserModel get player;
@override
int get runsConceded;
@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:khelo/components/user_detail_cell.dart';
import 'package:khelo/domain/extensions/context_extensions.dart';
import 'package:khelo/ui/flow/matches/add_match/select_squad/components/user_detail_sheet.dart';
import 'package:khelo/ui/flow/matches/add_match/select_squad/select_squad_view_model.dart';
import 'package:style/animations/on_tap_scale.dart';
import 'package:style/button/bottom_sticky_overlay.dart';
Expand Down Expand Up @@ -77,6 +78,7 @@ class SelectAdminAndCaptainDialog extends ConsumerWidget {
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: UserDetailCell(
user: member.player,
onTap: () => UserDetailSheet.show(context, member.player),
trailing: _selectButtons(context, notifier, state, member),
),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class CommentaryBallSummary extends StatelessWidget {

String batsManSummary = " ";
if (outPlayerSummary != null && outPlayerSummary.wicketType != null) {
batsManSummary += outPlayerSummary.player.name;
batsManSummary += outPlayerSummary.player.name ?? '';

if (outPlayerSummary.wicketType != WicketType.retired &&
outPlayerSummary.wicketType != WicketType.retiredHurt &&
Expand All @@ -83,8 +83,8 @@ class CommentaryBallSummary extends StatelessWidget {
style:
AppTextStyle.body1.copyWith(color: context.colorScheme.textDisabled),
TextSpan(
text: context.l10n
.match_commentary_bowler_to_batsman_text(bowlerName, batsmanName),
text: context.l10n.match_commentary_bowler_to_batsman_text(
bowlerName ?? '', batsmanName),
children: [
TextSpan(
text: " ${_getBallResult(context)}",
Expand All @@ -105,16 +105,17 @@ class CommentaryBallSummary extends StatelessWidget {

String _getBatsmanNameById(String batsmanId) {
if (overSummary.striker.player.id == batsmanId) {
return overSummary.striker.player.name;
return overSummary.striker.player.name ?? '';
} else if (overSummary.nonStriker.player.id == batsmanId) {
return overSummary.nonStriker.player.name;
return overSummary.nonStriker.player.name ?? '';
} else if (overSummary.outPlayers
.map((e) => e.player.id)
.contains(batsmanId)) {
return overSummary.outPlayers
.firstWhere((e) => e.player.id == batsmanId)
.player
.name;
.firstWhere((e) => e.player.id == batsmanId)
.player
.name ??
'';
} else {
return "";
}
Expand Down
Loading

0 comments on commit d12480c

Please sign in to comment.