From 3e18a4df2563858bfbbfd689c20effefbb3340fa Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 25 Oct 2026 18:01:24 +0200 Subject: [PATCH] After refonte for the options of Profile3 --- .../presentation/referral_directs_screen.dart | 198 ++++++++++++- .../widgets/referral_member_card.dart | 259 ++++++++++++------ .../referral/utils/referral_display.dart | 44 +++ prediqo_mobile/lib/l10n/app_strings.dart | 13 + 4 files changed, 415 insertions(+), 99 deletions(-) diff --git a/prediqo_mobile/lib/features/referral/presentation/referral_directs_screen.dart b/prediqo_mobile/lib/features/referral/presentation/referral_directs_screen.dart index dc7c0e04..0ad41a84 100644 --- a/prediqo_mobile/lib/features/referral/presentation/referral_directs_screen.dart +++ b/prediqo_mobile/lib/features/referral/presentation/referral_directs_screen.dart @@ -1,3 +1,5 @@ +import 'dart:async'; + import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import '../../../core/di/injection.dart'; @@ -9,9 +11,10 @@ import '../../../l10n/app_strings.dart'; import '../../../shared/widgets/pred_skeleton.dart'; import '../../../shared/widgets/section_error.dart'; import '../../../shared/widgets/tloto_gradient_app_bar.dart'; +import '../utils/referral_display.dart'; import 'widgets/referral_member_card.dart'; -const _pageSize = 15; +const _pageSize = 20; /// Full list of the user's direct (level-1) referrals. class ReferralDirectsScreen extends StatefulWidget { @@ -23,11 +26,17 @@ class ReferralDirectsScreen extends StatefulWidget { class _ReferralDirectsScreenState extends State { final _repo = sl(); + final _searchController = TextEditingController(); + final _searchFocus = FocusNode(); + bool _loading = true; bool _retrying = false; String? _error; List _members = []; + List _filtered = []; int _visibleCount = _pageSize; + String _query = ''; + Timer? _debounce; @override void initState() { @@ -35,11 +44,50 @@ class _ReferralDirectsScreenState extends State { final cached = _repo.peekLastDashboard(maxDepth: 1); if (cached != null) { _members = cached.directMembers; + _filtered = _members; _loading = false; } + _searchController.addListener(_onSearchChanged); _load(); } + @override + void dispose() { + _debounce?.cancel(); + _searchController.removeListener(_onSearchChanged); + _searchController.dispose(); + _searchFocus.dispose(); + super.dispose(); + } + + void _onSearchChanged() { + _debounce?.cancel(); + _debounce = Timer(const Duration(milliseconds: 120), () { + if (!mounted) return; + _applyFilter(_searchController.text); + }); + } + + void _applyFilter(String raw) { + final s = context.strings; + final next = filterReferralMembers(_members, raw, strings: s); + setState(() { + _query = raw; + _filtered = next; + _visibleCount = _pageSize; + }); + } + + void _clearSearch() { + _debounce?.cancel(); + _searchController.clear(); + setState(() { + _query = ''; + _filtered = _members; + _visibleCount = _pageSize; + }); + } + Future _load({bool force = false}) async { final keep = _members.isNotEmpty && !force; if (!keep) { @@ -60,6 +108,11 @@ class _ReferralDirectsScreenState extends State { if (!mounted) return; setState(() { _members = dashboard.directMembers; + _filtered = filterReferralMembers( + _members, + _searchController.text, + strings: context.strings, + ); _visibleCount = _pageSize; _loading = false; _error = null; @@ -84,8 +137,8 @@ class _ReferralDirectsScreenState extends State { final s = context.strings; final isDark = Theme.of(context).brightness == Brightness.dark; final bottomInset = MediaQuery.paddingOf(context).bottom; - final visible = _members.take(_visibleCount).toList(); - final remaining = _members.length - visible.length; + final visible = _filtered.take(_visibleCount).toList(); + final remaining = _filtered.length - visible.length; return AnnotatedRegion( value: TlotoGradientAppBar.overlayStyle, @@ -97,6 +150,17 @@ class _ReferralDirectsScreenState extends State { title: s.directReferrals, showBack: true, ), + if (!_loading || _members.isNotEmpty) + _SearchBar( + controller: _searchController, + focusNode: _searchFocus, + hasQuery: _query.trim().isNotEmpty, + onClear: _clearSearch, + hint: s.searchDirectReferrals, + resultCount: _members.isEmpty + ? null + : s.directSearchCount(_filtered.length, _members.length), + ), Expanded( child: RefreshIndicator( onRefresh: () => _load(force: true), @@ -125,13 +189,15 @@ class _ReferralDirectsScreenState extends State { physics: const AlwaysScrollableScrollPhysics( parent: BouncingScrollPhysics(), ), - padding: EdgeInsets.fromLTRB(20, 16, 20, 24 + bottomInset), + padding: EdgeInsets.fromLTRB(16, 12, 16, 24 + bottomInset), children: const [ - PredSkeletonCard(height: 88), - SizedBox(height: 10), - PredSkeletonCard(height: 88), - SizedBox(height: 10), - PredSkeletonCard(height: 88), + PredSkeletonCard(height: 72), + SizedBox(height: 8), + PredSkeletonCard(height: 72), + SizedBox(height: 8), + PredSkeletonCard(height: 72), + SizedBox(height: 8), + PredSkeletonCard(height: 72), ], ); } @@ -140,7 +206,7 @@ class _ReferralDirectsScreenState extends State { physics: const AlwaysScrollableScrollPhysics( parent: BouncingScrollPhysics(), ), - padding: EdgeInsets.fromLTRB(20, 16, 20, 24 + bottomInset), + padding: EdgeInsets.fromLTRB(16, 12, 16, 24 + bottomInset), children: [ SectionError( message: _error!, @@ -169,27 +235,131 @@ class _ReferralDirectsScreenState extends State { ], ); } + if (_filtered.isEmpty) { + return ListView( + physics: const AlwaysScrollableScrollPhysics( + parent: BouncingScrollPhysics(), + ), + padding: EdgeInsets.fromLTRB(40, 40, 40, 40 + bottomInset), + children: [ + Icon(Icons.search_off_rounded, size: 48, color: muted), + const SizedBox(height: 12), + Text( + s.noDirectSearchResults, + textAlign: TextAlign.center, + style: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: secondary, + ), + ), + const SizedBox(height: 12), + Center( + child: TextButton( + onPressed: _clearSearch, + child: Text(s.clearDirectSearch), + ), + ), + ], + ); + } + return ListView.separated( physics: const AlwaysScrollableScrollPhysics( parent: BouncingScrollPhysics(), ), - padding: EdgeInsets.fromLTRB(20, 16, 20, 24 + bottomInset), + padding: EdgeInsets.fromLTRB(16, 8, 16, 24 + bottomInset), itemCount: visible.length + (remaining > 0 ? 1 : 0), - separatorBuilder: (_, __) => const SizedBox(height: 10), + separatorBuilder: (_, __) => const SizedBox(height: 8), itemBuilder: (context, index) { if (index >= visible.length) { return TextButton( onPressed: () { setState(() { _visibleCount = - (_visibleCount + _pageSize).clamp(0, _members.length); + (_visibleCount + _pageSize).clamp(0, _filtered.length); }); }, child: Text(s.loadMoreRemaining(remaining)), ); } - return ReferralMemberCard(member: visible[index]); + return ReferralMemberCard( + key: ValueKey(visible[index].userId), + member: visible[index], + ); }, ); } } + +class _SearchBar extends StatelessWidget { + const _SearchBar({ + required this.controller, + required this.focusNode, + required this.hasQuery, + required this.onClear, + required this.hint, + this.resultCount, + }); + + final TextEditingController controller; + final FocusNode focusNode; + final bool hasQuery; + final VoidCallback onClear; + final String hint; + final String? resultCount; + + @override + Widget build(BuildContext context) { + final isDark = Theme.of(context).brightness == Brightness.dark; + return Padding( + padding: const EdgeInsets.fromLTRB(16, 10, 16, 4), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + TextField( + key: const Key('referral_directs_search'), + controller: controller, + focusNode: focusNode, + textInputAction: TextInputAction.search, + decoration: InputDecoration( + hintText: hint, + isDense: true, + filled: true, + fillColor: isDark + ? AppColors.surfaceElevated + : const Color(0xFFF1F5F9), + prefixIcon: const Icon(Icons.search_rounded, size: 22), + suffixIcon: hasQuery + ? IconButton( + key: const Key('referral_directs_search_clear'), + tooltip: MaterialLocalizations.of(context) + .deleteButtonTooltip, + onPressed: onClear, + icon: const Icon(Icons.close_rounded, size: 20), + ) + : null, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(14), + borderSide: BorderSide.none, + ), + contentPadding: const EdgeInsets.symmetric( + horizontal: 12, + vertical: 10, + ), + ), + ), + if (resultCount != null) ...[ + const SizedBox(height: 6), + Text( + resultCount!, + style: Theme.of(context).textTheme.labelSmall?.copyWith( + color: isDark + ? AppColors.textMuted + : const Color(0xFF64748B), + ), + ), + ], + ], + ), + ); + } +} diff --git a/prediqo_mobile/lib/features/referral/presentation/widgets/referral_member_card.dart b/prediqo_mobile/lib/features/referral/presentation/widgets/referral_member_card.dart index 2096e9d9..155bdd86 100644 --- a/prediqo_mobile/lib/features/referral/presentation/widgets/referral_member_card.dart +++ b/prediqo_mobile/lib/features/referral/presentation/widgets/referral_member_card.dart @@ -5,112 +5,199 @@ import '../../../../l10n/app_strings.dart'; import '../../../../shared/widgets/pred_card.dart'; import '../../utils/referral_display.dart'; -/// Detailed card for one network member (direct list + tree leaves). -class ReferralMemberCard extends StatelessWidget { +/// Compact expandable card for one direct referral. +class ReferralMemberCard extends StatefulWidget { const ReferralMemberCard({ super.key, required this.member, - this.compact = false, + this.initiallyExpanded = false, }); final ReferralNetworkMember member; - final bool compact; + final bool initiallyExpanded; + + @override + State createState() => _ReferralMemberCardState(); +} + +class _ReferralMemberCardState extends State { + late bool _expanded = widget.initiallyExpanded; @override Widget build(BuildContext context) { final s = context.strings; + final member = widget.member; final statusColor = referralStatusColor(member.status); + final isDark = Theme.of(context).brightness == Brightness.dark; + return PredCard( - padding: const EdgeInsets.all(16), + padding: EdgeInsets.zero, child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CircleAvatar( - radius: 20, - backgroundColor: AppColors.primary.withValues(alpha: 0.18), - child: Text( - member.displayName.isNotEmpty - ? member.displayName.characters.first.toUpperCase() - : '?', - style: const TextStyle( - fontWeight: FontWeight.w800, - color: AppColors.primary, - ), - ), - ), - const SizedBox(width: 12), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - member.displayName, - style: const TextStyle(fontWeight: FontWeight.w800, fontSize: 16), + InkWell( + onTap: () => setState(() => _expanded = !_expanded), + borderRadius: BorderRadius.circular(20), + child: Padding( + padding: const EdgeInsets.fromLTRB(12, 12, 8, 12), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + CircleAvatar( + radius: 18, + backgroundColor: AppColors.primary.withValues(alpha: 0.18), + child: Text( + member.displayName.isNotEmpty + ? member.displayName.characters.first.toUpperCase() + : '?', + style: const TextStyle( + fontWeight: FontWeight.w800, + color: AppColors.primary, + ), ), - const SizedBox(height: 6), - Wrap( - spacing: 6, - runSpacing: 6, + ), + const SizedBox(width: 10), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - _Chip( - label: s.referralLevelLabel(member.levelNumber), - color: AppColors.info, - ), - _Chip( - label: referralStatusLabel(member.status, s), - color: statusColor, - ), - if (member.generatesCommissions) - _Chip( - label: s.generatesCommissions, - color: AppColors.accentGold, + Text( + member.displayName, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: const TextStyle( + fontWeight: FontWeight.w800, + fontSize: 15, ), - if (member.directReferralsCount > 0) - _Chip( - label: s.directCountLabel(member.directReferralsCount), - color: AppColors.primary, + ), + const SizedBox(height: 4), + Wrap( + spacing: 6, + runSpacing: 4, + children: [ + _Chip( + label: referralStatusLabel(member.status, s), + color: statusColor, + ), + if (member.directReferralsCount > 0) + _Chip( + label: s.directCountLabel( + member.directReferralsCount, + ), + color: AppColors.primary, + ), + if (!_expanded) + _Chip( + label: formatReferralDate(member.registeredAt), + color: isDark + ? AppColors.textMuted + : const Color(0xFF64748B), + ), + ], + ), + if (!_expanded) ...[ + const SizedBox(height: 4), + Text( + [ + if (member.referralCode != null && + member.referralCode!.isNotEmpty) + member.referralCode!, + formatUsdt(member.commissionsPaidRaw), + ].join(' · '), + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 11, + fontWeight: FontWeight.w600, + color: isDark + ? AppColors.textMuted + : const Color(0xFF64748B), + ), ), + ], ], ), - ], - ), + ), + AnimatedRotation( + turns: _expanded ? 0.5 : 0, + duration: const Duration(milliseconds: 180), + child: Icon( + Icons.expand_more_rounded, + color: isDark + ? AppColors.textMuted + : const Color(0xFF64748B), + ), + ), + ], ), - ], + ), ), - if (!compact) ...[ - const SizedBox(height: 14), - _InfoRow( - label: s.registeredAt, - value: formatReferralDate(member.registeredAt), + AnimatedCrossFade( + firstChild: const SizedBox.shrink(), + secondChild: Padding( + padding: const EdgeInsets.fromLTRB(12, 0, 12, 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Divider( + height: 1, + color: (isDark ? Colors.white : Colors.black) + .withValues(alpha: 0.08), + ), + const SizedBox(height: 10), + _InfoRow( + label: s.registeredAt, + value: formatReferralDate(member.registeredAt), + ), + _InfoRow( + label: s.email, + value: (member.email?.trim().isNotEmpty ?? false) + ? member.email!.trim() + : '—', + ), + _InfoRow( + label: s.memberCountry, + value: () { + final n = member.countryName?.trim(); + final c = member.countryOfResidence?.trim(); + if (n != null && n.isNotEmpty) return n; + if (c != null && c.isNotEmpty) return c; + return '—'; + }(), + ), + _InfoRow( + label: s.memberReferralCode, + value: (member.referralCode?.trim().isNotEmpty ?? false) + ? member.referralCode!.trim() + : '—', + ), + _InfoRow( + label: s.predictionsCount, + value: '${member.realPredictionsCount}', + ), + _InfoRow( + label: s.commissionsGenerated, + value: formatUsdt(member.commissionsGeneratedRaw), + ), + _InfoRow( + label: s.commissionsPaidLabel, + value: formatUsdt(member.commissionsPaidRaw), + valueColor: AppColors.success, + ), + _InfoRow( + label: s.commissionsPendingLabel, + value: formatUsdt(member.commissionsPendingRaw), + valueColor: AppColors.warning, + ), + ], + ), ), - if (member.email != null && member.email!.isNotEmpty) - _InfoRow(label: s.email, value: member.email!), - if (member.countryName != null && member.countryName!.isNotEmpty) - _InfoRow(label: s.countryOfResidence.replaceAll(' *', ''), value: member.countryName!), - if (member.referralCode != null && member.referralCode!.isNotEmpty) - _InfoRow(label: s.yourReferralCode, value: member.referralCode!), - _InfoRow( - label: s.predictionsCount, - value: '${member.realPredictionsCount}', - ), - _InfoRow( - label: s.commissionsGenerated, - value: formatUsdt(member.commissionsGeneratedRaw), - ), - _InfoRow( - label: s.commissionsPaidLabel, - value: formatUsdt(member.commissionsPaidRaw), - valueColor: AppColors.success, - ), - _InfoRow( - label: s.commissionsPendingLabel, - value: formatUsdt(member.commissionsPendingRaw), - valueColor: AppColors.warning, - ), - ], + crossFadeState: _expanded + ? CrossFadeState.showSecond + : CrossFadeState.showFirst, + duration: const Duration(milliseconds: 200), + sizeCurve: Curves.easeOutCubic, + ), ], ), ); @@ -125,7 +212,7 @@ class _Chip extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3), + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2), decoration: BoxDecoration( color: color.withValues(alpha: 0.15), borderRadius: BorderRadius.circular(999), @@ -162,6 +249,7 @@ class _InfoRow extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Expanded( + flex: 2, child: Text( label, style: Theme.of(context).textTheme.bodySmall?.copyWith( @@ -170,7 +258,8 @@ class _InfoRow extends StatelessWidget { ), ), const SizedBox(width: 8), - Flexible( + Expanded( + flex: 3, child: Text( value, textAlign: TextAlign.end, diff --git a/prediqo_mobile/lib/features/referral/utils/referral_display.dart b/prediqo_mobile/lib/features/referral/utils/referral_display.dart index c12f5698..7ff10ead 100644 --- a/prediqo_mobile/lib/features/referral/utils/referral_display.dart +++ b/prediqo_mobile/lib/features/referral/utils/referral_display.dart @@ -45,3 +45,47 @@ Map> buildReferralChildMap( } return map; } + +String _norm(String? value) => (value ?? '').trim().toLowerCase(); + +/// Client-side filter for direct referrals (no phone field in API). +/// Matches partial tokens against name, ids, email, code, country, status, dates. +List filterReferralMembers( + List members, + String query, { + required AppStrings strings, +}) { + final q = query.trim().toLowerCase(); + if (q.isEmpty) return members; + + final tokens = q.split(RegExp(r'\s+')).where((t) => t.isNotEmpty).toList(); + if (tokens.isEmpty) return members; + + return members.where((m) { + final registered = DateTime.tryParse(m.registeredAt)?.toLocal(); + final registeredFmt = + registered != null ? DateFormat('dd/MM/yyyy').format(registered) : ''; + final registeredIso = registered != null + ? DateFormat('yyyy-MM-dd').format(registered) + : ''; + final haystack = [ + m.displayName, + m.userId, + m.email, + m.referralCode, + m.countryName, + m.countryOfResidence, + m.status.name, + referralStatusLabel(m.status, strings), + registeredFmt, + registeredIso, + registered?.year.toString(), + 'level ${m.levelNumber}', + 'niveau ${m.levelNumber}', + m.levelNumber.toString(), + if (m.directReferralsCount > 0) '${m.directReferralsCount} direct', + ].map(_norm).join(' '); + + return tokens.every((token) => haystack.contains(token)); + }).toList(); +} diff --git a/prediqo_mobile/lib/l10n/app_strings.dart b/prediqo_mobile/lib/l10n/app_strings.dart index d1faced8..edd60fe1 100644 --- a/prediqo_mobile/lib/l10n/app_strings.dart +++ b/prediqo_mobile/lib/l10n/app_strings.dart @@ -560,6 +560,19 @@ class AppStrings { String get viewNetworkTree => t('Explore network tree', 'Explorer l’arbre du réseau'); String get yourReferrer => t('Your referrer', 'Votre parrain'); String get noDirectReferrals => t('No direct referrals yet', 'Aucun filleul direct'); + String get searchDirectReferrals => t( + 'Search by name, email, code, country, status…', + 'Rechercher par nom, e-mail, code, pays, statut…', + ); + String get noDirectSearchResults => t( + 'No referrals match your search.', + 'Aucun filleul ne correspond à votre recherche.', + ); + String get clearDirectSearch => t('Clear search', 'Effacer la recherche'); + String directSearchCount(int shown, int total) => t( + '$shown of $total', + '$shown sur $total', + ); String get noNetworkMembers => t( 'Your network is empty. Share your invite link to grow your team.', 'Votre réseau est vide. Partagez votre lien d’invitation pour grandir.',