diff --git a/khelo/lib/ui/flow/score_board/components/select_wicket_type_sheet.dart b/khelo/lib/ui/flow/score_board/components/select_wicket_type_sheet.dart index bcca0e14..63800e56 100644 --- a/khelo/lib/ui/flow/score_board/components/select_wicket_type_sheet.dart +++ b/khelo/lib/ui/flow/score_board/components/select_wicket_type_sheet.dart @@ -42,27 +42,13 @@ class _SelectWicketTypeSheetState extends ConsumerState { final state = ref.watch(scoreBoardStateProvider); return BottomSheetWrapper( - content: _wicketTypeContent(context, state), - action: [ - PrimaryButton( - context.l10n.common_okay_title, - enabled: selectedType != null, - onPressed: () => context.pop(selectedType), - ) - ]); - } - - Widget _wicketTypeContent(BuildContext context, ScoreBoardViewState state) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - context.l10n.score_board_inning_complete_title, - style: AppTextStyle.header3 - .copyWith(color: context.colorScheme.textPrimary), - ), - const SizedBox(height: 16), - _typeList(context, state), + content: _typeList(context, state), + action: [ + PrimaryButton( + context.l10n.common_okay_title, + enabled: selectedType != null, + onPressed: () => context.pop(selectedType), + ) ], ); } @@ -86,21 +72,17 @@ class _SelectWicketTypeSheetState extends ConsumerState { style: AppTextStyle.body2.copyWith( color: isSelected ? context.colorScheme.onPrimary - : context.colorScheme.textPrimary, + : context.colorScheme.textSecondary, ), ), padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), - side: BorderSide( - color: isSelected - ? context.colorScheme.primary - : context.colorScheme.outline, - ), + side: const BorderSide(color: Colors.transparent), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(30), ), backgroundColor: isSelected ? context.colorScheme.primary - : context.colorScheme.surface, + : context.colorScheme.containerLowOnSurface, ), ); }, diff --git a/style/lib/text/app_text_style.dart b/style/lib/text/app_text_style.dart index 10d2851a..18c7b1bd 100644 --- a/style/lib/text/app_text_style.dart +++ b/style/lib/text/app_text_style.dart @@ -5,8 +5,9 @@ class AppTextStyle { static const TextStyle header1 = TextStyle( fontFamily: poppinsFontFamily, - fontWeight: FontWeight.w700, + fontWeight: FontWeight.w600, fontSize: 26, + letterSpacing: -0.64, height: 1.2, package: 'style', ); @@ -15,7 +16,8 @@ class AppTextStyle { fontFamily: poppinsFontFamily, fontWeight: FontWeight.w600, fontSize: 22, - height: 1.4, + height: 1.2, + letterSpacing: -0.64, package: 'style', ); @@ -23,7 +25,8 @@ class AppTextStyle { fontFamily: poppinsFontFamily, fontWeight: FontWeight.w600, fontSize: 20, - height: 1.4, + height: 1.2, + letterSpacing: -0.64, package: 'style', ); @@ -31,7 +34,8 @@ class AppTextStyle { fontFamily: poppinsFontFamily, fontWeight: FontWeight.w600, fontSize: 18, - height: 1.4, + height: 1.2, + letterSpacing: -0.64, package: 'style', ); @@ -48,6 +52,7 @@ class AppTextStyle { fontWeight: FontWeight.w500, fontSize: 16, height: 1.3, + letterSpacing: -0.32, package: 'style', ); @@ -56,6 +61,7 @@ class AppTextStyle { fontWeight: FontWeight.normal, fontSize: 16, height: 1.3, + letterSpacing: -0.32, package: 'style', ); @@ -63,6 +69,7 @@ class AppTextStyle { fontFamily: poppinsFontFamily, fontWeight: FontWeight.normal, fontSize: 15, + height: 1.5, package: 'style', ); @@ -70,6 +77,7 @@ class AppTextStyle { fontFamily: poppinsFontFamily, fontWeight: FontWeight.normal, fontSize: 14, + height: 1.5, package: 'style', ); @@ -77,6 +85,7 @@ class AppTextStyle { fontFamily: poppinsFontFamily, fontWeight: FontWeight.w600, fontSize: 14, + height: 1.5, package: 'style', ); @@ -84,6 +93,7 @@ class AppTextStyle { fontFamily: poppinsFontFamily, fontWeight: FontWeight.w500, fontSize: 12, + height: 1.5, package: 'style', ); }