si-sm/fanuzu
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

POP 내역 총 보유 · 예약 · 사용 가능 3구분 · 온보딩 추천인 코드

Browse Source
This commit is contained in:
Sn-Kinos
2026-10-06 20:05:18 +09:00
parent 363c74736c
commit a04626b003
20 changed files with 235 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/auth/onboarding_data.dart
+7 -1
View File
@@ -164,7 +164,13 @@ class SampleOnboardingRepository implements OnboardingRepository {
}) async => profile = (nickname: nickname, country: country, locale: locale);
@override
Future<void> attributeReferral(String code) async => referral = code;
Future<void> attributeReferral(String code) async {
// 서버 `fnReferralAttribute` 처럼 1인 1회 — 두 번째는 거절(E-POP-03).
if (referral != null) {
throw const BackendException('E-POP-03', '이미 처리된 추천입니다.');
}
referral = code;
}
@override
Future<List<OnboardingFandom>> fandoms({String query = ''}) async => [
app/lib/features/auth/onboarding_screens.dart
+26 -4
View File
@@ -165,6 +165,10 @@ class _OnboardingFlowState extends State<OnboardingFlow> {
/// ② 에서 서버에 기록한 동의 항목. ③ 에서 뒤로 오면 이 상태로 체크해 보여 준다.
Set<String>? _agreed;
/// ③ 에서 서버에 귀속한 추천인 코드. ④ 에서 뒤로 와 다시 「다음」이면 또 부르지 않는다
/// (서버는 1인 1회라 두 번째 호출을 거절한다).
String? _referred;
/// ④ 에서 고른 팬덤 — 고른 순서. 첫 번째가 대표(Primary).
final _picked = <OnboardingFandom>[];
@@ -241,6 +245,8 @@ class _OnboardingFlowState extends State<OnboardingFlow> {
),
_Step.profile => _ProfileStep(
repository: widget.repository,
referred: _referred,
onReferred: (code) => _referred = code,
onBack: _back,
onDone: () => setState(() => _step = _Step.artist),
),
@@ -287,11 +293,17 @@ class _OnboardingFlowState extends State<OnboardingFlow> {
class _ProfileStep extends StatefulWidget {
const _ProfileStep({
required this.repository,
required this.referred,
required this.onReferred,
required this.onDone,
required this.onBack,
});
final OnboardingRepository repository;
/// 이미 귀속한 추천인 코드(뒤로 왔을 때 채워 보여 준다).
final String? referred;
final ValueChanged<String> onReferred;
final VoidCallback onDone;
final VoidCallback onBack;
@@ -301,7 +313,7 @@ class _ProfileStep extends StatefulWidget {
class _ProfileStepState extends State<_ProfileStep> {
final _nickname = TextEditingController();
final _referral = TextEditingController();
late final _referral = TextEditingController(text: widget.referred);
String? _country = _deviceCountry();
Locale? _locale;
String? _nicknameError;
@@ -360,11 +372,20 @@ class _ProfileStepState extends State<_ProfileStep> {
);
if (_locale != null) await scope?.select(_locale!);
final code = _referral.text.trim().toUpperCase();
if (code.isNotEmpty) {
if (code.isNotEmpty && code != widget.referred) {
try {
await widget.repository.attributeReferral(code);
widget.onReferred(code);
} on BackendException catch (e) {
if (mounted) setState(() => _referralError = e.message);
// 거절 사유(형식 · 없는 코드 · 본인 · 상호 · 이미 등록 · 7일 경과)는 Figma `511:86845`
// 문구 하나로 보인다(C-119 「오류 문구 재사용」). 통신 실패만 서버 문구 그대로.
if (mounted) {
setState(
() => _referralError = e.code == 'E-SYS-01'
? e.message
: l10n.onbReferralInvalid,
);
}
return;
}
}
@@ -440,6 +461,8 @@ class _ProfileStepState extends State<_ProfileStep> {
onChanged: (v) => setState(() => _locale = v),
),
const SizedBox(height: AppSpace.s3),
// 추천인 코드 입력칸 — Figma 이메일 가입 `333:18620`(입력칸) · `511:86845`(오류) ·
// `511:86809`(선택 입력). 10/3 통합회신 7항으로 가입 직후 온보딩에 둔다(C-119).
TextField(
controller: _referral,
textCapitalization: TextCapitalization.characters,
@@ -447,7 +470,6 @@ class _ProfileStepState extends State<_ProfileStep> {
onChanged: (_) => setState(() => _referralError = null),
decoration: InputDecoration(
labelText: l10n.onbReferral,
helperText: l10n.onbReferralHint,
errorText: _referralError,
),
),
app/lib/features/my/my_data.dart
+8 -1
View File
@@ -322,6 +322,7 @@ class MyProfile {
this.userLevel = 1,
this.passportTier = PassportTier.silver,
required this.balancePop,
this.reservedPop = 0,
required this.steps,
required this.completedQuests,
required this.planetTiers,
@@ -346,9 +347,15 @@ class MyProfile {
/// 대표 팬덤의 Passport Tier(B-65 · 10/3 #10 사용자 × 팬덤). 팬덤별 값은 [planetTiers].
final PassportTier passportTier;
/// 보유 POP(활동).
/// 총 보유 POP — 일반 + 기여 + 예약(G-05 `총 보유 = 예약 + 사용 가능`).
final int balancePop;
/// 예약 — 검토 대기 보상처럼 묶여 있어 아직 쓸 수 없는 몫(서버 `pendingActivity`).
final int reservedPop;
/// 사용 가능 = 총 보유 − 예약.
int get availablePop => balancePop - reservedPop;
/// 누적 걸음. 명세 `549:22058` 의 프로필 카드 항목.
final int steps;
final int completedQuests;
app/lib/features/my/my_repository_firestore.dart
+3 -2
View File
@@ -23,7 +23,7 @@ import '../../core/i18n/app_locale.dart';
/// - Passport `users/{uid}/passports/{fandomId}.tier` — **팬덤별**(10/3 #10 · 9/21 5절). 없으면 SILVER.
/// 탈퇴한 팬덤의 Passport 도 지우지 않고 보인다(ARCHIVED).
/// - Badge `users/{uid}/badges`(상세정의 4장 · 별첨 1 ②-5)
/// - 잔액 `users/{uid}/wallet/main.activityBalance`
/// - 잔액 `users/{uid}/wallet/main` — 사용 가능 = `activityBalance + supportBalance`, 예약 = `pendingActivity`(G-05)
/// - 행성별 기여 `fandoms/{fandomId}` + `fandoms/{fandomId}/members/{uid}.contributedPop`
/// - POP 원장 `users/{uid}/popTransactions` (최신순 · 커서 `createdAt`)
/// - 공지 `notices`
@@ -126,7 +126,8 @@ class FirestoreMyRepository extends SampleMyRepository {
userExp: user.intOr('userExp'),
userLevel: user.intOr('userLevel').clamp(1, 1 << 31),
passportTier: primaryTier,
balancePop: wallet.intOr('activityBalance'),
balancePop: wallet.intOr('activityBalance') + wallet.intOr('supportBalance') + wallet.intOr('pendingActivity'),
reservedPop: wallet.intOr('pendingActivity'),
steps: user.intOr('steps'),
completedQuests: await completedF,
planetTiers: tiers,
app/lib/features/my/pop_history_screen.dart
+27 -5
View File
@@ -109,7 +109,7 @@ class _PopHistoryScreenState extends State<PopHistoryScreen> {
itemCount:
1 + (_entries.isEmpty ? 1 : _entries.length) + (_hasMore ? 1 : 0),
itemBuilder: (context, i) {
if (i == 0) return _Balance(pop: profile.balancePop);
if (i == 0) return _Balance(profile: profile);
i -= 1;
if (_entries.isEmpty && i == 0) {
return ColoredBox(
@@ -148,11 +148,14 @@ class _PopHistoryScreenState extends State<PopHistoryScreen> {
}
}
/// 보유 POP — 번개 20 + 「POP」 18/500 민트 · 값 36/900.
/// 보유 POP — 번개 20 + 「POP」 18/500 민트 · 값 36/900(명세 `554:23714` 현재 보유 POP = 총 보유).
///
/// 그 아래 「총 보유 · 예약 · 사용 가능」 세 값(정책 설계서 잔액 구분 · G-05 · QA 2-29).
/// Figma 에는 이 줄이 없어 배치는 해석 확인 대상이다.
class _Balance extends StatelessWidget {
const _Balance({required this.pop});
const _Balance({required this.profile});
final int pop;
final MyProfile profile;
@override
Widget build(BuildContext context) => Container(
@@ -182,7 +185,7 @@ class _Balance extends StatelessWidget {
child: OverflowBox(
maxHeight: 48,
child: Text(
formatPop(pop),
formatPop(profile.balancePop),
style: const TextStyle(
fontFamily: AppFonts.body,
fontSize: 36,
@@ -193,6 +196,25 @@ class _Balance extends StatelessWidget {
),
),
),
const SizedBox(height: 24),
Row(
children: [
for (final (label, value) in [
(context.l10n.popTotal, profile.balancePop),
(context.l10n.popReserved, profile.reservedPop),
(context.l10n.popAvailable, profile.availablePop),
])
Expanded(
child: Column(
children: [
Text(label, style: myText(12, FontWeight.w500, color: MyColors.muted)),
const SizedBox(height: 4),
Text(formatPop(value), style: myText(14, FontWeight.w700)),
],
),
),
],
),
],
),
);
app/lib/l10n/app_en.arb
+4 -1
View File
@@ -400,6 +400,9 @@
"refundReason": "Reason for refund",
"refundConfirm": "Request a refund?",
"myPop": "My POP",
"popTotal": "Total",
"popReserved": "Reserved",
"popAvailable": "Available",
"commonNoHistory": "No history yet.",
"nicknameEdit": "Edit nickname",
"nicknameReserved": "You can't use a name that could be mistaken for staff.",
@@ -861,7 +864,7 @@
"onbCountrySheetTitle": "Select your country/region of residence",
"onbLanguage": "Display language",
"onbReferral": "Referral code (optional)",
"onbReferralHint": "Enter a code if a friend shared one",
"onbReferralInvalid": "Please check the referral code.",
"onbArtistTitle": "Choose the artists you follow",
"onbArtistBody": "The first artist you pick becomes your main planet. You can join several fandoms.",
"onbArtistSearch": "Search artist name",
app/lib/l10n/app_es.arb
+4 -1
View File
@@ -400,6 +400,9 @@
"refundReason": "Motivo del reembolso",
"refundConfirm": "¿Seguro que quieres solicitar el reembolso?",
"myPop": "Mi POP",
"popTotal": "Total",
"popReserved": "Reservado",
"popAvailable": "Disponible",
"commonNoHistory": "Sin historial.",
"nicknameEdit": "Editar apodo",
"nicknameReserved": "No puedes usar un nombre que parezca del equipo.",
@@ -861,7 +864,7 @@
"onbCountrySheetTitle": "Selecciona tu país/región de residencia",
"onbLanguage": "Idioma de visualización",
"onbReferral": "Código de referido (opcional)",
"onbReferralHint": "Introduce el código si un amigo te lo compartió",
"onbReferralInvalid": "Revisa el código de referido.",
"onbArtistTitle": "Elige a los artistas que sigues",
"onbArtistBody": "El primer artista que elijas será tu planeta principal. Puedes unirte a varios fandoms.",
"onbArtistSearch": "Buscar nombre del artista",
app/lib/l10n/app_ja.arb
+4 -1
View File
@@ -400,6 +400,9 @@
"refundReason": "返金理由",
"refundConfirm": "本当に返金を申請しますか？",
"myPop": "マイPOP",
"popTotal": "総保有",
"popReserved": "予約",
"popAvailable": "利用可能",
"commonNoHistory": "履歴はありません。",
"nicknameEdit": "ニックネーム変更",
"nicknameReserved": "運営者と誤解される名前は使用できません。",
@@ -861,7 +864,7 @@
"onbCountrySheetTitle": "居住国・地域を選択",
"onbLanguage": "表示言語",
"onbReferral": "紹介コード(任意)",
"onbReferralHint": "友だちからもらったコードがあれば入力してください",
"onbReferralInvalid": "紹介コードをご確認ください。",
"onbArtistTitle": "好きなアーティストを選んでください",
"onbArtistBody": "最初に選んだアーティストが基本の惑星になります。複数のファンダムに加入できます。",
"onbArtistSearch": "アーティスト名で検索",
app/lib/l10n/app_ko.arb
+4 -1
View File
@@ -827,6 +827,9 @@
"refundReason": "환불 사유",
"refundConfirm": "정말 환불 신청을 할까요?",
"myPop": "내 POP",
"popTotal": "총 보유",
"popReserved": "예약",
"popAvailable": "사용 가능",
"commonNoHistory": "내역이 없습니다.",
"nicknameEdit": "닉네임 수정",
"nicknameReserved": "운영자로 오해될 수 있는 이름은 쓸 수 없습니다.",
@@ -1804,7 +1807,7 @@
"onbCountrySheetTitle": "거주 국가/지역 선택",
"onbLanguage": "표시 언어",
"onbReferral": "추천인 코드 (선택)",
"onbReferralHint": "친구에게 받은 코드가 있으면 입력해 주세요",
"onbReferralInvalid": "추천인 코드를 확인해 주세요.",
"onbArtistTitle": "관심 아티스트를 선택해 주세요",
"onbArtistBody": "처음 고른 아티스트가 기본 행성이 됩니다. 여러 팬덤에 함께 가입할 수 있어요.",
"onbArtistSearch": "아티스트 이름 검색",
app/lib/l10n/app_localizations.dart
+21 -3
View File
@@ -2504,6 +2504,24 @@ abstract class AppLocalizations {
/// **'내 POP'**
String get myPop;
/// No description provided for @popTotal.
///
/// In ko, this message translates to:
/// **'총 보유'**
String get popTotal;
/// No description provided for @popReserved.
///
/// In ko, this message translates to:
/// **'예약'**
String get popReserved;
/// No description provided for @popAvailable.
///
/// In ko, this message translates to:
/// **'사용 가능'**
String get popAvailable;
/// No description provided for @commonNoHistory.
///
/// In ko, this message translates to:
@@ -5282,11 +5300,11 @@ abstract class AppLocalizations {
/// **'추천인 코드 (선택)'**
String get onbReferral;
/// No description provided for @onbReferralHint.
/// No description provided for @onbReferralInvalid.
///
/// In ko, this message translates to:
/// **'친구에게 받은 코드가 있으면 입력해 주세요'**
String get onbReferralHint;
/// **'추천인 코드를 확인해 주세요.'**
String get onbReferralInvalid;
/// No description provided for @onbArtistTitle.
///
app/lib/l10n/app_localizations_en.dart
+10 -1
View File
@@ -1398,6 +1398,15 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get myPop => 'My POP';
@override
String get popTotal => 'Total';
@override
String get popReserved => 'Reserved';
@override
String get popAvailable => 'Available';
@override
String get commonNoHistory => 'No history yet.';
@@ -3007,7 +3016,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get onbReferral => 'Referral code (optional)';
@override
String get onbReferralHint => 'Enter a code if a friend shared one';
String get onbReferralInvalid => 'Please check the referral code.';
@override
String get onbArtistTitle => 'Choose the artists you follow';
app/lib/l10n/app_localizations_es.dart
+10 -2
View File
@@ -1406,6 +1406,15 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get myPop => 'Mi POP';
@override
String get popTotal => 'Total';
@override
String get popReserved => 'Reservado';
@override
String get popAvailable => 'Disponible';
@override
String get commonNoHistory => 'Sin historial.';
@@ -3022,8 +3031,7 @@ class AppLocalizationsEs extends AppLocalizations {
String get onbReferral => 'Código de referido (opcional)';
@override
String get onbReferralHint =>
'Introduce el código si un amigo te lo compartió';
String get onbReferralInvalid => 'Revisa el código de referido.';
@override
String get onbArtistTitle => 'Elige a los artistas que sigues';
app/lib/l10n/app_localizations_ja.dart
+10 -1
View File
@@ -1351,6 +1351,15 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get myPop => 'マイPOP';
@override
String get popTotal => '総保有';
@override
String get popReserved => '予約';
@override
String get popAvailable => '利用可能';
@override
String get commonNoHistory => '履歴はありません。';
@@ -2906,7 +2915,7 @@ class AppLocalizationsJa extends AppLocalizations {
String get onbReferral => '紹介コード(任意)';
@override
String get onbReferralHint => '友だちからもらったコードがあれば入力してください';
String get onbReferralInvalid => '紹介コードをご確認ください。';
@override
String get onbArtistTitle => '好きなアーティストを選んでください';
app/lib/l10n/app_localizations_ko.dart
+10 -1
View File
@@ -1350,6 +1350,15 @@ class AppLocalizationsKo extends AppLocalizations {
@override
String get myPop => '내 POP';
@override
String get popTotal => '총 보유';
@override
String get popReserved => '예약';
@override
String get popAvailable => '사용 가능';
@override
String get commonNoHistory => '내역이 없습니다.';
@@ -2909,7 +2918,7 @@ class AppLocalizationsKo extends AppLocalizations {
String get onbReferral => '추천인 코드 (선택)';
@override
String get onbReferralHint => '친구에게 받은 코드가 있으면 입력해 주세요';
String get onbReferralInvalid => '추천인 코드를 확인해 주세요.';
@override
String get onbArtistTitle => '관심 아티스트를 선택해 주세요';
app/lib/l10n/app_localizations_zh.dart
+10 -1
View File
@@ -1349,6 +1349,15 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get myPop => '我的 POP';
@override
String get popTotal => '总持有';
@override
String get popReserved => '预留';
@override
String get popAvailable => '可用';
@override
String get commonNoHistory => '暂无记录。';
@@ -2901,7 +2910,7 @@ class AppLocalizationsZh extends AppLocalizations {
String get onbReferral => '推荐码(选填)';
@override
String get onbReferralHint => '如有朋友分享的推荐码请输入';
String get onbReferralInvalid => '请确认推荐码。';
@override
String get onbArtistTitle => '请选择关注的艺人';
app/lib/l10n/app_zh.arb
+4 -1
View File
@@ -400,6 +400,9 @@
"refundReason": "退款原因",
"refundConfirm": "确定要申请退款吗？",
"myPop": "我的 POP",
"popTotal": "总持有",
"popReserved": "预留",
"popAvailable": "可用",
"commonNoHistory": "暂无记录。",
"nicknameEdit": "修改昵称",
"nicknameReserved": "不能使用可能被误认为运营方的名称。",
@@ -861,7 +864,7 @@
"onbCountrySheetTitle": "选择居住国家/地区",
"onbLanguage": "显示语言",
"onbReferral": "推荐码(选填)",
"onbReferralHint": "如有朋友分享的推荐码请输入",
"onbReferralInvalid": "请确认推荐码。",
"onbArtistTitle": "请选择关注的艺人",
"onbArtistBody": "第一个选择的艺人将成为默认星球。可以同时加入多个粉丝团。",
"onbArtistSearch": "搜索艺人名称",
app/lib/l10n/remote_app_localizations.dart
+10 -1
View File
@@ -1466,7 +1466,7 @@ class RemoteAppLocalizations extends AppLocalizations {
String get onbReferral => _remote['onbReferral'] ?? _base.onbReferral;
@override
String get onbReferralHint => _remote['onbReferralHint'] ?? _base.onbReferralHint;
String get onbReferralInvalid => _remote['onbReferralInvalid'] ?? _base.onbReferralInvalid;
@override
String get onbSkip => _remote['onbSkip'] ?? _base.onbSkip;
@@ -1687,6 +1687,9 @@ class RemoteAppLocalizations extends AppLocalizations {
@override
String get playNow => _remote['playNow'] ?? _base.playNow;
@override
String get popAvailable => _remote['popAvailable'] ?? _base.popAvailable;
@override
String get popKindContribution => _remote['popKindContribution'] ?? _base.popKindContribution;
@@ -1783,6 +1786,12 @@ class RemoteAppLocalizations extends AppLocalizations {
@override
String popRepeat(String title, String count) => _fill('popRepeat', {'title': title, 'count': count}) ?? _base.popRepeat(title, count);
@override
String get popReserved => _remote['popReserved'] ?? _base.popReserved;
@override
String get popTotal => _remote['popTotal'] ?? _base.popTotal;
@override
String get popTxGrant => _remote['popTxGrant'] ?? _base.popTxGrant;