style: apply dart format across project
This commit is contained in:
JiWoong Sul
@@ -47,5 +47,8 @@
|
||||
<true/>
|
||||
<key>NSMessageUsageDescription</key>
|
||||
<string>구독 결제 정보를 자동으로 추가하기 위해 SMS 접근이 필요합니다.</string>
|
||||
<!-- Google AdMob App ID -->
|
||||
<key>GADApplicationIdentifier</key>
|
||||
<string>ca-app-pub-6691216385521068~6638409932</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -158,13 +158,15 @@ class AddSubscriptionController {
|
||||
serviceNameController.text = serviceInfo.serviceName;
|
||||
|
||||
// 카테고리 자동 선택
|
||||
final categoryProvider = Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categoryProvider =
|
||||
Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categories = categoryProvider.categories;
|
||||
|
||||
// 카테고리 ID로 매칭
|
||||
final matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == serviceInfo.categoryNameKr ||
|
||||
cat.name == serviceInfo.categoryNameEn,
|
||||
(cat) =>
|
||||
cat.name == serviceInfo.categoryNameKr ||
|
||||
cat.name == serviceInfo.categoryNameEn,
|
||||
orElse: () => categories.first,
|
||||
);
|
||||
|
||||
@@ -174,7 +176,8 @@ class AddSubscriptionController {
|
||||
if (context.mounted) {
|
||||
AppSnackBar.showSuccess(
|
||||
context: context,
|
||||
message: AppLocalizations.of(context).serviceRecognized(serviceInfo.serviceName),
|
||||
message: AppLocalizations.of(context)
|
||||
.serviceRecognized(serviceInfo.serviceName),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -187,7 +190,8 @@ class AddSubscriptionController {
|
||||
|
||||
/// 카테고리 자동 선택
|
||||
void autoSelectCategory() {
|
||||
final categoryProvider = Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categoryProvider =
|
||||
Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categories = categoryProvider.categories;
|
||||
|
||||
final serviceName = serviceNameController.text.toLowerCase();
|
||||
@@ -211,11 +215,11 @@ class AddSubscriptionController {
|
||||
}
|
||||
// 음악 관련 키워드
|
||||
else if (serviceName.contains('spotify') ||
|
||||
serviceName.contains('apple music') ||
|
||||
serviceName.contains('멜론') ||
|
||||
serviceName.contains('지니') ||
|
||||
serviceName.contains('플로') ||
|
||||
serviceName.contains('벅스')) {
|
||||
serviceName.contains('apple music') ||
|
||||
serviceName.contains('멜론') ||
|
||||
serviceName.contains('지니') ||
|
||||
serviceName.contains('플로') ||
|
||||
serviceName.contains('벅스')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == 'music',
|
||||
orElse: () => categories.first,
|
||||
@@ -223,12 +227,12 @@ class AddSubscriptionController {
|
||||
}
|
||||
// 생산성 관련 키워드
|
||||
else if (serviceName.contains('notion') ||
|
||||
serviceName.contains('microsoft') ||
|
||||
serviceName.contains('office') ||
|
||||
serviceName.contains('google') ||
|
||||
serviceName.contains('dropbox') ||
|
||||
serviceName.contains('icloud') ||
|
||||
serviceName.contains('adobe')) {
|
||||
serviceName.contains('microsoft') ||
|
||||
serviceName.contains('office') ||
|
||||
serviceName.contains('google') ||
|
||||
serviceName.contains('dropbox') ||
|
||||
serviceName.contains('icloud') ||
|
||||
serviceName.contains('adobe')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == '생산성',
|
||||
orElse: () => categories.first,
|
||||
@@ -236,10 +240,10 @@ class AddSubscriptionController {
|
||||
}
|
||||
// 게임 관련 키워드
|
||||
else if (serviceName.contains('xbox') ||
|
||||
serviceName.contains('playstation') ||
|
||||
serviceName.contains('nintendo') ||
|
||||
serviceName.contains('steam') ||
|
||||
serviceName.contains('게임')) {
|
||||
serviceName.contains('playstation') ||
|
||||
serviceName.contains('nintendo') ||
|
||||
serviceName.contains('steam') ||
|
||||
serviceName.contains('게임')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == '게임',
|
||||
orElse: () => categories.first,
|
||||
@@ -247,10 +251,10 @@ class AddSubscriptionController {
|
||||
}
|
||||
// 교육 관련 키워드
|
||||
else if (serviceName.contains('coursera') ||
|
||||
serviceName.contains('udemy') ||
|
||||
serviceName.contains('인프런') ||
|
||||
serviceName.contains('패스트캠퍼스') ||
|
||||
serviceName.contains('클래스101')) {
|
||||
serviceName.contains('udemy') ||
|
||||
serviceName.contains('인프런') ||
|
||||
serviceName.contains('패스트캠퍼스') ||
|
||||
serviceName.contains('클래스101')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == '교육',
|
||||
orElse: () => categories.first,
|
||||
@@ -258,10 +262,10 @@ class AddSubscriptionController {
|
||||
}
|
||||
// 쇼핑 관련 키워드
|
||||
else if (serviceName.contains('쿠팡') ||
|
||||
serviceName.contains('coupang') ||
|
||||
serviceName.contains('amazon') ||
|
||||
serviceName.contains('네이버') ||
|
||||
serviceName.contains('11번가')) {
|
||||
serviceName.contains('coupang') ||
|
||||
serviceName.contains('amazon') ||
|
||||
serviceName.contains('네이버') ||
|
||||
serviceName.contains('11번가')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == '쇼핑',
|
||||
orElse: () => categories.first,
|
||||
@@ -312,7 +316,8 @@ class AddSubscriptionController {
|
||||
|
||||
if (smsContent.isNotEmpty) {
|
||||
try {
|
||||
serviceInfo = await SubscriptionUrlMatcher.extractServiceFromSms(smsContent);
|
||||
serviceInfo =
|
||||
await SubscriptionUrlMatcher.extractServiceFromSms(smsContent);
|
||||
} catch (e) {
|
||||
if (kDebugMode) {
|
||||
print('AddSubscriptionController: SMS 서비스 추출 실패 - $e');
|
||||
@@ -327,12 +332,14 @@ class AddSubscriptionController {
|
||||
websiteUrlController.text = serviceInfo.serviceUrl ?? '';
|
||||
|
||||
// 카테고리 자동 선택
|
||||
final categoryProvider = Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categoryProvider =
|
||||
Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categories = categoryProvider.categories;
|
||||
|
||||
final matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == serviceInfo!.categoryNameKr ||
|
||||
cat.name == serviceInfo.categoryNameEn,
|
||||
(cat) =>
|
||||
cat.name == serviceInfo!.categoryNameKr ||
|
||||
cat.name == serviceInfo.categoryNameEn,
|
||||
orElse: () => categories.first,
|
||||
);
|
||||
|
||||
@@ -396,7 +403,8 @@ class AddSubscriptionController {
|
||||
if (context.mounted) {
|
||||
AppSnackBar.showError(
|
||||
context: context,
|
||||
message: AppLocalizations.of(context).smsScanErrorWithMessage(e.toString()),
|
||||
message: AppLocalizations.of(context)
|
||||
.smsScanErrorWithMessage(e.toString()),
|
||||
);
|
||||
}
|
||||
} finally {
|
||||
@@ -421,9 +429,8 @@ class AddSubscriptionController {
|
||||
// 이벤트 가격 파싱
|
||||
double? eventPrice;
|
||||
if (isEventActive && eventPriceController.text.isNotEmpty) {
|
||||
eventPrice = double.tryParse(
|
||||
eventPriceController.text.replaceAll(',', '')
|
||||
);
|
||||
eventPrice =
|
||||
double.tryParse(eventPriceController.text.replaceAll(',', ''));
|
||||
}
|
||||
|
||||
await Provider.of<SubscriptionProvider>(context, listen: false)
|
||||
@@ -452,7 +459,8 @@ class AddSubscriptionController {
|
||||
if (context.mounted) {
|
||||
AppSnackBar.showError(
|
||||
context: context,
|
||||
message: AppLocalizations.of(context).saveErrorWithMessage(e.toString()),
|
||||
message:
|
||||
AppLocalizations.of(context).saveErrorWithMessage(e.toString()),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -140,9 +140,12 @@ class DetailScreenController extends ChangeNotifier {
|
||||
/// 초기화
|
||||
void initialize({required TickerProvider vsync}) {
|
||||
// Text Controllers 초기화
|
||||
serviceNameController = TextEditingController(text: subscription.serviceName);
|
||||
monthlyCostController = TextEditingController(text: subscription.monthlyCost.toString());
|
||||
websiteUrlController = TextEditingController(text: subscription.websiteUrl ?? '');
|
||||
serviceNameController =
|
||||
TextEditingController(text: subscription.serviceName);
|
||||
monthlyCostController =
|
||||
TextEditingController(text: subscription.monthlyCost.toString());
|
||||
websiteUrlController =
|
||||
TextEditingController(text: subscription.websiteUrl ?? '');
|
||||
eventPriceController = TextEditingController();
|
||||
|
||||
// Form State 초기화
|
||||
@@ -261,10 +264,12 @@ class DetailScreenController extends ChangeNotifier {
|
||||
if (_currency == 'KRW') {
|
||||
// 원화는 소수점 없이 표시
|
||||
final intValue = subscription.monthlyCost.toInt();
|
||||
monthlyCostController.text = NumberFormat.decimalPattern().format(intValue);
|
||||
monthlyCostController.text =
|
||||
NumberFormat.decimalPattern().format(intValue);
|
||||
} else {
|
||||
// 달러는 소수점 2자리까지 표시
|
||||
monthlyCostController.text = NumberFormat('#,##0.00').format(subscription.monthlyCost);
|
||||
monthlyCostController.text =
|
||||
NumberFormat('#,##0.00').format(subscription.monthlyCost);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -275,7 +280,8 @@ class DetailScreenController extends ChangeNotifier {
|
||||
|
||||
/// 카테고리 자동 선택
|
||||
void autoSelectCategory() {
|
||||
final categoryProvider = Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categoryProvider =
|
||||
Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categories = categoryProvider.categories;
|
||||
|
||||
final serviceName = serviceNameController.text.toLowerCase();
|
||||
@@ -299,11 +305,11 @@ class DetailScreenController extends ChangeNotifier {
|
||||
}
|
||||
// 음악 관련 키워드
|
||||
else if (serviceName.contains('spotify') ||
|
||||
serviceName.contains('apple music') ||
|
||||
serviceName.contains('멜론') ||
|
||||
serviceName.contains('지니') ||
|
||||
serviceName.contains('플로') ||
|
||||
serviceName.contains('벅스')) {
|
||||
serviceName.contains('apple music') ||
|
||||
serviceName.contains('멜론') ||
|
||||
serviceName.contains('지니') ||
|
||||
serviceName.contains('플로') ||
|
||||
serviceName.contains('벅스')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == 'music',
|
||||
orElse: () => categories.first,
|
||||
@@ -311,12 +317,12 @@ class DetailScreenController extends ChangeNotifier {
|
||||
}
|
||||
// 생산성 관련 키워드
|
||||
else if (serviceName.contains('notion') ||
|
||||
serviceName.contains('microsoft') ||
|
||||
serviceName.contains('office') ||
|
||||
serviceName.contains('google') ||
|
||||
serviceName.contains('dropbox') ||
|
||||
serviceName.contains('icloud') ||
|
||||
serviceName.contains('adobe')) {
|
||||
serviceName.contains('microsoft') ||
|
||||
serviceName.contains('office') ||
|
||||
serviceName.contains('google') ||
|
||||
serviceName.contains('dropbox') ||
|
||||
serviceName.contains('icloud') ||
|
||||
serviceName.contains('adobe')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == 'collaborationOffice',
|
||||
orElse: () => categories.first,
|
||||
@@ -324,10 +330,10 @@ class DetailScreenController extends ChangeNotifier {
|
||||
}
|
||||
// AI 관련 키워드
|
||||
else if (serviceName.contains('chatgpt') ||
|
||||
serviceName.contains('claude') ||
|
||||
serviceName.contains('gemini') ||
|
||||
serviceName.contains('copilot') ||
|
||||
serviceName.contains('midjourney')) {
|
||||
serviceName.contains('claude') ||
|
||||
serviceName.contains('gemini') ||
|
||||
serviceName.contains('copilot') ||
|
||||
serviceName.contains('midjourney')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == 'aiService',
|
||||
orElse: () => categories.first,
|
||||
@@ -335,10 +341,10 @@ class DetailScreenController extends ChangeNotifier {
|
||||
}
|
||||
// 교육 관련 키워드
|
||||
else if (serviceName.contains('coursera') ||
|
||||
serviceName.contains('udemy') ||
|
||||
serviceName.contains('인프런') ||
|
||||
serviceName.contains('패스트캠퍼스') ||
|
||||
serviceName.contains('클래스101')) {
|
||||
serviceName.contains('udemy') ||
|
||||
serviceName.contains('인프런') ||
|
||||
serviceName.contains('패스트캠퍼스') ||
|
||||
serviceName.contains('클래스101')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == 'programming',
|
||||
orElse: () => categories.first,
|
||||
@@ -346,10 +352,10 @@ class DetailScreenController extends ChangeNotifier {
|
||||
}
|
||||
// 쇼핑 관련 키워드
|
||||
else if (serviceName.contains('쿠팡') ||
|
||||
serviceName.contains('coupang') ||
|
||||
serviceName.contains('amazon') ||
|
||||
serviceName.contains('네이버') ||
|
||||
serviceName.contains('11번가')) {
|
||||
serviceName.contains('coupang') ||
|
||||
serviceName.contains('amazon') ||
|
||||
serviceName.contains('네이버') ||
|
||||
serviceName.contains('11번가')) {
|
||||
matchedCategory = categories.firstWhere(
|
||||
(cat) => cat.name == 'other',
|
||||
orElse: () => categories.first,
|
||||
@@ -377,7 +383,8 @@ class DetailScreenController extends ChangeNotifier {
|
||||
// 웹사이트 URL이 비어있는 경우 자동 매칭 다시 시도
|
||||
String? websiteUrl = websiteUrlController.text;
|
||||
if (websiteUrl.isEmpty) {
|
||||
websiteUrl = SubscriptionUrlMatcher.suggestUrl(serviceNameController.text);
|
||||
websiteUrl =
|
||||
SubscriptionUrlMatcher.suggestUrl(serviceNameController.text);
|
||||
}
|
||||
|
||||
// 구독 정보 업데이트
|
||||
@@ -385,7 +392,8 @@ class DetailScreenController extends ChangeNotifier {
|
||||
// 콤마 제거하고 숫자만 추출
|
||||
double monthlyCost = 0.0;
|
||||
try {
|
||||
monthlyCost = double.parse(monthlyCostController.text.replaceAll(',', ''));
|
||||
monthlyCost =
|
||||
double.parse(monthlyCostController.text.replaceAll(',', ''));
|
||||
} catch (e) {
|
||||
// 파싱 오류 발생 시 기본값 사용
|
||||
monthlyCost = subscription.monthlyCost;
|
||||
@@ -445,7 +453,8 @@ class DetailScreenController extends ChangeNotifier {
|
||||
Future<void> deleteSubscription() async {
|
||||
if (context.mounted) {
|
||||
// 로케일에 맞는 서비스명 가져오기
|
||||
final localeProvider = Provider.of<LocaleProvider>(context, listen: false);
|
||||
final localeProvider =
|
||||
Provider.of<LocaleProvider>(context, listen: false);
|
||||
final locale = localeProvider.locale.languageCode;
|
||||
final displayName = await SubscriptionUrlMatcher.getServiceDisplayName(
|
||||
serviceName: subscription.serviceName,
|
||||
@@ -462,13 +471,15 @@ class DetailScreenController extends ChangeNotifier {
|
||||
|
||||
// 사용자가 확인한 경우에만 삭제 진행
|
||||
if (context.mounted) {
|
||||
final provider = Provider.of<SubscriptionProvider>(context, listen: false);
|
||||
final provider =
|
||||
Provider.of<SubscriptionProvider>(context, listen: false);
|
||||
await provider.deleteSubscription(subscription.id);
|
||||
|
||||
if (context.mounted) {
|
||||
AppSnackBar.showError(
|
||||
context: context,
|
||||
message: AppLocalizations.of(context).subscriptionDeleted(displayName),
|
||||
message:
|
||||
AppLocalizations.of(context).subscriptionDeleted(displayName),
|
||||
icon: Icons.delete_forever_rounded,
|
||||
);
|
||||
Navigator.of(context).pop();
|
||||
@@ -484,7 +495,8 @@ class DetailScreenController extends ChangeNotifier {
|
||||
final locale = Localizations.localeOf(context).languageCode;
|
||||
|
||||
// 2. 해지 안내 URL 찾기
|
||||
String? cancellationUrl = await SubscriptionUrlMatcher.findCancellationUrl(
|
||||
String? cancellationUrl =
|
||||
await SubscriptionUrlMatcher.findCancellationUrl(
|
||||
serviceName: subscription.serviceName,
|
||||
websiteUrl: subscription.websiteUrl,
|
||||
locale: locale == 'ko' ? 'kr' : 'en',
|
||||
@@ -492,8 +504,10 @@ class DetailScreenController extends ChangeNotifier {
|
||||
|
||||
// 3. 해지 안내 URL이 없으면 구글 검색
|
||||
if (cancellationUrl == null) {
|
||||
final searchQuery = '${subscription.serviceName} ${locale == 'ko' ? '해지 방법' : 'cancel subscription'}';
|
||||
cancellationUrl = 'https://www.google.com/search?q=${Uri.encodeComponent(searchQuery)}';
|
||||
final searchQuery =
|
||||
'${subscription.serviceName} ${locale == 'ko' ? '해지 방법' : 'cancel subscription'}';
|
||||
cancellationUrl =
|
||||
'https://www.google.com/search?q=${Uri.encodeComponent(searchQuery)}';
|
||||
|
||||
if (context.mounted) {
|
||||
AppSnackBar.showInfo(
|
||||
|
||||
@@ -59,11 +59,13 @@ class SmsScanController extends ChangeNotifier {
|
||||
try {
|
||||
// SMS 스캔 실행
|
||||
print('SMS 스캔 시작');
|
||||
final scannedSubscriptionModels = await _smsScanner.scanForSubscriptions();
|
||||
final scannedSubscriptionModels =
|
||||
await _smsScanner.scanForSubscriptions();
|
||||
print('스캔된 구독: ${scannedSubscriptionModels.length}개');
|
||||
|
||||
if (scannedSubscriptionModels.isNotEmpty) {
|
||||
print('첫 번째 구독: ${scannedSubscriptionModels[0].serviceName}, 반복 횟수: ${scannedSubscriptionModels[0].repeatCount}');
|
||||
print(
|
||||
'첫 번째 구독: ${scannedSubscriptionModels[0].serviceName}, 반복 횟수: ${scannedSubscriptionModels[0].repeatCount}');
|
||||
}
|
||||
|
||||
if (!context.mounted) return;
|
||||
@@ -77,14 +79,17 @@ class SmsScanController extends ChangeNotifier {
|
||||
}
|
||||
|
||||
// SubscriptionModel을 Subscription으로 변환
|
||||
final scannedSubscriptions = _converter.convertModelsToSubscriptions(scannedSubscriptionModels);
|
||||
final scannedSubscriptions =
|
||||
_converter.convertModelsToSubscriptions(scannedSubscriptionModels);
|
||||
|
||||
// 2회 이상 반복 결제된 구독만 필터링
|
||||
final repeatSubscriptions = _filter.filterByRepeatCount(scannedSubscriptions, 2);
|
||||
final repeatSubscriptions =
|
||||
_filter.filterByRepeatCount(scannedSubscriptions, 2);
|
||||
print('반복 결제된 구독: ${repeatSubscriptions.length}개');
|
||||
|
||||
if (repeatSubscriptions.isNotEmpty) {
|
||||
print('첫 번째 반복 구독: ${repeatSubscriptions[0].serviceName}, 반복 횟수: ${repeatSubscriptions[0].repeatCount}');
|
||||
print(
|
||||
'첫 번째 반복 구독: ${repeatSubscriptions[0].serviceName}, 반복 횟수: ${repeatSubscriptions[0].repeatCount}');
|
||||
}
|
||||
|
||||
if (repeatSubscriptions.isEmpty) {
|
||||
@@ -96,16 +101,19 @@ class SmsScanController extends ChangeNotifier {
|
||||
}
|
||||
|
||||
// 구독 목록 가져오기
|
||||
final provider = Provider.of<SubscriptionProvider>(context, listen: false);
|
||||
final provider =
|
||||
Provider.of<SubscriptionProvider>(context, listen: false);
|
||||
final existingSubscriptions = provider.subscriptions;
|
||||
print('기존 구독: ${existingSubscriptions.length}개');
|
||||
|
||||
// 중복 구독 필터링
|
||||
final filteredSubscriptions = _filter.filterDuplicates(repeatSubscriptions, existingSubscriptions);
|
||||
final filteredSubscriptions =
|
||||
_filter.filterDuplicates(repeatSubscriptions, existingSubscriptions);
|
||||
print('중복 제거 후 구독: ${filteredSubscriptions.length}개');
|
||||
|
||||
if (filteredSubscriptions.isNotEmpty) {
|
||||
print('첫 번째 필터링된 구독: ${filteredSubscriptions[0].serviceName}, 반복 횟수: ${filteredSubscriptions[0].repeatCount}');
|
||||
print(
|
||||
'첫 번째 필터링된 구독: ${filteredSubscriptions[0].serviceName}, 반복 횟수: ${filteredSubscriptions[0].repeatCount}');
|
||||
}
|
||||
|
||||
// 중복 제거 후 신규 구독이 없는 경우
|
||||
@@ -123,7 +131,8 @@ class SmsScanController extends ChangeNotifier {
|
||||
} catch (e) {
|
||||
print('SMS 스캔 중 오류 발생: $e');
|
||||
if (context.mounted) {
|
||||
_errorMessage = AppLocalizations.of(context).smsScanErrorWithMessage(e.toString());
|
||||
_errorMessage =
|
||||
AppLocalizations.of(context).smsScanErrorWithMessage(e.toString());
|
||||
_isLoading = false;
|
||||
notifyListeners();
|
||||
}
|
||||
@@ -136,17 +145,22 @@ class SmsScanController extends ChangeNotifier {
|
||||
final subscription = _scannedSubscriptions[_currentIndex];
|
||||
|
||||
try {
|
||||
final provider = Provider.of<SubscriptionProvider>(context, listen: false);
|
||||
final categoryProvider = Provider.of<CategoryProvider>(context, listen: false);
|
||||
final provider =
|
||||
Provider.of<SubscriptionProvider>(context, listen: false);
|
||||
final categoryProvider =
|
||||
Provider.of<CategoryProvider>(context, listen: false);
|
||||
|
||||
final finalCategoryId = _selectedCategoryId ?? subscription.category ?? getDefaultCategoryId(categoryProvider);
|
||||
final finalCategoryId = _selectedCategoryId ??
|
||||
subscription.category ??
|
||||
getDefaultCategoryId(categoryProvider);
|
||||
|
||||
// websiteUrl 처리
|
||||
final websiteUrl = websiteUrlController.text.trim().isNotEmpty
|
||||
? websiteUrlController.text.trim()
|
||||
: subscription.websiteUrl;
|
||||
|
||||
print('구독 추가 시도: ${subscription.serviceName}, 카테고리: $finalCategoryId, URL: $websiteUrl');
|
||||
print(
|
||||
'구독 추가 시도: ${subscription.serviceName}, 카테고리: $finalCategoryId, URL: $websiteUrl');
|
||||
|
||||
// addSubscription 호출
|
||||
await provider.addSubscription(
|
||||
@@ -193,7 +207,8 @@ class SmsScanController extends ChangeNotifier {
|
||||
|
||||
void navigateToHome(BuildContext context) {
|
||||
// NavigationProvider를 사용하여 홈 화면으로 이동
|
||||
final navigationProvider = Provider.of<NavigationProvider>(context, listen: false);
|
||||
final navigationProvider =
|
||||
Provider.of<NavigationProvider>(context, listen: false);
|
||||
navigationProvider.updateCurrentIndex(0);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,22 +14,21 @@ class AppLocalizations {
|
||||
|
||||
// JSON 파일에서 번역 데이터 로드
|
||||
Future<void> load() async {
|
||||
String jsonString =
|
||||
await rootBundle.loadString('assets/data/text.json');
|
||||
String jsonString = await rootBundle.loadString('assets/data/text.json');
|
||||
Map<String, dynamic> jsonMap = json.decode(jsonString);
|
||||
_localizedStrings = jsonMap[locale.languageCode];
|
||||
}
|
||||
|
||||
String get appTitle => _localizedStrings['appTitle'] ?? 'SubManager';
|
||||
String get appSubtitle => _localizedStrings['appSubtitle'] ?? 'Manage subscriptions easily';
|
||||
String get appSubtitle =>
|
||||
_localizedStrings['appSubtitle'] ?? 'Manage subscriptions easily';
|
||||
String get subscriptionManagement =>
|
||||
_localizedStrings['subscriptionManagement'] ?? 'Subscription Management';
|
||||
String get addSubscription =>
|
||||
_localizedStrings['addSubscription'] ?? 'Add Subscription';
|
||||
String get subscriptionName =>
|
||||
_localizedStrings['subscriptionName'] ?? 'Service Name';
|
||||
String get monthlyCost =>
|
||||
_localizedStrings['monthlyCost'] ?? 'Monthly Cost';
|
||||
String get monthlyCost => _localizedStrings['monthlyCost'] ?? 'Monthly Cost';
|
||||
String get billingCycle =>
|
||||
_localizedStrings['billingCycle'] ?? 'Billing Cycle';
|
||||
String get nextBillingDate =>
|
||||
@@ -55,12 +54,9 @@ class AppLocalizations {
|
||||
_localizedStrings['categoryManagement'] ?? 'Category Management';
|
||||
String get categoryName =>
|
||||
_localizedStrings['categoryName'] ?? 'Category Name';
|
||||
String get selectColor =>
|
||||
_localizedStrings['selectColor'] ?? 'Select Color';
|
||||
String get selectIcon =>
|
||||
_localizedStrings['selectIcon'] ?? 'Select Icon';
|
||||
String get addCategory =>
|
||||
_localizedStrings['addCategory'] ?? 'Add Category';
|
||||
String get selectColor => _localizedStrings['selectColor'] ?? 'Select Color';
|
||||
String get selectIcon => _localizedStrings['selectIcon'] ?? 'Select Icon';
|
||||
String get addCategory => _localizedStrings['addCategory'] ?? 'Add Category';
|
||||
String get settings => _localizedStrings['settings'] ?? 'Settings';
|
||||
String get darkMode => _localizedStrings['darkMode'] ?? 'Dark Mode';
|
||||
String get language => _localizedStrings['language'] ?? 'Language';
|
||||
@@ -71,13 +67,15 @@ class AppLocalizations {
|
||||
String get notificationPermission =>
|
||||
_localizedStrings['notificationPermission'] ?? 'Notification Permission';
|
||||
String get notificationPermissionDesc =>
|
||||
_localizedStrings['notificationPermissionDesc'] ?? 'Permission is required to receive notifications';
|
||||
_localizedStrings['notificationPermissionDesc'] ??
|
||||
'Permission is required to receive notifications';
|
||||
String get requestPermission =>
|
||||
_localizedStrings['requestPermission'] ?? 'Request Permission';
|
||||
String get paymentNotification =>
|
||||
_localizedStrings['paymentNotification'] ?? 'Payment Due Notification';
|
||||
String get paymentNotificationDesc =>
|
||||
_localizedStrings['paymentNotificationDesc'] ?? 'Receive notification on payment due date';
|
||||
_localizedStrings['paymentNotificationDesc'] ??
|
||||
'Receive notification on payment due date';
|
||||
String get notificationTiming =>
|
||||
_localizedStrings['notificationTiming'] ?? 'Notification Timing';
|
||||
String get notificationTime =>
|
||||
@@ -85,11 +83,14 @@ class AppLocalizations {
|
||||
String get dailyReminder =>
|
||||
_localizedStrings['dailyReminder'] ?? 'Daily Reminder';
|
||||
String get dailyReminderEnabled =>
|
||||
_localizedStrings['dailyReminderEnabled'] ?? 'Receive daily notifications until payment date';
|
||||
_localizedStrings['dailyReminderEnabled'] ??
|
||||
'Receive daily notifications until payment date';
|
||||
String get dailyReminderDisabled =>
|
||||
_localizedStrings['dailyReminderDisabled'] ?? 'Receive notification @ day(s) before payment';
|
||||
_localizedStrings['dailyReminderDisabled'] ??
|
||||
'Receive notification @ day(s) before payment';
|
||||
String get notificationPermissionDenied =>
|
||||
_localizedStrings['notificationPermissionDenied'] ?? 'Notification permission denied';
|
||||
_localizedStrings['notificationPermissionDenied'] ??
|
||||
'Notification permission denied';
|
||||
// 앱 정보
|
||||
String get appInfo => _localizedStrings['appInfo'] ?? 'App Info';
|
||||
String get version => _localizedStrings['version'] ?? 'Version';
|
||||
@@ -102,7 +103,8 @@ class AppLocalizations {
|
||||
String get lightTheme => _localizedStrings['lightTheme'] ?? 'Light';
|
||||
String get darkTheme => _localizedStrings['darkTheme'] ?? 'Dark';
|
||||
String get oledTheme => _localizedStrings['oledTheme'] ?? 'OLED Black';
|
||||
String get systemTheme => _localizedStrings['systemTheme'] ?? 'System Default';
|
||||
String get systemTheme =>
|
||||
_localizedStrings['systemTheme'] ?? 'System Default';
|
||||
// 기타 메시지
|
||||
String get subscriptionAdded =>
|
||||
_localizedStrings['subscriptionAdded'] ?? 'Subscription added';
|
||||
@@ -112,72 +114,133 @@ class AppLocalizations {
|
||||
String get japanese => _localizedStrings['japanese'] ?? '日本語';
|
||||
String get chinese => _localizedStrings['chinese'] ?? '中文';
|
||||
// 날짜
|
||||
String get oneDayBefore => _localizedStrings['oneDayBefore'] ?? '1 day before';
|
||||
String get twoDaysBefore => _localizedStrings['twoDaysBefore'] ?? '2 days before';
|
||||
String get threeDaysBefore => _localizedStrings['threeDaysBefore'] ?? '3 days before';
|
||||
String get oneDayBefore =>
|
||||
_localizedStrings['oneDayBefore'] ?? '1 day before';
|
||||
String get twoDaysBefore =>
|
||||
_localizedStrings['twoDaysBefore'] ?? '2 days before';
|
||||
String get threeDaysBefore =>
|
||||
_localizedStrings['threeDaysBefore'] ?? '3 days before';
|
||||
// 추가 메시지
|
||||
String get requiredFieldsError => _localizedStrings['requiredFieldsError'] ?? 'Please fill in all required fields';
|
||||
String get subscriptionUpdated => _localizedStrings['subscriptionUpdated'] ?? 'Subscription information has been updated';
|
||||
String get officialCancelPageNotFound => _localizedStrings['officialCancelPageNotFound'] ?? 'Official cancellation page not found. Redirecting to Google search.';
|
||||
String get cannotOpenWebsite => _localizedStrings['cannotOpenWebsite'] ?? 'Cannot open website';
|
||||
String get noWebsiteInfo => _localizedStrings['noWebsiteInfo'] ?? 'No website information available. Please cancel through the website.';
|
||||
String get requiredFieldsError =>
|
||||
_localizedStrings['requiredFieldsError'] ??
|
||||
'Please fill in all required fields';
|
||||
String get subscriptionUpdated =>
|
||||
_localizedStrings['subscriptionUpdated'] ??
|
||||
'Subscription information has been updated';
|
||||
String get officialCancelPageNotFound =>
|
||||
_localizedStrings['officialCancelPageNotFound'] ??
|
||||
'Official cancellation page not found. Redirecting to Google search.';
|
||||
String get cannotOpenWebsite =>
|
||||
_localizedStrings['cannotOpenWebsite'] ?? 'Cannot open website';
|
||||
String get noWebsiteInfo =>
|
||||
_localizedStrings['noWebsiteInfo'] ??
|
||||
'No website information available. Please cancel through the website.';
|
||||
String get editMode => _localizedStrings['editMode'] ?? 'Edit Mode';
|
||||
String get changesAppliedAfterSave => _localizedStrings['changesAppliedAfterSave'] ?? 'Changes will be applied after saving';
|
||||
String get changesAppliedAfterSave =>
|
||||
_localizedStrings['changesAppliedAfterSave'] ??
|
||||
'Changes will be applied after saving';
|
||||
String get saveChanges => _localizedStrings['saveChanges'] ?? 'Save Changes';
|
||||
String get monthlyExpense => _localizedStrings['monthlyExpense'] ?? 'Monthly Expense';
|
||||
String get monthlyExpense =>
|
||||
_localizedStrings['monthlyExpense'] ?? 'Monthly Expense';
|
||||
String get websiteUrl => _localizedStrings['websiteUrl'] ?? 'Website URL';
|
||||
String get websiteUrlOptional => _localizedStrings['websiteUrlOptional'] ?? 'Website URL (Optional)';
|
||||
String get websiteUrlOptional =>
|
||||
_localizedStrings['websiteUrlOptional'] ?? 'Website URL (Optional)';
|
||||
String get eventPrice => _localizedStrings['eventPrice'] ?? 'Event Price';
|
||||
String get eventPriceHint => _localizedStrings['eventPriceHint'] ?? 'Enter discounted price';
|
||||
String get eventPriceRequired => _localizedStrings['eventPriceRequired'] ?? 'Please enter event price';
|
||||
String get invalidPrice => _localizedStrings['invalidPrice'] ?? 'Please enter a valid price';
|
||||
String get eventPriceHint =>
|
||||
_localizedStrings['eventPriceHint'] ?? 'Enter discounted price';
|
||||
String get eventPriceRequired =>
|
||||
_localizedStrings['eventPriceRequired'] ?? 'Please enter event price';
|
||||
String get invalidPrice =>
|
||||
_localizedStrings['invalidPrice'] ?? 'Please enter a valid price';
|
||||
String get smsScanLabel => _localizedStrings['smsScanLabel'] ?? 'SMS';
|
||||
String get home => _localizedStrings['home'] ?? 'Home';
|
||||
String get analysis => _localizedStrings['analysis'] ?? 'Analysis';
|
||||
String get back => _localizedStrings['back'] ?? 'Back';
|
||||
String get exitApp => _localizedStrings['exitApp'] ?? 'Exit App';
|
||||
String get exitAppConfirm => _localizedStrings['exitAppConfirm'] ?? 'Are you sure you want to exit SubManager?';
|
||||
String get exitAppConfirm =>
|
||||
_localizedStrings['exitAppConfirm'] ??
|
||||
'Are you sure you want to exit SubManager?';
|
||||
String get exit => _localizedStrings['exit'] ?? 'Exit';
|
||||
String get pageNotFound => _localizedStrings['pageNotFound'] ?? 'Page not found';
|
||||
String get serviceNameExample => _localizedStrings['serviceNameExample'] ?? 'e.g. Netflix, Spotify';
|
||||
String get urlExample => _localizedStrings['urlExample'] ?? 'https://example.com';
|
||||
String get appLockDesc => _localizedStrings['appLockDesc'] ?? 'App lock with biometric authentication';
|
||||
String get unlockWithBiometric => _localizedStrings['unlockWithBiometric'] ?? 'Unlock with biometric authentication';
|
||||
String get authenticationFailed => _localizedStrings['authenticationFailed'] ?? 'Authentication failed. Please try again.';
|
||||
String get smsPermissionRequired => _localizedStrings['smsPermissionRequired'] ?? 'SMS permission required';
|
||||
String get noSubscriptionSmsFound => _localizedStrings['noSubscriptionSmsFound'] ?? 'No subscription related SMS found';
|
||||
String get smsScanError => _localizedStrings['smsScanError'] ?? 'Error occurred during SMS scan';
|
||||
String get saveError => _localizedStrings['saveError'] ?? 'Error occurred while saving';
|
||||
String get newSubscriptionSmsNotFound => _localizedStrings['newSubscriptionSmsNotFound'] ?? 'No new subscription SMS found';
|
||||
String get subscriptionAddError => _localizedStrings['subscriptionAddError'] ?? 'Error adding subscription';
|
||||
String get allSubscriptionsProcessed => _localizedStrings['allSubscriptionsProcessed'] ?? 'All subscriptions have been processed.';
|
||||
String get websiteUrlExtracted => _localizedStrings['websiteUrlExtracted'] ?? 'Website URL (Auto-extracted)';
|
||||
String get pageNotFound =>
|
||||
_localizedStrings['pageNotFound'] ?? 'Page not found';
|
||||
String get serviceNameExample =>
|
||||
_localizedStrings['serviceNameExample'] ?? 'e.g. Netflix, Spotify';
|
||||
String get urlExample =>
|
||||
_localizedStrings['urlExample'] ?? 'https://example.com';
|
||||
String get appLockDesc =>
|
||||
_localizedStrings['appLockDesc'] ??
|
||||
'App lock with biometric authentication';
|
||||
String get unlockWithBiometric =>
|
||||
_localizedStrings['unlockWithBiometric'] ??
|
||||
'Unlock with biometric authentication';
|
||||
String get authenticationFailed =>
|
||||
_localizedStrings['authenticationFailed'] ??
|
||||
'Authentication failed. Please try again.';
|
||||
String get smsPermissionRequired =>
|
||||
_localizedStrings['smsPermissionRequired'] ?? 'SMS permission required';
|
||||
String get noSubscriptionSmsFound =>
|
||||
_localizedStrings['noSubscriptionSmsFound'] ??
|
||||
'No subscription related SMS found';
|
||||
String get smsScanError =>
|
||||
_localizedStrings['smsScanError'] ?? 'Error occurred during SMS scan';
|
||||
String get saveError =>
|
||||
_localizedStrings['saveError'] ?? 'Error occurred while saving';
|
||||
String get newSubscriptionSmsNotFound =>
|
||||
_localizedStrings['newSubscriptionSmsNotFound'] ??
|
||||
'No new subscription SMS found';
|
||||
String get subscriptionAddError =>
|
||||
_localizedStrings['subscriptionAddError'] ?? 'Error adding subscription';
|
||||
String get allSubscriptionsProcessed =>
|
||||
_localizedStrings['allSubscriptionsProcessed'] ??
|
||||
'All subscriptions have been processed.';
|
||||
String get websiteUrlExtracted =>
|
||||
_localizedStrings['websiteUrlExtracted'] ??
|
||||
'Website URL (Auto-extracted)';
|
||||
String get startDate => _localizedStrings['startDate'] ?? 'Start Date';
|
||||
String get endDate => _localizedStrings['endDate'] ?? 'End Date';
|
||||
|
||||
// 새로 추가된 항목들
|
||||
String get monthlyTotalSubscriptionCost => _localizedStrings['monthlyTotalSubscriptionCost'] ?? 'Total Monthly Subscription Cost';
|
||||
String get todaysExchangeRate => _localizedStrings['todaysExchangeRate'] ?? 'Today\'s Exchange Rate';
|
||||
String get monthlyTotalSubscriptionCost =>
|
||||
_localizedStrings['monthlyTotalSubscriptionCost'] ??
|
||||
'Total Monthly Subscription Cost';
|
||||
String get todaysExchangeRate =>
|
||||
_localizedStrings['todaysExchangeRate'] ?? 'Today\'s Exchange Rate';
|
||||
String get won => _localizedStrings['won'] ?? 'KRW';
|
||||
String get estimatedAnnualCost => _localizedStrings['estimatedAnnualCost'] ?? 'Estimated Annual Cost';
|
||||
String get totalSubscriptionServices => _localizedStrings['totalSubscriptionServices'] ?? 'Total Subscription Services';
|
||||
String get estimatedAnnualCost =>
|
||||
_localizedStrings['estimatedAnnualCost'] ?? 'Estimated Annual Cost';
|
||||
String get totalSubscriptionServices =>
|
||||
_localizedStrings['totalSubscriptionServices'] ??
|
||||
'Total Subscription Services';
|
||||
String get services => _localizedStrings['services'] ?? 'services';
|
||||
String get eventDiscountActive => _localizedStrings['eventDiscountActive'] ?? 'Event Discount Active';
|
||||
String get eventDiscountActive =>
|
||||
_localizedStrings['eventDiscountActive'] ?? 'Event Discount Active';
|
||||
String get saving => _localizedStrings['saving'] ?? 'Saving';
|
||||
String get paymentDueToday => _localizedStrings['paymentDueToday'] ?? 'Payment Due Today';
|
||||
String get paymentInfoNeeded => _localizedStrings['paymentInfoNeeded'] ?? 'Payment Info Needed';
|
||||
String get paymentDueToday =>
|
||||
_localizedStrings['paymentDueToday'] ?? 'Payment Due Today';
|
||||
String get paymentInfoNeeded =>
|
||||
_localizedStrings['paymentInfoNeeded'] ?? 'Payment Info Needed';
|
||||
String get event => _localizedStrings['event'] ?? 'Event';
|
||||
|
||||
// 카테고리 getter들
|
||||
String get categoryMusic => _localizedStrings['categoryMusic'] ?? 'Music';
|
||||
String get categoryOttVideo => _localizedStrings['categoryOttVideo'] ?? 'OTT(Video)';
|
||||
String get categoryStorageCloud => _localizedStrings['categoryStorageCloud'] ?? 'Storage/Cloud';
|
||||
String get categoryTelecomInternetTv => _localizedStrings['categoryTelecomInternetTv'] ?? 'Telecom · Internet · TV';
|
||||
String get categoryLifestyle => _localizedStrings['categoryLifestyle'] ?? 'Lifestyle';
|
||||
String get categoryShoppingEcommerce => _localizedStrings['categoryShoppingEcommerce'] ?? 'Shopping/E-commerce';
|
||||
String get categoryProgramming => _localizedStrings['categoryProgramming'] ?? 'Programming';
|
||||
String get categoryCollaborationOffice => _localizedStrings['categoryCollaborationOffice'] ?? 'Collaboration/Office';
|
||||
String get categoryAiService => _localizedStrings['categoryAiService'] ?? 'AI Service';
|
||||
String get categoryOttVideo =>
|
||||
_localizedStrings['categoryOttVideo'] ?? 'OTT(Video)';
|
||||
String get categoryStorageCloud =>
|
||||
_localizedStrings['categoryStorageCloud'] ?? 'Storage/Cloud';
|
||||
String get categoryTelecomInternetTv =>
|
||||
_localizedStrings['categoryTelecomInternetTv'] ??
|
||||
'Telecom · Internet · TV';
|
||||
String get categoryLifestyle =>
|
||||
_localizedStrings['categoryLifestyle'] ?? 'Lifestyle';
|
||||
String get categoryShoppingEcommerce =>
|
||||
_localizedStrings['categoryShoppingEcommerce'] ?? 'Shopping/E-commerce';
|
||||
String get categoryProgramming =>
|
||||
_localizedStrings['categoryProgramming'] ?? 'Programming';
|
||||
String get categoryCollaborationOffice =>
|
||||
_localizedStrings['categoryCollaborationOffice'] ??
|
||||
'Collaboration/Office';
|
||||
String get categoryAiService =>
|
||||
_localizedStrings['categoryAiService'] ?? 'AI Service';
|
||||
String get categoryOther => _localizedStrings['categoryOther'] ?? 'Other';
|
||||
|
||||
// 동적 메시지 생성 메서드
|
||||
@@ -186,52 +249,62 @@ class AppLocalizations {
|
||||
}
|
||||
|
||||
String dailyReminderDisabledWithDays(int days) {
|
||||
final template = _localizedStrings['dailyReminderDisabled'] ?? 'Receive notification @ day(s) before payment';
|
||||
final template = _localizedStrings['dailyReminderDisabled'] ??
|
||||
'Receive notification @ day(s) before payment';
|
||||
return template.replaceAll('@', days.toString());
|
||||
}
|
||||
|
||||
String subscriptionAddedWithName(String serviceName) {
|
||||
final template = _localizedStrings['subscriptionAddedTemplate'] ?? '@ 구독이 추가되었습니다.';
|
||||
final template =
|
||||
_localizedStrings['subscriptionAddedTemplate'] ?? '@ 구독이 추가되었습니다.';
|
||||
return template.replaceAll('@', serviceName);
|
||||
}
|
||||
|
||||
String subscriptionDeleted(String serviceName) {
|
||||
final template = _localizedStrings['subscriptionDeleted'] ?? '@ subscription has been deleted';
|
||||
final template = _localizedStrings['subscriptionDeleted'] ??
|
||||
'@ subscription has been deleted';
|
||||
return template.replaceAll('@', serviceName);
|
||||
}
|
||||
|
||||
String totalExpenseCopied(String amount) {
|
||||
final template = _localizedStrings['totalExpenseCopied'] ?? 'Total expense copied: @';
|
||||
final template =
|
||||
_localizedStrings['totalExpenseCopied'] ?? 'Total expense copied: @';
|
||||
return template.replaceAll('@', amount);
|
||||
}
|
||||
|
||||
String serviceRecognized(String serviceName) {
|
||||
final template = _localizedStrings['serviceRecognized'] ?? '@ service has been recognized automatically.';
|
||||
final template = _localizedStrings['serviceRecognized'] ??
|
||||
'@ service has been recognized automatically.';
|
||||
return template.replaceAll('@', serviceName);
|
||||
}
|
||||
|
||||
String smsScanErrorWithMessage(String error) {
|
||||
final template = _localizedStrings['smsScanError'] ?? 'Error occurred during SMS scan: @';
|
||||
final template = _localizedStrings['smsScanError'] ??
|
||||
'Error occurred during SMS scan: @';
|
||||
return template.replaceAll('@', error);
|
||||
}
|
||||
|
||||
String saveErrorWithMessage(String error) {
|
||||
final template = _localizedStrings['saveError'] ?? 'Error occurred while saving: @';
|
||||
final template =
|
||||
_localizedStrings['saveError'] ?? 'Error occurred while saving: @';
|
||||
return template.replaceAll('@', error);
|
||||
}
|
||||
|
||||
String subscriptionAddErrorWithMessage(String error) {
|
||||
final template = _localizedStrings['subscriptionAddError'] ?? 'Error adding subscription: @';
|
||||
final template = _localizedStrings['subscriptionAddError'] ??
|
||||
'Error adding subscription: @';
|
||||
return template.replaceAll('@', error);
|
||||
}
|
||||
|
||||
String subscriptionSkipped(String serviceName) {
|
||||
final template = _localizedStrings['subscriptionSkipped'] ?? '@ subscription skipped.';
|
||||
final template =
|
||||
_localizedStrings['subscriptionSkipped'] ?? '@ subscription skipped.';
|
||||
return template.replaceAll('@', serviceName);
|
||||
}
|
||||
|
||||
// 홈화면 관련
|
||||
String get mySubscriptions => _localizedStrings['mySubscriptions'] ?? 'My Subscriptions';
|
||||
String get mySubscriptions =>
|
||||
_localizedStrings['mySubscriptions'] ?? 'My Subscriptions';
|
||||
|
||||
String subscriptionCount(int count) {
|
||||
if (locale.languageCode == 'ko') {
|
||||
@@ -246,55 +319,96 @@ class AppLocalizations {
|
||||
}
|
||||
|
||||
// 분석화면 관련
|
||||
String get monthlyExpenseTitle => _localizedStrings['monthlyExpenseTitle'] ?? 'Monthly Expense Status';
|
||||
String get recentSixMonthsTrend => _localizedStrings['recentSixMonthsTrend'] ?? 'Recent 6 months trend';
|
||||
String get monthlySubscriptionExpense => _localizedStrings['monthlySubscriptionExpense'] ?? 'Monthly subscription expense';
|
||||
String get subscriptionServiceRatio => _localizedStrings['subscriptionServiceRatio'] ?? 'Subscription Service Ratio';
|
||||
String get monthlyExpenseBasis => _localizedStrings['monthlyExpenseBasis'] ?? 'Based on monthly expense';
|
||||
String get noSubscriptionServices => _localizedStrings['noSubscriptionServices'] ?? 'No subscription services';
|
||||
String get totalExpenseSummary => _localizedStrings['totalExpenseSummary'] ?? 'Total Expense Summary';
|
||||
String get monthlyTotalAmount => _localizedStrings['monthlyTotalAmount'] ?? 'Monthly Total Amount';
|
||||
String get totalExpense => _localizedStrings['totalExpense'] ?? 'Total Expense';
|
||||
String get totalServices => _localizedStrings['totalServices'] ?? 'Total Services';
|
||||
String get monthlyExpenseTitle =>
|
||||
_localizedStrings['monthlyExpenseTitle'] ?? 'Monthly Expense Status';
|
||||
String get recentSixMonthsTrend =>
|
||||
_localizedStrings['recentSixMonthsTrend'] ?? 'Recent 6 months trend';
|
||||
String get monthlySubscriptionExpense =>
|
||||
_localizedStrings['monthlySubscriptionExpense'] ??
|
||||
'Monthly subscription expense';
|
||||
String get subscriptionServiceRatio =>
|
||||
_localizedStrings['subscriptionServiceRatio'] ??
|
||||
'Subscription Service Ratio';
|
||||
String get monthlyExpenseBasis =>
|
||||
_localizedStrings['monthlyExpenseBasis'] ?? 'Based on monthly expense';
|
||||
String get noSubscriptionServices =>
|
||||
_localizedStrings['noSubscriptionServices'] ?? 'No subscription services';
|
||||
String get totalExpenseSummary =>
|
||||
_localizedStrings['totalExpenseSummary'] ?? 'Total Expense Summary';
|
||||
String get monthlyTotalAmount =>
|
||||
_localizedStrings['monthlyTotalAmount'] ?? 'Monthly Total Amount';
|
||||
String get totalExpense =>
|
||||
_localizedStrings['totalExpense'] ?? 'Total Expense';
|
||||
String get totalServices =>
|
||||
_localizedStrings['totalServices'] ?? 'Total Services';
|
||||
String get servicesUnit => _localizedStrings['servicesUnit'] ?? 'services';
|
||||
String get averageCost => _localizedStrings['averageCost'] ?? 'Average Cost';
|
||||
String get eventDiscountStatus => _localizedStrings['eventDiscountStatus'] ?? 'Event Discount Status';
|
||||
String get inProgressUnit => _localizedStrings['inProgressUnit'] ?? 'in progress';
|
||||
String get monthlySavingAmount => _localizedStrings['monthlySavingAmount'] ?? 'Monthly Saving Amount';
|
||||
String get eventsInProgress => _localizedStrings['eventsInProgress'] ?? 'Events in Progress';
|
||||
String get discountPercent => _localizedStrings['discountPercent'] ?? '% discount';
|
||||
String get eventDiscountStatus =>
|
||||
_localizedStrings['eventDiscountStatus'] ?? 'Event Discount Status';
|
||||
String get inProgressUnit =>
|
||||
_localizedStrings['inProgressUnit'] ?? 'in progress';
|
||||
String get monthlySavingAmount =>
|
||||
_localizedStrings['monthlySavingAmount'] ?? 'Monthly Saving Amount';
|
||||
String get eventsInProgress =>
|
||||
_localizedStrings['eventsInProgress'] ?? 'Events in Progress';
|
||||
String get discountPercent =>
|
||||
_localizedStrings['discountPercent'] ?? '% discount';
|
||||
String get currencyWon => _localizedStrings['currencyWon'] ?? 'KRW';
|
||||
|
||||
// SMS 스캔 관련
|
||||
String get scanningMessages => _localizedStrings['scanningMessages'] ?? 'Scanning SMS messages...';
|
||||
String get findingSubscriptions => _localizedStrings['findingSubscriptions'] ?? 'Finding subscription services';
|
||||
String get subscriptionNotFound => _localizedStrings['subscriptionNotFound'] ?? 'Subscription information not found.';
|
||||
String get repeatSubscriptionNotFound => _localizedStrings['repeatSubscriptionNotFound'] ?? 'No repeated subscription information found.';
|
||||
String get newSubscriptionNotFound => _localizedStrings['newSubscriptionNotFound'] ?? 'No new subscription SMS found';
|
||||
String get findRepeatSubscriptions => _localizedStrings['findRepeatSubscriptions'] ?? 'Find subscriptions paid 2+ times';
|
||||
String get scanTextMessages => _localizedStrings['scanTextMessages'] ?? 'Scan text messages to automatically find repeatedly paid subscriptions. Service names and amounts can be extracted for easy subscription addition.';
|
||||
String get startScanning => _localizedStrings['startScanning'] ?? 'Start Scanning';
|
||||
String get foundSubscription => _localizedStrings['foundSubscription'] ?? 'Found subscription';
|
||||
String get scanningMessages =>
|
||||
_localizedStrings['scanningMessages'] ?? 'Scanning SMS messages...';
|
||||
String get findingSubscriptions =>
|
||||
_localizedStrings['findingSubscriptions'] ??
|
||||
'Finding subscription services';
|
||||
String get subscriptionNotFound =>
|
||||
_localizedStrings['subscriptionNotFound'] ??
|
||||
'Subscription information not found.';
|
||||
String get repeatSubscriptionNotFound =>
|
||||
_localizedStrings['repeatSubscriptionNotFound'] ??
|
||||
'No repeated subscription information found.';
|
||||
String get newSubscriptionNotFound =>
|
||||
_localizedStrings['newSubscriptionNotFound'] ??
|
||||
'No new subscription SMS found';
|
||||
String get findRepeatSubscriptions =>
|
||||
_localizedStrings['findRepeatSubscriptions'] ??
|
||||
'Find subscriptions paid 2+ times';
|
||||
String get scanTextMessages =>
|
||||
_localizedStrings['scanTextMessages'] ??
|
||||
'Scan text messages to automatically find repeatedly paid subscriptions. Service names and amounts can be extracted for easy subscription addition.';
|
||||
String get startScanning =>
|
||||
_localizedStrings['startScanning'] ?? 'Start Scanning';
|
||||
String get foundSubscription =>
|
||||
_localizedStrings['foundSubscription'] ?? 'Found subscription';
|
||||
String get serviceName => _localizedStrings['serviceName'] ?? 'Service Name';
|
||||
String get nextBillingDateLabel => _localizedStrings['nextBillingDateLabel'] ?? 'Next Billing Date';
|
||||
String get nextBillingDateLabel =>
|
||||
_localizedStrings['nextBillingDateLabel'] ?? 'Next Billing Date';
|
||||
String get category => _localizedStrings['category'] ?? 'Category';
|
||||
String get websiteUrlAuto => _localizedStrings['websiteUrlAuto'] ?? 'Website URL (Auto-extracted)';
|
||||
String get websiteUrlHint => _localizedStrings['websiteUrlHint'] ?? 'Edit website URL or leave empty';
|
||||
String get websiteUrlAuto =>
|
||||
_localizedStrings['websiteUrlAuto'] ?? 'Website URL (Auto-extracted)';
|
||||
String get websiteUrlHint =>
|
||||
_localizedStrings['websiteUrlHint'] ?? 'Edit website URL or leave empty';
|
||||
String get skip => _localizedStrings['skip'] ?? 'Skip';
|
||||
String get add => _localizedStrings['add'] ?? 'Add';
|
||||
String get nextBillingDateRequired => _localizedStrings['nextBillingDateRequired'] ?? 'Next billing date verification required';
|
||||
String get nextBillingDateRequired =>
|
||||
_localizedStrings['nextBillingDateRequired'] ??
|
||||
'Next billing date verification required';
|
||||
|
||||
String nextBillingDateEstimated(String date, int days) {
|
||||
final template = _localizedStrings['nextBillingDateEstimated'] ?? 'Next estimated billing date: @ (# days later)';
|
||||
final template = _localizedStrings['nextBillingDateEstimated'] ??
|
||||
'Next estimated billing date: @ (# days later)';
|
||||
return template.replaceAll('@', date).replaceAll('#', days.toString());
|
||||
}
|
||||
|
||||
String nextBillingDateInfo(String date, int days) {
|
||||
final template = _localizedStrings['nextBillingDateInfo'] ?? 'Next billing date: @ (# days later)';
|
||||
final template = _localizedStrings['nextBillingDateInfo'] ??
|
||||
'Next billing date: @ (# days later)';
|
||||
return template.replaceAll('@', date).replaceAll('#', days.toString());
|
||||
}
|
||||
|
||||
String get nextBillingDatePastRequired => _localizedStrings['nextBillingDatePastRequired'] ?? 'Next billing date verification required (past date)';
|
||||
String get nextBillingDatePastRequired =>
|
||||
_localizedStrings['nextBillingDatePastRequired'] ??
|
||||
'Next billing date verification required (past date)';
|
||||
|
||||
String formatDate(DateTime date) {
|
||||
if (locale.languageCode == 'ko') {
|
||||
@@ -304,13 +418,27 @@ class AppLocalizations {
|
||||
} else if (locale.languageCode == 'zh') {
|
||||
return '${date.year}年${date.month}月${date.day}日';
|
||||
} else {
|
||||
final months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
||||
final months = [
|
||||
'Jan',
|
||||
'Feb',
|
||||
'Mar',
|
||||
'Apr',
|
||||
'May',
|
||||
'Jun',
|
||||
'Jul',
|
||||
'Aug',
|
||||
'Sep',
|
||||
'Oct',
|
||||
'Nov',
|
||||
'Dec'
|
||||
];
|
||||
return '${months[date.month - 1]} ${date.day}, ${date.year}';
|
||||
}
|
||||
}
|
||||
|
||||
String repeatCountDetected(int count) {
|
||||
final template = _localizedStrings['repeatCountDetected'] ?? '@ payment(s) detected';
|
||||
final template =
|
||||
_localizedStrings['repeatCountDetected'] ?? '@ payment(s) detected';
|
||||
return template.replaceAll('@', count.toString());
|
||||
}
|
||||
|
||||
@@ -328,7 +456,8 @@ class AppLocalizations {
|
||||
|
||||
// 새로 추가된 동적 메서드들
|
||||
String paymentDueInDays(int days) {
|
||||
final template = _localizedStrings['paymentDueInDays'] ?? 'Payment due in @ days';
|
||||
final template =
|
||||
_localizedStrings['paymentDueInDays'] ?? 'Payment due in @ days';
|
||||
return template.replaceAll('@', days.toString());
|
||||
}
|
||||
|
||||
@@ -338,27 +467,37 @@ class AppLocalizations {
|
||||
}
|
||||
|
||||
String exchangeRateFormat(String rate) {
|
||||
final template = _localizedStrings['exchangeRateFormat'] ?? 'Today\'s rate: @';
|
||||
final template =
|
||||
_localizedStrings['exchangeRateFormat'] ?? 'Today\'s rate: @';
|
||||
return template.replaceAll('@', rate);
|
||||
}
|
||||
|
||||
// 결제 주기 결제 메시지
|
||||
String get billingCyclePayment => _localizedStrings['billingCyclePayment'] ?? '@ Payment';
|
||||
String get billingCyclePayment =>
|
||||
_localizedStrings['billingCyclePayment'] ?? '@ Payment';
|
||||
|
||||
// 할인 금액 표시 getter들
|
||||
String get discountAmountWon => _localizedStrings['discountAmountWon'] ?? 'Save ₩@';
|
||||
String get discountAmountDollar => _localizedStrings['discountAmountDollar'] ?? 'Save \$@';
|
||||
String get discountAmountYen => _localizedStrings['discountAmountYen'] ?? 'Save ¥@';
|
||||
String get discountAmountYuan => _localizedStrings['discountAmountYuan'] ?? 'Save ¥@';
|
||||
String get discountAmountWon =>
|
||||
_localizedStrings['discountAmountWon'] ?? 'Save ₩@';
|
||||
String get discountAmountDollar =>
|
||||
_localizedStrings['discountAmountDollar'] ?? 'Save \$@';
|
||||
String get discountAmountYen =>
|
||||
_localizedStrings['discountAmountYen'] ?? 'Save ¥@';
|
||||
String get discountAmountYuan =>
|
||||
_localizedStrings['discountAmountYuan'] ?? 'Save ¥@';
|
||||
|
||||
// 결제 주기 관련 getter
|
||||
String get monthly => _localizedStrings['monthly'] ?? 'Monthly';
|
||||
String get weekly => _localizedStrings['weekly'] ?? 'Weekly';
|
||||
String get yearly => _localizedStrings['yearly'] ?? 'Yearly';
|
||||
String get billingCycleMonthly => _localizedStrings['billingCycleMonthly'] ?? 'Monthly';
|
||||
String get billingCycleQuarterly => _localizedStrings['billingCycleQuarterly'] ?? 'Quarterly';
|
||||
String get billingCycleHalfYearly => _localizedStrings['billingCycleHalfYearly'] ?? 'Half-Yearly';
|
||||
String get billingCycleYearly => _localizedStrings['billingCycleYearly'] ?? 'Yearly';
|
||||
String get billingCycleMonthly =>
|
||||
_localizedStrings['billingCycleMonthly'] ?? 'Monthly';
|
||||
String get billingCycleQuarterly =>
|
||||
_localizedStrings['billingCycleQuarterly'] ?? 'Quarterly';
|
||||
String get billingCycleHalfYearly =>
|
||||
_localizedStrings['billingCycleHalfYearly'] ?? 'Half-Yearly';
|
||||
String get billingCycleYearly =>
|
||||
_localizedStrings['billingCycleYearly'] ?? 'Yearly';
|
||||
|
||||
// 색상 관련 getter
|
||||
String get colorBlue => _localizedStrings['colorBlue'] ?? 'Blue';
|
||||
@@ -368,48 +507,75 @@ class AppLocalizations {
|
||||
String get colorPurple => _localizedStrings['colorPurple'] ?? 'Purple';
|
||||
|
||||
// 날짜 형식 관련 getter
|
||||
String get dateFormatFull => _localizedStrings['dateFormatFull'] ?? 'MMM dd, yyyy';
|
||||
String get dateFormatFull =>
|
||||
_localizedStrings['dateFormatFull'] ?? 'MMM dd, yyyy';
|
||||
String get dateFormatShort => _localizedStrings['dateFormatShort'] ?? 'MM/dd';
|
||||
|
||||
// USD 환율 표시 형식
|
||||
String get exchangeRateDisplay => _localizedStrings['exchangeRateDisplay'] ?? '\$1 = @';
|
||||
String get exchangeRateDisplay =>
|
||||
_localizedStrings['exchangeRateDisplay'] ?? '\$1 = @';
|
||||
|
||||
// 라벨 및 힌트 텍스트
|
||||
String get labelServiceName => _localizedStrings['labelServiceName'] ?? 'Service Name';
|
||||
String get hintServiceName => _localizedStrings['hintServiceName'] ?? 'e.g. Netflix, Spotify';
|
||||
String get labelMonthlyExpense => _localizedStrings['labelMonthlyExpense'] ?? 'Monthly Expense';
|
||||
String get labelNextBillingDate => _localizedStrings['labelNextBillingDate'] ?? 'Next Billing Date';
|
||||
String get labelWebsiteUrl => _localizedStrings['labelWebsiteUrl'] ?? 'Website URL (Optional)';
|
||||
String get hintWebsiteUrl => _localizedStrings['hintWebsiteUrl'] ?? 'https://example.com';
|
||||
String get labelEventPrice => _localizedStrings['labelEventPrice'] ?? 'Event Price';
|
||||
String get hintEventPrice => _localizedStrings['hintEventPrice'] ?? 'Enter discounted price';
|
||||
String get labelServiceName =>
|
||||
_localizedStrings['labelServiceName'] ?? 'Service Name';
|
||||
String get hintServiceName =>
|
||||
_localizedStrings['hintServiceName'] ?? 'e.g. Netflix, Spotify';
|
||||
String get labelMonthlyExpense =>
|
||||
_localizedStrings['labelMonthlyExpense'] ?? 'Monthly Expense';
|
||||
String get labelNextBillingDate =>
|
||||
_localizedStrings['labelNextBillingDate'] ?? 'Next Billing Date';
|
||||
String get labelWebsiteUrl =>
|
||||
_localizedStrings['labelWebsiteUrl'] ?? 'Website URL (Optional)';
|
||||
String get hintWebsiteUrl =>
|
||||
_localizedStrings['hintWebsiteUrl'] ?? 'https://example.com';
|
||||
String get labelEventPrice =>
|
||||
_localizedStrings['labelEventPrice'] ?? 'Event Price';
|
||||
String get hintEventPrice =>
|
||||
_localizedStrings['hintEventPrice'] ?? 'Enter discounted price';
|
||||
String get labelCategory => _localizedStrings['labelCategory'] ?? 'Category';
|
||||
|
||||
// 기타 번역
|
||||
String get subscription => _localizedStrings['subscription'] ?? 'Subscription';
|
||||
String get subscription =>
|
||||
_localizedStrings['subscription'] ?? 'Subscription';
|
||||
String get movie => _localizedStrings['movie'] ?? 'Movie';
|
||||
String get music => _localizedStrings['music'] ?? 'Music';
|
||||
String get exercise => _localizedStrings['exercise'] ?? 'Exercise';
|
||||
String get shopping => _localizedStrings['shopping'] ?? 'Shopping';
|
||||
String get currency => _localizedStrings['currency'] ?? 'Currency';
|
||||
String get websiteInfo => _localizedStrings['websiteInfo'] ?? 'Website Information';
|
||||
String get cancelGuide => _localizedStrings['cancelGuide'] ?? 'Cancellation Guide';
|
||||
String get cancelServiceGuide => _localizedStrings['cancelServiceGuide'] ?? 'To cancel this service, please go to the cancellation page through the link below.';
|
||||
String get goToCancelPage => _localizedStrings['goToCancelPage'] ?? 'Go to Cancellation Page';
|
||||
String get urlAutoMatchInfo => _localizedStrings['urlAutoMatchInfo'] ?? 'If URL is empty, it will be automatically matched based on the service name';
|
||||
String get websiteInfo =>
|
||||
_localizedStrings['websiteInfo'] ?? 'Website Information';
|
||||
String get cancelGuide =>
|
||||
_localizedStrings['cancelGuide'] ?? 'Cancellation Guide';
|
||||
String get cancelServiceGuide =>
|
||||
_localizedStrings['cancelServiceGuide'] ??
|
||||
'To cancel this service, please go to the cancellation page through the link below.';
|
||||
String get goToCancelPage =>
|
||||
_localizedStrings['goToCancelPage'] ?? 'Go to Cancellation Page';
|
||||
String get urlAutoMatchInfo =>
|
||||
_localizedStrings['urlAutoMatchInfo'] ??
|
||||
'If URL is empty, it will be automatically matched based on the service name';
|
||||
String get dateSelect => _localizedStrings['dateSelect'] ?? 'Select';
|
||||
|
||||
// 새로 추가된 getter들
|
||||
String get serviceInfo => _localizedStrings['serviceInfo'] ?? 'Service Information';
|
||||
String get newSubscriptionAdd => _localizedStrings['newSubscriptionAdd'] ?? 'Add New Subscription';
|
||||
String get enterServiceInfo => _localizedStrings['enterServiceInfo'] ?? 'Enter service information';
|
||||
String get addSubscriptionButton => _localizedStrings['addSubscriptionButton'] ?? 'Add Subscription';
|
||||
String get serviceNameRequired => _localizedStrings['serviceNameRequired'] ?? 'Please enter service name';
|
||||
String get amountRequired => _localizedStrings['amountRequired'] ?? 'Please enter amount';
|
||||
String get subscriptionDetail => _localizedStrings['subscriptionDetail'] ?? 'Subscription Detail';
|
||||
String get serviceInfo =>
|
||||
_localizedStrings['serviceInfo'] ?? 'Service Information';
|
||||
String get newSubscriptionAdd =>
|
||||
_localizedStrings['newSubscriptionAdd'] ?? 'Add New Subscription';
|
||||
String get enterServiceInfo =>
|
||||
_localizedStrings['enterServiceInfo'] ?? 'Enter service information';
|
||||
String get addSubscriptionButton =>
|
||||
_localizedStrings['addSubscriptionButton'] ?? 'Add Subscription';
|
||||
String get serviceNameRequired =>
|
||||
_localizedStrings['serviceNameRequired'] ?? 'Please enter service name';
|
||||
String get amountRequired =>
|
||||
_localizedStrings['amountRequired'] ?? 'Please enter amount';
|
||||
String get subscriptionDetail =>
|
||||
_localizedStrings['subscriptionDetail'] ?? 'Subscription Detail';
|
||||
String get enterAmount => _localizedStrings['enterAmount'] ?? 'Enter amount';
|
||||
String get invalidAmount => _localizedStrings['invalidAmount'] ?? 'Please enter a valid amount';
|
||||
String get featureComingSoon => _localizedStrings['featureComingSoon'] ?? 'This feature is coming soon';
|
||||
String get invalidAmount =>
|
||||
_localizedStrings['invalidAmount'] ?? 'Please enter a valid amount';
|
||||
String get featureComingSoon =>
|
||||
_localizedStrings['featureComingSoon'] ?? 'This feature is coming soon';
|
||||
|
||||
// 결제 주기를 키값으로 변환하여 번역된 이름 반환
|
||||
String getBillingCycleName(String billingCycleKey) {
|
||||
@@ -467,7 +633,8 @@ class AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
|
||||
const AppLocalizationsDelegate();
|
||||
|
||||
@override
|
||||
bool isSupported(Locale locale) => ['en', 'ko', 'ja', 'zh'].contains(locale.languageCode);
|
||||
bool isSupported(Locale locale) =>
|
||||
['en', 'ko', 'ja', 'zh'].contains(locale.languageCode);
|
||||
|
||||
@override
|
||||
Future<AppLocalizations> load(Locale locale) async {
|
||||
|
||||
@@ -26,7 +26,7 @@ import 'utils/performance_optimizer.dart';
|
||||
import 'navigator_key.dart';
|
||||
|
||||
// AdMob 활성화 플래그 (개발 중 false, 프로덕션 시 true로 변경)
|
||||
const bool enableAdMob = false;
|
||||
const bool enableAdMob = true;
|
||||
|
||||
Future<void> main() async {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
@@ -37,7 +37,8 @@ class AppNavigationObserver extends NavigatorObserver {
|
||||
if (newRoute != null) {
|
||||
_updateNavigationState(newRoute);
|
||||
}
|
||||
debugPrint('Navigation: Replace ${oldRoute?.settings.name} with ${newRoute?.settings.name}');
|
||||
debugPrint(
|
||||
'Navigation: Replace ${oldRoute?.settings.name} with ${newRoute?.settings.name}');
|
||||
}
|
||||
|
||||
void _updateNavigationState(Route<dynamic> route) {
|
||||
@@ -52,7 +53,8 @@ class AppNavigationObserver extends NavigatorObserver {
|
||||
|
||||
try {
|
||||
final context = navigator!.context;
|
||||
final navigationProvider = Provider.of<NavigationProvider>(context, listen: false);
|
||||
final navigationProvider =
|
||||
Provider.of<NavigationProvider>(context, listen: false);
|
||||
navigationProvider.updateByRoute(routeName);
|
||||
} catch (e) {
|
||||
debugPrint('Failed to update navigation state: $e');
|
||||
@@ -69,7 +71,8 @@ class AppNavigationObserver extends NavigatorObserver {
|
||||
|
||||
try {
|
||||
final context = navigator!.context;
|
||||
final navigationProvider = Provider.of<NavigationProvider>(context, listen: false);
|
||||
final navigationProvider =
|
||||
Provider.of<NavigationProvider>(context, listen: false);
|
||||
navigationProvider.pop();
|
||||
} catch (e) {
|
||||
debugPrint('Failed to handle pop with provider: $e');
|
||||
|
||||
@@ -59,9 +59,17 @@ class CategoryProvider extends ChangeNotifier {
|
||||
{'name': 'storageCloud', 'color': '#2196F3', 'icon': 'cloud'},
|
||||
{'name': 'telecomInternetTv', 'color': '#00BCD4', 'icon': 'wifi'},
|
||||
{'name': 'lifestyle', 'color': '#4CAF50', 'icon': 'home'},
|
||||
{'name': 'shoppingEcommerce', 'color': '#FF9800', 'icon': 'shopping_cart'},
|
||||
{
|
||||
'name': 'shoppingEcommerce',
|
||||
'color': '#FF9800',
|
||||
'icon': 'shopping_cart'
|
||||
},
|
||||
{'name': 'programming', 'color': '#795548', 'icon': 'code'},
|
||||
{'name': 'collaborationOffice', 'color': '#607D8B', 'icon': 'business_center'},
|
||||
{
|
||||
'name': 'collaborationOffice',
|
||||
'color': '#607D8B',
|
||||
'icon': 'business_center'
|
||||
},
|
||||
{'name': 'aiService', 'color': '#673AB7', 'icon': 'smart_toy'},
|
||||
{'name': 'other', 'color': '#9E9E9E', 'icon': 'category'},
|
||||
];
|
||||
|
||||
@@ -270,7 +270,8 @@ class NotificationProvider extends ChangeNotifier {
|
||||
// 첫 권한 부여 시 기본 설정 초기화
|
||||
Future<void> initializeDefaultSettingsOnFirstPermission() async {
|
||||
try {
|
||||
final firstGranted = await _secureStorage.read(key: _firstPermissionGrantedKey);
|
||||
final firstGranted =
|
||||
await _secureStorage.read(key: _firstPermissionGrantedKey);
|
||||
if (firstGranted != 'true') {
|
||||
// 첫 권한 부여 시 기본값 설정
|
||||
await setReminderDays(2); // 2일 전 알림
|
||||
@@ -278,7 +279,8 @@ class NotificationProvider extends ChangeNotifier {
|
||||
await setPaymentEnabled(true); // 결제 예정 알림 활성화
|
||||
|
||||
// 첫 권한 부여 플래그 저장
|
||||
await _secureStorage.write(key: _firstPermissionGrantedKey, value: 'true');
|
||||
await _secureStorage.write(
|
||||
key: _firstPermissionGrantedKey, value: 'true');
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('기본 설정 초기화 중 오류 발생: $e');
|
||||
|
||||
@@ -20,7 +20,7 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
double get totalMonthlyExpense {
|
||||
final exchangeRateService = ExchangeRateService();
|
||||
final rate = exchangeRateService.cachedUsdToKrwRate ??
|
||||
ExchangeRateService.DEFAULT_USD_TO_KRW_RATE;
|
||||
ExchangeRateService.DEFAULT_USD_TO_KRW_RATE;
|
||||
|
||||
final total = _subscriptions.fold(
|
||||
0.0,
|
||||
@@ -31,7 +31,8 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
'\$${price} × ₩$rate = ₩${price * rate}');
|
||||
return sum + (price * rate);
|
||||
}
|
||||
debugPrint('[SubscriptionProvider] ${subscription.serviceName}: ₩$price');
|
||||
debugPrint(
|
||||
'[SubscriptionProvider] ${subscription.serviceName}: ₩$price');
|
||||
return sum + price;
|
||||
},
|
||||
);
|
||||
@@ -191,7 +192,6 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Future<void> clearAllSubscriptions() async {
|
||||
_isLoading = true;
|
||||
notifyListeners();
|
||||
@@ -217,7 +217,8 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
/// 이벤트 종료 알림을 스케줄링합니다.
|
||||
Future<void> _scheduleEventEndNotification(SubscriptionModel subscription) async {
|
||||
Future<void> _scheduleEventEndNotification(
|
||||
SubscriptionModel subscription) async {
|
||||
if (subscription.eventEndDate != null &&
|
||||
subscription.eventEndDate!.isAfter(DateTime.now())) {
|
||||
await NotificationService.scheduleNotification(
|
||||
@@ -238,7 +239,6 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
if (subscription.isEventActive &&
|
||||
subscription.eventEndDate != null &&
|
||||
subscription.eventEndDate!.isBefore(DateTime.now())) {
|
||||
|
||||
subscription.isEventActive = false;
|
||||
await _subscriptionBox.put(subscription.id, subscription);
|
||||
hasChanges = true;
|
||||
@@ -255,9 +255,8 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
if (_subscriptions.isEmpty) return 0.0;
|
||||
|
||||
// locale이 제공되지 않으면 현재 로케일 사용
|
||||
final targetCurrency = locale != null
|
||||
? CurrencyUtil.getDefaultCurrency(locale)
|
||||
: 'KRW'; // 기본값
|
||||
final targetCurrency =
|
||||
locale != null ? CurrencyUtil.getDefaultCurrency(locale) : 'KRW'; // 기본값
|
||||
|
||||
debugPrint('[calculateTotalExpense] 계산 시작 - 타겟 통화: $targetCurrency');
|
||||
double total = 0.0;
|
||||
@@ -281,14 +280,14 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
/// 최근 6개월의 월별 지출 데이터를 반환합니다. (로케일별 기본 통화로 환산)
|
||||
Future<List<Map<String, dynamic>>> getMonthlyExpenseData({String? locale}) async {
|
||||
Future<List<Map<String, dynamic>>> getMonthlyExpenseData(
|
||||
{String? locale}) async {
|
||||
final now = DateTime.now();
|
||||
final List<Map<String, dynamic>> monthlyData = [];
|
||||
|
||||
// locale이 제공되지 않으면 현재 로케일 사용
|
||||
final targetCurrency = locale != null
|
||||
? CurrencyUtil.getDefaultCurrency(locale)
|
||||
: 'KRW'; // 기본값
|
||||
final targetCurrency =
|
||||
locale != null ? CurrencyUtil.getDefaultCurrency(locale) : 'KRW'; // 기본값
|
||||
|
||||
// 최근 6개월 데이터 생성
|
||||
for (int i = 5; i >= 0; i--) {
|
||||
@@ -296,10 +295,12 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
double monthTotal = 0.0;
|
||||
|
||||
// 현재 월인지 확인
|
||||
final isCurrentMonth = (month.year == now.year && month.month == now.month);
|
||||
final isCurrentMonth =
|
||||
(month.year == now.year && month.month == now.month);
|
||||
|
||||
if (isCurrentMonth) {
|
||||
debugPrint('[getMonthlyExpenseData] 현재 월(${month.year}-${month.month}) 계산 중...');
|
||||
debugPrint(
|
||||
'[getMonthlyExpenseData] 현재 월(${month.year}-${month.month}) 계산 중...');
|
||||
}
|
||||
|
||||
// 해당 월에 활성화된 구독 계산
|
||||
@@ -307,11 +308,13 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
if (isCurrentMonth) {
|
||||
// 현재 월인 경우: 모든 활성 구독 포함 (calculateTotalExpense와 동일하게)
|
||||
final cost = subscription.currentPrice;
|
||||
debugPrint('[getMonthlyExpenseData] 현재 월 - ${subscription.serviceName}: '
|
||||
debugPrint(
|
||||
'[getMonthlyExpenseData] 현재 월 - ${subscription.serviceName}: '
|
||||
'${cost} ${subscription.currency} (이벤트 적용: ${subscription.isCurrentlyInEvent})');
|
||||
|
||||
// 통화 변환
|
||||
final converted = await ExchangeRateService().convertBetweenCurrencies(
|
||||
final converted =
|
||||
await ExchangeRateService().convertBetweenCurrencies(
|
||||
cost,
|
||||
subscription.currency,
|
||||
targetCurrency,
|
||||
@@ -325,7 +328,8 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
Duration(days: _getBillingCycleDays(subscription.billingCycle)),
|
||||
);
|
||||
|
||||
if (subscriptionStartDate.isBefore(DateTime(month.year, month.month + 1, 1)) &&
|
||||
if (subscriptionStartDate
|
||||
.isBefore(DateTime(month.year, month.month + 1, 1)) &&
|
||||
subscription.nextBillingDate.isAfter(month)) {
|
||||
// 해당 월의 비용 계산 (이벤트 가격 고려)
|
||||
double cost;
|
||||
@@ -334,7 +338,8 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
subscription.eventStartDate != null &&
|
||||
subscription.eventEndDate != null &&
|
||||
// 이벤트 기간과 해당 월이 겹치는지 확인
|
||||
subscription.eventStartDate!.isBefore(DateTime(month.year, month.month + 1, 1)) &&
|
||||
subscription.eventStartDate!
|
||||
.isBefore(DateTime(month.year, month.month + 1, 1)) &&
|
||||
subscription.eventEndDate!.isAfter(month)) {
|
||||
cost = subscription.eventPrice ?? subscription.monthlyCost;
|
||||
} else {
|
||||
@@ -342,7 +347,8 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
// 통화 변환
|
||||
final converted = await ExchangeRateService().convertBetweenCurrencies(
|
||||
final converted =
|
||||
await ExchangeRateService().convertBetweenCurrencies(
|
||||
cost,
|
||||
subscription.currency,
|
||||
targetCurrency,
|
||||
@@ -354,7 +360,8 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
}
|
||||
|
||||
if (isCurrentMonth) {
|
||||
debugPrint('[getMonthlyExpenseData] 현재 월(${_getMonthLabel(month, locale ?? 'en')}) 총 지출: $monthTotal $targetCurrency');
|
||||
debugPrint(
|
||||
'[getMonthlyExpenseData] 현재 월(${_getMonthLabel(month, locale ?? 'en')}) 총 지출: $monthTotal $targetCurrency');
|
||||
}
|
||||
|
||||
monthlyData.add({
|
||||
@@ -431,69 +438,82 @@ class SubscriptionProvider extends ChangeNotifier {
|
||||
serviceName.contains('티빙') ||
|
||||
serviceName.contains('디즈니') ||
|
||||
serviceName.contains('넷플릭스')) {
|
||||
categoryId = categories.firstWhere(
|
||||
(cat) => cat.name == 'OTT 서비스',
|
||||
orElse: () => categories.first,
|
||||
).id;
|
||||
categoryId = categories
|
||||
.firstWhere(
|
||||
(cat) => cat.name == 'OTT 서비스',
|
||||
orElse: () => categories.first,
|
||||
)
|
||||
.id;
|
||||
}
|
||||
// 음악 서비스
|
||||
else if (serviceName.contains('spotify') ||
|
||||
serviceName.contains('apple music') ||
|
||||
serviceName.contains('멜론') ||
|
||||
serviceName.contains('지니') ||
|
||||
serviceName.contains('플로') ||
|
||||
serviceName.contains('벡스')) {
|
||||
categoryId = categories.firstWhere(
|
||||
(cat) => cat.name == 'music',
|
||||
orElse: () => categories.first,
|
||||
).id;
|
||||
serviceName.contains('apple music') ||
|
||||
serviceName.contains('멜론') ||
|
||||
serviceName.contains('지니') ||
|
||||
serviceName.contains('플로') ||
|
||||
serviceName.contains('벡스')) {
|
||||
categoryId = categories
|
||||
.firstWhere(
|
||||
(cat) => cat.name == 'music',
|
||||
orElse: () => categories.first,
|
||||
)
|
||||
.id;
|
||||
}
|
||||
// AI 서비스
|
||||
else if (serviceName.contains('chatgpt') ||
|
||||
serviceName.contains('claude') ||
|
||||
serviceName.contains('midjourney') ||
|
||||
serviceName.contains('copilot')) {
|
||||
categoryId = categories.firstWhere(
|
||||
(cat) => cat.name == 'aiService',
|
||||
orElse: () => categories.first,
|
||||
).id;
|
||||
serviceName.contains('claude') ||
|
||||
serviceName.contains('midjourney') ||
|
||||
serviceName.contains('copilot')) {
|
||||
categoryId = categories
|
||||
.firstWhere(
|
||||
(cat) => cat.name == 'aiService',
|
||||
orElse: () => categories.first,
|
||||
)
|
||||
.id;
|
||||
}
|
||||
// 프로그래밍/개발
|
||||
else if (serviceName.contains('github') ||
|
||||
serviceName.contains('intellij') ||
|
||||
serviceName.contains('webstorm') ||
|
||||
serviceName.contains('jetbrains')) {
|
||||
categoryId = categories.firstWhere(
|
||||
(cat) => cat.name == 'programming',
|
||||
orElse: () => categories.first,
|
||||
).id;
|
||||
serviceName.contains('intellij') ||
|
||||
serviceName.contains('webstorm') ||
|
||||
serviceName.contains('jetbrains')) {
|
||||
categoryId = categories
|
||||
.firstWhere(
|
||||
(cat) => cat.name == 'programming',
|
||||
orElse: () => categories.first,
|
||||
)
|
||||
.id;
|
||||
}
|
||||
// 오피스/협업 툴
|
||||
else if (serviceName.contains('notion') ||
|
||||
serviceName.contains('microsoft') ||
|
||||
serviceName.contains('office') ||
|
||||
serviceName.contains('slack') ||
|
||||
serviceName.contains('figma') ||
|
||||
serviceName.contains('icloud') ||
|
||||
serviceName.contains('아이클라우드')) {
|
||||
categoryId = categories.firstWhere(
|
||||
(cat) => cat.name == 'collaborationOffice',
|
||||
orElse: () => categories.first,
|
||||
).id;
|
||||
serviceName.contains('microsoft') ||
|
||||
serviceName.contains('office') ||
|
||||
serviceName.contains('slack') ||
|
||||
serviceName.contains('figma') ||
|
||||
serviceName.contains('icloud') ||
|
||||
serviceName.contains('아이클라우드')) {
|
||||
categoryId = categories
|
||||
.firstWhere(
|
||||
(cat) => cat.name == 'collaborationOffice',
|
||||
orElse: () => categories.first,
|
||||
)
|
||||
.id;
|
||||
}
|
||||
// 기타 서비스 (기본값)
|
||||
else {
|
||||
categoryId = categories.firstWhere(
|
||||
(cat) => cat.name == 'other',
|
||||
orElse: () => categories.first,
|
||||
).id;
|
||||
categoryId = categories
|
||||
.firstWhere(
|
||||
(cat) => cat.name == 'other',
|
||||
orElse: () => categories.first,
|
||||
)
|
||||
.id;
|
||||
}
|
||||
|
||||
if (categoryId != null) {
|
||||
subscription.categoryId = categoryId;
|
||||
await subscription.save();
|
||||
migratedCount++;
|
||||
final categoryName = categories.firstWhere((cat) => cat.id == categoryId).name;
|
||||
final categoryName =
|
||||
categories.firstWhere((cat) => cat.id == categoryId).name;
|
||||
debugPrint('✅ ${subscription.serviceName} → $categoryName');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,9 @@ class _AnalysisScreenState extends State<AnalysisScreen>
|
||||
'현재 해시=$currentHash, 이전 해시=$_lastDataHash, 로딩중=$_isLoading');
|
||||
|
||||
// 데이터가 변경되었고 현재 로딩 중이 아닌 경우에만 리로드
|
||||
if (currentHash != _lastDataHash && !_isLoading && _lastDataHash.isNotEmpty) {
|
||||
if (currentHash != _lastDataHash &&
|
||||
!_isLoading &&
|
||||
_lastDataHash.isNotEmpty) {
|
||||
debugPrint('[AnalysisScreen] 데이터 변경 감지됨, 리로드 시작');
|
||||
_loadData();
|
||||
}
|
||||
@@ -71,7 +73,8 @@ class _AnalysisScreenState extends State<AnalysisScreen>
|
||||
buffer.write(provider.totalMonthlyExpense.toStringAsFixed(2));
|
||||
|
||||
for (final sub in subscriptions) {
|
||||
buffer.write('_${sub.id}_${sub.currentPrice.toStringAsFixed(2)}_${sub.currency}');
|
||||
buffer.write(
|
||||
'_${sub.id}_${sub.currentPrice.toStringAsFixed(2)}_${sub.currency}');
|
||||
}
|
||||
|
||||
return buffer.toString();
|
||||
|
||||
@@ -90,15 +90,35 @@ class _CategoryManagementScreenState extends State<CategoryManagementScreen> {
|
||||
),
|
||||
items: [
|
||||
DropdownMenuItem(
|
||||
value: '#1976D2', child: Text(AppLocalizations.of(context).colorBlue, style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: '#1976D2',
|
||||
child: Text(
|
||||
AppLocalizations.of(context).colorBlue,
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(
|
||||
value: '#4CAF50', child: Text(AppLocalizations.of(context).colorGreen, style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: '#4CAF50',
|
||||
child: Text(
|
||||
AppLocalizations.of(context).colorGreen,
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(
|
||||
value: '#FF9800', child: Text(AppLocalizations.of(context).colorOrange, style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: '#FF9800',
|
||||
child: Text(
|
||||
AppLocalizations.of(context).colorOrange,
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(
|
||||
value: '#F44336', child: Text(AppLocalizations.of(context).colorRed, style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: '#F44336',
|
||||
child: Text(
|
||||
AppLocalizations.of(context).colorRed,
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(
|
||||
value: '#9C27B0', child: Text(AppLocalizations.of(context).colorPurple, style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: '#9C27B0',
|
||||
child: Text(
|
||||
AppLocalizations.of(context).colorPurple,
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
@@ -117,14 +137,30 @@ class _CategoryManagementScreenState extends State<CategoryManagementScreen> {
|
||||
),
|
||||
items: [
|
||||
DropdownMenuItem(
|
||||
value: 'subscriptions', child: Text('구독', style: TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(value: 'movie', child: Text('영화', style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: 'subscriptions',
|
||||
child: Text('구독',
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(
|
||||
value: 'music_note', child: Text('음악', style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: 'movie',
|
||||
child: Text('영화',
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(
|
||||
value: 'fitness_center', child: Text('운동', style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: 'music_note',
|
||||
child: Text('음악',
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(
|
||||
value: 'shopping_cart', child: Text('쇼핑', style: TextStyle(color: AppColors.darkNavy))),
|
||||
value: 'fitness_center',
|
||||
child: Text('운동',
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
DropdownMenuItem(
|
||||
value: 'shopping_cart',
|
||||
child: Text('쇼핑',
|
||||
style:
|
||||
TextStyle(color: AppColors.darkNavy))),
|
||||
],
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
@@ -163,7 +199,8 @@ class _CategoryManagementScreenState extends State<CategoryManagementScreen> {
|
||||
int.parse(category.color.replaceAll('#', '0xFF'))),
|
||||
),
|
||||
title: Text(
|
||||
provider.getLocalizedCategoryName(context, category.name),
|
||||
provider.getLocalizedCategoryName(
|
||||
context, category.name),
|
||||
style: TextStyle(
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
|
||||
@@ -43,7 +43,6 @@ class _DetailScreenState extends State<DetailScreen>
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final baseColor = _controller.getCardColor();
|
||||
@@ -53,109 +52,110 @@ class _DetailScreenState extends State<DetailScreen>
|
||||
child: Scaffold(
|
||||
backgroundColor: AppColors.backgroundColor,
|
||||
body: CustomScrollView(
|
||||
controller: _controller.scrollController,
|
||||
slivers: [
|
||||
// 상단 헤더 섹션
|
||||
SliverToBoxAdapter(
|
||||
child: DetailHeaderSection(
|
||||
subscription: widget.subscription,
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
rotateAnimation: _controller.rotateAnimation!,
|
||||
),
|
||||
),
|
||||
// 본문 콘텐츠
|
||||
SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
children: [
|
||||
// 편집 모드 안내
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 16,
|
||||
vertical: 12,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
colors: [
|
||||
baseColor.withValues(alpha: 0.15),
|
||||
baseColor.withValues(alpha: 0.08),
|
||||
],
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
border: Border.all(
|
||||
color: baseColor.withValues(alpha: 0.2),
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.edit_rounded,
|
||||
color: baseColor,
|
||||
size: 20,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
AppLocalizations.of(context).editMode,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: baseColor,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
AppLocalizations.of(context).changesAppliedAfterSave,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 기본 정보 폼 섹션
|
||||
DetailFormSection(
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 이벤트 가격 섹션
|
||||
DetailEventSection(
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 웹사이트 URL 섹션
|
||||
DetailUrlSection(
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
|
||||
// 액션 버튼
|
||||
DetailActionButtons(
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
),
|
||||
],
|
||||
controller: _controller.scrollController,
|
||||
slivers: [
|
||||
// 상단 헤더 섹션
|
||||
SliverToBoxAdapter(
|
||||
child: DetailHeaderSection(
|
||||
subscription: widget.subscription,
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
rotateAnimation: _controller.rotateAnimation!,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
// 본문 콘텐츠
|
||||
SliverToBoxAdapter(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
children: [
|
||||
// 편집 모드 안내
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 16,
|
||||
vertical: 12,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
colors: [
|
||||
baseColor.withValues(alpha: 0.15),
|
||||
baseColor.withValues(alpha: 0.08),
|
||||
],
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
border: Border.all(
|
||||
color: baseColor.withValues(alpha: 0.2),
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.edit_rounded,
|
||||
color: baseColor,
|
||||
size: 20,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
AppLocalizations.of(context).editMode,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: baseColor,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
AppLocalizations.of(context)
|
||||
.changesAppliedAfterSave,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 기본 정보 폼 섹션
|
||||
DetailFormSection(
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 이벤트 가격 섹션
|
||||
DetailEventSection(
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
|
||||
// 웹사이트 URL 섹션
|
||||
DetailUrlSection(
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
|
||||
// 액션 버튼
|
||||
DetailActionButtons(
|
||||
controller: _controller,
|
||||
fadeAnimation: _controller.fadeAnimation!,
|
||||
slideAnimation: _controller.slideAnimation!,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -235,8 +235,12 @@ class _MainScreenState extends State<MainScreen>
|
||||
return GlassmorphicScaffold(
|
||||
body: IndexedStack(
|
||||
index: PlatformHelper.isIOS
|
||||
? (currentIndex == 3 ? 3 : currentIndex) // iOS: 설정화면은 인덱스 3
|
||||
: (currentIndex == 3 ? 3 : currentIndex == 4 ? 4 : currentIndex), // Android: 기존 로직
|
||||
? (currentIndex == 3 ? 3 : currentIndex) // iOS: 설정화면은 인덱스 3
|
||||
: (currentIndex == 3
|
||||
? 3
|
||||
: currentIndex == 4
|
||||
? 4
|
||||
: currentIndex), // Android: 기존 로직
|
||||
children: _screens,
|
||||
),
|
||||
backgroundGradient: backgroundGradient,
|
||||
|
||||
@@ -75,7 +75,8 @@ class _SmsScanScreenState extends State<SmsScanScreen> {
|
||||
);
|
||||
}
|
||||
|
||||
final currentSubscription = _controller.scannedSubscriptions[_controller.currentIndex];
|
||||
final currentSubscription =
|
||||
_controller.scannedSubscriptions[_controller.currentIndex];
|
||||
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
|
||||
@@ -89,9 +89,11 @@ class CurrencyUtil {
|
||||
|
||||
// USD 입력인 경우 - 기본 통화로 변환하여 표시
|
||||
if (currency == 'USD' && defaultCurrency != 'USD') {
|
||||
final convertedAmount = await _exchangeRateService.convertUsdToTarget(amount, defaultCurrency);
|
||||
final convertedAmount = await _exchangeRateService.convertUsdToTarget(
|
||||
amount, defaultCurrency);
|
||||
if (convertedAmount != null) {
|
||||
final primaryFormatted = _formatSingleCurrency(convertedAmount, defaultCurrency);
|
||||
final primaryFormatted =
|
||||
_formatSingleCurrency(convertedAmount, defaultCurrency);
|
||||
final usdFormatted = _formatSingleCurrency(amount, 'USD');
|
||||
return '$primaryFormatted ($usdFormatted)';
|
||||
}
|
||||
|
||||
@@ -75,7 +75,8 @@ class ExchangeRateService {
|
||||
}
|
||||
|
||||
/// USD 금액을 지정된 통화로 변환합니다.
|
||||
Future<double?> convertUsdToTarget(double usdAmount, String targetCurrency) async {
|
||||
Future<double?> convertUsdToTarget(
|
||||
double usdAmount, String targetCurrency) async {
|
||||
await _fetchAllRatesIfNeeded();
|
||||
|
||||
switch (targetCurrency) {
|
||||
@@ -96,7 +97,8 @@ class ExchangeRateService {
|
||||
}
|
||||
|
||||
/// 지정된 통화를 USD로 변환합니다.
|
||||
Future<double?> convertTargetToUsd(double amount, String sourceCurrency) async {
|
||||
Future<double?> convertTargetToUsd(
|
||||
double amount, String sourceCurrency) async {
|
||||
await _fetchAllRatesIfNeeded();
|
||||
|
||||
switch (sourceCurrency) {
|
||||
@@ -118,10 +120,7 @@ class ExchangeRateService {
|
||||
|
||||
/// 두 통화 간 변환을 수행합니다. (USD를 거쳐서 변환)
|
||||
Future<double?> convertBetweenCurrencies(
|
||||
double amount,
|
||||
String fromCurrency,
|
||||
String toCurrency
|
||||
) async {
|
||||
double amount, String fromCurrency, String toCurrency) async {
|
||||
if (fromCurrency == toCurrency) {
|
||||
return amount;
|
||||
}
|
||||
@@ -204,7 +203,8 @@ class ExchangeRateService {
|
||||
}
|
||||
|
||||
/// USD 금액을 지정된 언어의 기본 통화로 변환하여 포맷팅된 문자열로 반환합니다.
|
||||
Future<String> getFormattedAmountForLocale(double usdAmount, String locale) async {
|
||||
Future<String> getFormattedAmountForLocale(
|
||||
double usdAmount, String locale) async {
|
||||
String targetCurrency;
|
||||
String localeCode;
|
||||
String symbol;
|
||||
|
||||
@@ -150,15 +150,14 @@ class NotificationService {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static Future<bool> requestPermission() async {
|
||||
// 웹 플랫폼인 경우 false 반환
|
||||
if (_isWeb) return false;
|
||||
|
||||
// iOS 처리
|
||||
if (Platform.isIOS) {
|
||||
final iosImplementation = _notifications
|
||||
.resolvePlatformSpecificImplementation<
|
||||
final iosImplementation =
|
||||
_notifications.resolvePlatformSpecificImplementation<
|
||||
IOSFlutterLocalNotificationsPlugin>();
|
||||
|
||||
if (iosImplementation != null) {
|
||||
@@ -173,13 +172,13 @@ class NotificationService {
|
||||
|
||||
// Android 처리
|
||||
if (Platform.isAndroid) {
|
||||
final androidImplementation = _notifications
|
||||
.resolvePlatformSpecificImplementation<
|
||||
final androidImplementation =
|
||||
_notifications.resolvePlatformSpecificImplementation<
|
||||
AndroidFlutterLocalNotificationsPlugin>();
|
||||
|
||||
if (androidImplementation != null) {
|
||||
final granted = await androidImplementation
|
||||
.requestNotificationsPermission();
|
||||
final granted =
|
||||
await androidImplementation.requestNotificationsPermission();
|
||||
return granted ?? false;
|
||||
}
|
||||
}
|
||||
@@ -194,8 +193,8 @@ class NotificationService {
|
||||
|
||||
// Android 처리
|
||||
if (Platform.isAndroid) {
|
||||
final androidImplementation = _notifications
|
||||
.resolvePlatformSpecificImplementation<
|
||||
final androidImplementation =
|
||||
_notifications.resolvePlatformSpecificImplementation<
|
||||
AndroidFlutterLocalNotificationsPlugin>();
|
||||
|
||||
if (androidImplementation != null) {
|
||||
@@ -207,8 +206,8 @@ class NotificationService {
|
||||
|
||||
// iOS 처리
|
||||
if (Platform.isIOS) {
|
||||
final iosImplementation = _notifications
|
||||
.resolvePlatformSpecificImplementation<
|
||||
final iosImplementation =
|
||||
_notifications.resolvePlatformSpecificImplementation<
|
||||
IOSFlutterLocalNotificationsPlugin>();
|
||||
|
||||
if (iosImplementation != null) {
|
||||
@@ -512,14 +511,15 @@ class NotificationService {
|
||||
}
|
||||
|
||||
// 기본 알림 예약 (지정된 일수 전)
|
||||
final scheduledDate =
|
||||
subscription.nextBillingDate.subtract(Duration(days: reminderDays)).copyWith(
|
||||
hour: reminderHour,
|
||||
minute: reminderMinute,
|
||||
second: 0,
|
||||
millisecond: 0,
|
||||
microsecond: 0,
|
||||
);
|
||||
final scheduledDate = subscription.nextBillingDate
|
||||
.subtract(Duration(days: reminderDays))
|
||||
.copyWith(
|
||||
hour: reminderHour,
|
||||
minute: reminderMinute,
|
||||
second: 0,
|
||||
millisecond: 0,
|
||||
microsecond: 0,
|
||||
);
|
||||
|
||||
// 남은 일수에 따른 메시지 생성
|
||||
String daysText = '$reminderDays일 후';
|
||||
@@ -536,12 +536,14 @@ class NotificationService {
|
||||
// 이벤트가 결제일 전에 종료되는 경우
|
||||
final eventPrice = subscription.eventPrice ?? subscription.monthlyCost;
|
||||
final normalPrice = subscription.monthlyCost;
|
||||
notificationBody = '${subscription.serviceName} 구독료 ${normalPrice.toStringAsFixed(0)}원이 $daysText 결제 예정입니다.\n'
|
||||
'⚠️ 이벤트 종료로 가격이 ${eventPrice.toStringAsFixed(0)}원에서 ${normalPrice.toStringAsFixed(0)}원으로 변경됩니다.';
|
||||
notificationBody =
|
||||
'${subscription.serviceName} 구독료 ${normalPrice.toStringAsFixed(0)}원이 $daysText 결제 예정입니다.\n'
|
||||
'⚠️ 이벤트 종료로 가격이 ${eventPrice.toStringAsFixed(0)}원에서 ${normalPrice.toStringAsFixed(0)}원으로 변경됩니다.';
|
||||
} else {
|
||||
// 일반 알림
|
||||
final currentPrice = subscription.currentPrice;
|
||||
notificationBody = '${subscription.serviceName} 구독료 ${currentPrice.toStringAsFixed(0)}원이 $daysText 결제 예정입니다.';
|
||||
notificationBody =
|
||||
'${subscription.serviceName} 구독료 ${currentPrice.toStringAsFixed(0)}원이 $daysText 결제 예정입니다.';
|
||||
}
|
||||
|
||||
await _notifications.zonedSchedule(
|
||||
@@ -568,13 +570,14 @@ class NotificationService {
|
||||
if (isDailyReminder && reminderDays >= 2) {
|
||||
// 첫 번째 알림 다음 날부터 결제일 전날까지 매일 알림 예약
|
||||
for (int i = reminderDays - 1; i >= 1; i--) {
|
||||
final dailyDate = subscription.nextBillingDate.subtract(Duration(days: i)).copyWith(
|
||||
hour: reminderHour,
|
||||
minute: reminderMinute,
|
||||
second: 0,
|
||||
millisecond: 0,
|
||||
microsecond: 0,
|
||||
);
|
||||
final dailyDate =
|
||||
subscription.nextBillingDate.subtract(Duration(days: i)).copyWith(
|
||||
hour: reminderHour,
|
||||
minute: reminderMinute,
|
||||
second: 0,
|
||||
millisecond: 0,
|
||||
microsecond: 0,
|
||||
);
|
||||
|
||||
// 남은 일수에 따른 메시지 생성
|
||||
String remainingDaysText = '$i일 후';
|
||||
@@ -586,15 +589,19 @@ class NotificationService {
|
||||
String dailyNotificationBody;
|
||||
if (subscription.isEventActive &&
|
||||
subscription.eventEndDate != null &&
|
||||
subscription.eventEndDate!.isBefore(subscription.nextBillingDate) &&
|
||||
subscription.eventEndDate!
|
||||
.isBefore(subscription.nextBillingDate) &&
|
||||
subscription.eventEndDate!.isAfter(DateTime.now())) {
|
||||
final eventPrice = subscription.eventPrice ?? subscription.monthlyCost;
|
||||
final eventPrice =
|
||||
subscription.eventPrice ?? subscription.monthlyCost;
|
||||
final normalPrice = subscription.monthlyCost;
|
||||
dailyNotificationBody = '${subscription.serviceName} 구독료 ${normalPrice.toStringAsFixed(0)}원이 $remainingDaysText 결제 예정입니다.\n'
|
||||
'⚠️ 이벤트 종료로 가격이 ${eventPrice.toStringAsFixed(0)}원에서 ${normalPrice.toStringAsFixed(0)}원으로 변경됩니다.';
|
||||
dailyNotificationBody =
|
||||
'${subscription.serviceName} 구독료 ${normalPrice.toStringAsFixed(0)}원이 $remainingDaysText 결제 예정입니다.\n'
|
||||
'⚠️ 이벤트 종료로 가격이 ${eventPrice.toStringAsFixed(0)}원에서 ${normalPrice.toStringAsFixed(0)}원으로 변경됩니다.';
|
||||
} else {
|
||||
final currentPrice = subscription.currentPrice;
|
||||
dailyNotificationBody = '${subscription.serviceName} 구독료 ${currentPrice.toStringAsFixed(0)}원이 $remainingDaysText 결제 예정입니다.';
|
||||
dailyNotificationBody =
|
||||
'${subscription.serviceName} 구독료 ${currentPrice.toStringAsFixed(0)}원이 $remainingDaysText 결제 예정입니다.';
|
||||
}
|
||||
|
||||
await _notifications.zonedSchedule(
|
||||
|
||||
@@ -3,7 +3,8 @@ import '../../models/subscription_model.dart';
|
||||
|
||||
class SubscriptionConverter {
|
||||
// SubscriptionModel 리스트를 Subscription 리스트로 변환
|
||||
List<Subscription> convertModelsToSubscriptions(List<SubscriptionModel> models) {
|
||||
List<Subscription> convertModelsToSubscriptions(
|
||||
List<SubscriptionModel> models) {
|
||||
final result = <Subscription>[];
|
||||
|
||||
for (var model in models) {
|
||||
@@ -11,7 +12,8 @@ class SubscriptionConverter {
|
||||
final subscription = _convertSingle(model);
|
||||
result.add(subscription);
|
||||
|
||||
print('모델 변환 성공: ${model.serviceName}, 카테고리ID: ${model.categoryId}, URL: ${model.websiteUrl}, 통화: ${model.currency}');
|
||||
print(
|
||||
'모델 변환 성공: ${model.serviceName}, 카테고리ID: ${model.categoryId}, URL: ${model.websiteUrl}, 통화: ${model.currency}');
|
||||
} catch (e) {
|
||||
print('모델 변환 중 오류 발생: $e');
|
||||
}
|
||||
|
||||
@@ -5,7 +5,8 @@ class SubscriptionFilter {
|
||||
// 중복 구독 필터링 (서비스명과 금액이 같으면 중복으로 간주)
|
||||
List<Subscription> filterDuplicates(
|
||||
List<Subscription> scanned, List<SubscriptionModel> existing) {
|
||||
print('_filterDuplicates: 스캔된 구독 ${scanned.length}개, 기존 구독 ${existing.length}개');
|
||||
print(
|
||||
'_filterDuplicates: 스캔된 구독 ${scanned.length}개, 기존 구독 ${existing.length}개');
|
||||
|
||||
// 중복되지 않은 구독만 필터링
|
||||
return scanned.where((scannedSub) {
|
||||
@@ -16,7 +17,8 @@ class SubscriptionFilter {
|
||||
final isSameCost = existingSub.monthlyCost == scannedSub.monthlyCost;
|
||||
|
||||
if (isSameName && isSameCost) {
|
||||
print('중복 발견: ${scannedSub.serviceName} (${scannedSub.monthlyCost}원)');
|
||||
print(
|
||||
'중복 발견: ${scannedSub.serviceName} (${scannedSub.monthlyCost}원)');
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -27,7 +29,8 @@ class SubscriptionFilter {
|
||||
}
|
||||
|
||||
// 반복 횟수 기반 필터링
|
||||
List<Subscription> filterByRepeatCount(List<Subscription> subscriptions, int minCount) {
|
||||
List<Subscription> filterByRepeatCount(
|
||||
List<Subscription> subscriptions, int minCount) {
|
||||
return subscriptions.where((sub) => sub.repeatCount >= minCount).toList();
|
||||
}
|
||||
|
||||
@@ -44,7 +47,8 @@ class SubscriptionFilter {
|
||||
List<Subscription> filterByPriceRange(
|
||||
List<Subscription> subscriptions, double minPrice, double maxPrice) {
|
||||
return subscriptions
|
||||
.where((sub) => sub.monthlyCost >= minPrice && sub.monthlyCost <= maxPrice)
|
||||
.where(
|
||||
(sub) => sub.monthlyCost >= minPrice && sub.monthlyCost <= maxPrice)
|
||||
.toList();
|
||||
}
|
||||
|
||||
|
||||
@@ -107,18 +107,35 @@ class SmsScanner {
|
||||
|
||||
// 구독 서비스 키워드 매칭
|
||||
final subscriptionKeywords = [
|
||||
'구독', '결제', '정기결제', '자동결제', '월정액',
|
||||
'subscription', 'payment', 'billing', 'charge',
|
||||
'넷플릭스', 'Netflix', '유튜브', 'YouTube', 'Spotify',
|
||||
'멜론', '웨이브', 'Disney+', '디즈니플러스', 'Apple',
|
||||
'Microsoft', 'GitHub', 'Adobe', 'Amazon'
|
||||
'구독',
|
||||
'결제',
|
||||
'정기결제',
|
||||
'자동결제',
|
||||
'월정액',
|
||||
'subscription',
|
||||
'payment',
|
||||
'billing',
|
||||
'charge',
|
||||
'넷플릭스',
|
||||
'Netflix',
|
||||
'유튜브',
|
||||
'YouTube',
|
||||
'Spotify',
|
||||
'멜론',
|
||||
'웨이브',
|
||||
'Disney+',
|
||||
'디즈니플러스',
|
||||
'Apple',
|
||||
'Microsoft',
|
||||
'GitHub',
|
||||
'Adobe',
|
||||
'Amazon'
|
||||
];
|
||||
|
||||
// 구독 관련 키워드가 있는지 확인
|
||||
bool isSubscription = subscriptionKeywords.any((keyword) =>
|
||||
body.toLowerCase().contains(keyword.toLowerCase()) ||
|
||||
sender.toLowerCase().contains(keyword.toLowerCase())
|
||||
);
|
||||
body.toLowerCase().contains(keyword.toLowerCase()) ||
|
||||
sender.toLowerCase().contains(keyword.toLowerCase()));
|
||||
|
||||
if (!isSubscription) {
|
||||
return null;
|
||||
@@ -138,7 +155,8 @@ class SmsScanner {
|
||||
'monthlyCost': amount ?? 0.0,
|
||||
'billingCycle': billingCycle,
|
||||
'message': body,
|
||||
'nextBillingDate': _calculateNextBillingFromDate(date, billingCycle).toIso8601String(),
|
||||
'nextBillingDate':
|
||||
_calculateNextBillingFromDate(date, billingCycle).toIso8601String(),
|
||||
'previousPaymentDate': date.toIso8601String(),
|
||||
};
|
||||
} catch (e) {
|
||||
@@ -191,10 +209,10 @@ class SmsScanner {
|
||||
double? _extractAmount(String body) {
|
||||
// 다양한 금액 패턴 매칭
|
||||
final patterns = [
|
||||
RegExp(r'(\d{1,3}(?:,\d{3})*)(?:원|₩)'), // 원화
|
||||
RegExp(r'\$(\d+(?:\.\d{2})?)'), // 달러
|
||||
RegExp(r'(\d+(?:\.\d{2})?)\s*USD'), // USD
|
||||
RegExp(r'결제.*?(\d{1,3}(?:,\d{3})*)'), // 결제 금액
|
||||
RegExp(r'(\d{1,3}(?:,\d{3})*)(?:원|₩)'), // 원화
|
||||
RegExp(r'\$(\d+(?:\.\d{2})?)'), // 달러
|
||||
RegExp(r'(\d+(?:\.\d{2})?)\s*USD'), // USD
|
||||
RegExp(r'결제.*?(\d{1,3}(?:,\d{3})*)'), // 결제 금액
|
||||
];
|
||||
|
||||
for (final pattern in patterns) {
|
||||
@@ -213,7 +231,9 @@ class SmsScanner {
|
||||
String _extractBillingCycle(String body) {
|
||||
if (body.contains('월') || body.contains('monthly') || body.contains('매월')) {
|
||||
return 'monthly';
|
||||
} else if (body.contains('년') || body.contains('yearly') || body.contains('annual')) {
|
||||
} else if (body.contains('년') ||
|
||||
body.contains('yearly') ||
|
||||
body.contains('annual')) {
|
||||
return 'yearly';
|
||||
} else if (body.contains('주') || body.contains('weekly')) {
|
||||
return 'weekly';
|
||||
@@ -224,7 +244,8 @@ class SmsScanner {
|
||||
}
|
||||
|
||||
// 다음 결제일 계산
|
||||
DateTime _calculateNextBillingFromDate(DateTime lastDate, String billingCycle) {
|
||||
DateTime _calculateNextBillingFromDate(
|
||||
DateTime lastDate, String billingCycle) {
|
||||
switch (billingCycle) {
|
||||
case 'monthly':
|
||||
return DateTime(lastDate.year, lastDate.month + 1, lastDate.day);
|
||||
@@ -241,7 +262,8 @@ class SmsScanner {
|
||||
try {
|
||||
final serviceName = sms['serviceName'] as String? ?? '알 수 없는 서비스';
|
||||
final monthlyCost = (sms['monthlyCost'] as num?)?.toDouble() ?? 0.0;
|
||||
final billingCycle = SubscriptionModel.normalizeBillingCycle(sms['billingCycle'] as String? ?? 'monthly');
|
||||
final billingCycle = SubscriptionModel.normalizeBillingCycle(
|
||||
sms['billingCycle'] as String? ?? 'monthly');
|
||||
final nextBillingDateStr = sms['nextBillingDate'] as String?;
|
||||
// 실제 반복 횟수 사용 (테스트 데이터에서는 이미 제공됨)
|
||||
final actualRepeatCount = repeatCount > 0 ? repeatCount : 1;
|
||||
@@ -369,8 +391,6 @@ class SmsScanner {
|
||||
return serviceUrls[serviceName];
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 메시지에서 통화 단위를 감지하는 함수
|
||||
String _detectCurrency(String message) {
|
||||
final dollarKeywords = [
|
||||
|
||||
@@ -29,7 +29,8 @@ class SubscriptionUrlMatcher {
|
||||
// 2. 서비스 초기화
|
||||
_categoryMapper = CategoryMapperService(_dataRepository!);
|
||||
_urlMatcher = UrlMatcherService(_dataRepository!, _categoryMapper!);
|
||||
_cancellationService = CancellationUrlService(_dataRepository!, _urlMatcher!);
|
||||
_cancellationService =
|
||||
CancellationUrlService(_dataRepository!, _urlMatcher!);
|
||||
_nameResolver = ServiceNameResolver(_dataRepository!);
|
||||
_smsExtractor = SmsExtractorService(_urlMatcher!, _categoryMapper!);
|
||||
}
|
||||
@@ -67,7 +68,8 @@ class SubscriptionUrlMatcher {
|
||||
/// 서비스에 공식 해지 안내 페이지가 있는지 확인
|
||||
static Future<bool> hasCancellationPage(String serviceNameOrUrl) async {
|
||||
await initialize();
|
||||
return await _cancellationService?.hasCancellationPage(serviceNameOrUrl) ?? false;
|
||||
return await _cancellationService?.hasCancellationPage(serviceNameOrUrl) ??
|
||||
false;
|
||||
}
|
||||
|
||||
/// 서비스명으로 카테고리 찾기
|
||||
@@ -83,9 +85,10 @@ class SubscriptionUrlMatcher {
|
||||
}) async {
|
||||
await initialize();
|
||||
return await _nameResolver?.getServiceDisplayName(
|
||||
serviceName: serviceName,
|
||||
locale: locale,
|
||||
) ?? serviceName;
|
||||
serviceName: serviceName,
|
||||
locale: locale,
|
||||
) ??
|
||||
serviceName;
|
||||
}
|
||||
|
||||
/// SMS에서 URL과 서비스 정보 추출
|
||||
|
||||
@@ -336,17 +336,17 @@ class LegacyServiceData {
|
||||
|
||||
// 모든 서비스 매핑을 합친 맵
|
||||
static Map<String, String> get allServices => {
|
||||
...ottServices,
|
||||
...musicServices,
|
||||
...storageServices,
|
||||
...aiServices,
|
||||
...programmingServices,
|
||||
...officeTools,
|
||||
...lifestyleServices,
|
||||
...shoppingServices,
|
||||
...telecomServices,
|
||||
...otherServices,
|
||||
};
|
||||
...ottServices,
|
||||
...musicServices,
|
||||
...storageServices,
|
||||
...aiServices,
|
||||
...programmingServices,
|
||||
...officeTools,
|
||||
...lifestyleServices,
|
||||
...shoppingServices,
|
||||
...telecomServices,
|
||||
...otherServices,
|
||||
};
|
||||
|
||||
/// 서비스 카테고리 찾기
|
||||
static String? getCategoryForService(String serviceName) {
|
||||
|
||||
@@ -11,7 +11,8 @@ class ServiceDataRepository {
|
||||
if (_isInitialized) return;
|
||||
|
||||
try {
|
||||
final jsonString = await rootBundle.loadString('assets/data/subscription_services.json');
|
||||
final jsonString =
|
||||
await rootBundle.loadString('assets/data/subscription_services.json');
|
||||
_servicesData = json.decode(jsonString);
|
||||
_isInitialized = true;
|
||||
print('ServiceDataRepository: JSON 데이터 로드 완료');
|
||||
|
||||
@@ -25,18 +25,22 @@ class CancellationUrlService {
|
||||
final lowerName = serviceName.toLowerCase().trim();
|
||||
|
||||
for (final categoryData in categories.values) {
|
||||
final services = (categoryData as Map<String, dynamic>)['services'] as Map<String, dynamic>;
|
||||
final services = (categoryData as Map<String, dynamic>)['services']
|
||||
as Map<String, dynamic>;
|
||||
|
||||
for (final serviceData in services.values) {
|
||||
final names = List<String>.from((serviceData as Map<String, dynamic>)['names'] ?? []);
|
||||
final names = List<String>.from(
|
||||
(serviceData as Map<String, dynamic>)['names'] ?? []);
|
||||
|
||||
for (final name in names) {
|
||||
if (lowerName.contains(name.toLowerCase()) || name.toLowerCase().contains(lowerName)) {
|
||||
final cancellationUrls = serviceData['cancellationUrls'] as Map<String, dynamic>?;
|
||||
if (lowerName.contains(name.toLowerCase()) ||
|
||||
name.toLowerCase().contains(lowerName)) {
|
||||
final cancellationUrls =
|
||||
serviceData['cancellationUrls'] as Map<String, dynamic>?;
|
||||
if (cancellationUrls != null) {
|
||||
// 요청한 언어의 URL이 있으면 반환, 없으면 다른 언어 URL 반환
|
||||
return cancellationUrls[locale] ??
|
||||
cancellationUrls[locale == 'kr' ? 'en' : 'kr'];
|
||||
cancellationUrls[locale == 'kr' ? 'en' : 'kr'];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -49,17 +53,21 @@ class CancellationUrlService {
|
||||
final domain = _urlMatcher.extractDomain(websiteUrl);
|
||||
if (domain != null) {
|
||||
for (final categoryData in categories.values) {
|
||||
final services = (categoryData as Map<String, dynamic>)['services'] as Map<String, dynamic>;
|
||||
final services = (categoryData as Map<String, dynamic>)['services']
|
||||
as Map<String, dynamic>;
|
||||
|
||||
for (final serviceData in services.values) {
|
||||
final domains = List<String>.from((serviceData as Map<String, dynamic>)['domains'] ?? []);
|
||||
final domains = List<String>.from(
|
||||
(serviceData as Map<String, dynamic>)['domains'] ?? []);
|
||||
|
||||
for (final serviceDomain in domains) {
|
||||
if (domain.contains(serviceDomain) || serviceDomain.contains(domain)) {
|
||||
final cancellationUrls = serviceData['cancellationUrls'] as Map<String, dynamic>?;
|
||||
if (domain.contains(serviceDomain) ||
|
||||
serviceDomain.contains(domain)) {
|
||||
final cancellationUrls =
|
||||
serviceData['cancellationUrls'] as Map<String, dynamic>?;
|
||||
if (cancellationUrls != null) {
|
||||
return cancellationUrls[locale] ??
|
||||
cancellationUrls[locale == 'kr' ? 'en' : 'kr'];
|
||||
cancellationUrls[locale == 'kr' ? 'en' : 'kr'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,10 +24,12 @@ class CategoryMapperService {
|
||||
final services = categoryData['services'] as Map<String, dynamic>;
|
||||
|
||||
for (final serviceData in services.values) {
|
||||
final names = List<String>.from((serviceData as Map<String, dynamic>)['names'] ?? []);
|
||||
final names = List<String>.from(
|
||||
(serviceData as Map<String, dynamic>)['names'] ?? []);
|
||||
|
||||
for (final name in names) {
|
||||
if (lowerName.contains(name.toLowerCase()) || name.toLowerCase().contains(lowerName)) {
|
||||
if (lowerName.contains(name.toLowerCase()) ||
|
||||
name.toLowerCase().contains(lowerName)) {
|
||||
return getCategoryIdByKey(categoryId);
|
||||
}
|
||||
}
|
||||
@@ -73,15 +75,24 @@ class CategoryMapperService {
|
||||
String getCategoryForLegacyService(String serviceName) {
|
||||
final lowerName = serviceName.toLowerCase();
|
||||
|
||||
if (LegacyServiceData.ottServices.containsKey(lowerName)) return 'ott_services';
|
||||
if (LegacyServiceData.musicServices.containsKey(lowerName)) return 'music_streaming';
|
||||
if (LegacyServiceData.storageServices.containsKey(lowerName)) return 'cloud_storage';
|
||||
if (LegacyServiceData.aiServices.containsKey(lowerName)) return 'ai_services';
|
||||
if (LegacyServiceData.programmingServices.containsKey(lowerName)) return 'dev_tools';
|
||||
if (LegacyServiceData.officeTools.containsKey(lowerName)) return 'office_tools';
|
||||
if (LegacyServiceData.lifestyleServices.containsKey(lowerName)) return 'lifestyle';
|
||||
if (LegacyServiceData.shoppingServices.containsKey(lowerName)) return 'shopping';
|
||||
if (LegacyServiceData.telecomServices.containsKey(lowerName)) return 'telecom';
|
||||
if (LegacyServiceData.ottServices.containsKey(lowerName))
|
||||
return 'ott_services';
|
||||
if (LegacyServiceData.musicServices.containsKey(lowerName))
|
||||
return 'music_streaming';
|
||||
if (LegacyServiceData.storageServices.containsKey(lowerName))
|
||||
return 'cloud_storage';
|
||||
if (LegacyServiceData.aiServices.containsKey(lowerName))
|
||||
return 'ai_services';
|
||||
if (LegacyServiceData.programmingServices.containsKey(lowerName))
|
||||
return 'dev_tools';
|
||||
if (LegacyServiceData.officeTools.containsKey(lowerName))
|
||||
return 'office_tools';
|
||||
if (LegacyServiceData.lifestyleServices.containsKey(lowerName))
|
||||
return 'lifestyle';
|
||||
if (LegacyServiceData.shoppingServices.containsKey(lowerName))
|
||||
return 'shopping';
|
||||
if (LegacyServiceData.telecomServices.containsKey(lowerName))
|
||||
return 'telecom';
|
||||
|
||||
return 'other';
|
||||
}
|
||||
|
||||
@@ -21,7 +21,8 @@ class ServiceNameResolver {
|
||||
|
||||
// JSON에서 서비스 찾기
|
||||
for (final categoryData in categories.values) {
|
||||
final services = (categoryData as Map<String, dynamic>)['services'] as Map<String, dynamic>;
|
||||
final services = (categoryData as Map<String, dynamic>)['services']
|
||||
as Map<String, dynamic>;
|
||||
|
||||
for (final serviceData in services.values) {
|
||||
final data = serviceData as Map<String, dynamic>;
|
||||
|
||||
@@ -36,7 +36,9 @@ class SmsExtractorService {
|
||||
// 모든 서비스명 검사
|
||||
for (final entry in LegacyServiceData.allServices.entries) {
|
||||
if (lowerSms.contains(entry.key.toLowerCase())) {
|
||||
final categoryId = await _categoryMapper.findCategoryByServiceName(entry.key) ?? 'other';
|
||||
final categoryId =
|
||||
await _categoryMapper.findCategoryByServiceName(entry.key) ??
|
||||
'other';
|
||||
|
||||
return ServiceInfo(
|
||||
serviceId: entry.key,
|
||||
|
||||
@@ -62,7 +62,8 @@ class UrlMatcherService {
|
||||
|
||||
// 도메인이 일치하는지 확인
|
||||
for (final serviceDomain in domains) {
|
||||
if (domain.contains(serviceDomain) || serviceDomain.contains(domain)) {
|
||||
if (domain.contains(serviceDomain) ||
|
||||
serviceDomain.contains(domain)) {
|
||||
final names = List<String>.from(serviceData['names'] ?? []);
|
||||
final urls = serviceData['urls'] as Map<String, dynamic>?;
|
||||
|
||||
|
||||
@@ -22,21 +22,19 @@ class AdaptiveTheme {
|
||||
background: const Color(0xFF121212),
|
||||
surface: const Color(0xFF1E1E1E),
|
||||
),
|
||||
|
||||
scaffoldBackgroundColor: const Color(0xFF121212),
|
||||
|
||||
cardTheme: CardThemeData(
|
||||
color: const Color(0xFF1E1E1E),
|
||||
elevation: 2,
|
||||
shadowColor: Colors.black.withValues(alpha: 0.3),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
side: BorderSide(color: Colors.white.withValues(alpha: 0.1), width: 0.5),
|
||||
side: BorderSide(
|
||||
color: Colors.white.withValues(alpha: 0.1), width: 0.5),
|
||||
),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
|
||||
),
|
||||
|
||||
appBarTheme: AppBarTheme(
|
||||
backgroundColor: const Color(0xFF1E1E1E),
|
||||
foregroundColor: Colors.white,
|
||||
@@ -53,7 +51,6 @@ class AdaptiveTheme {
|
||||
size: 24,
|
||||
),
|
||||
),
|
||||
|
||||
textTheme: TextTheme(
|
||||
headlineLarge: const TextStyle(
|
||||
color: Colors.white,
|
||||
@@ -119,22 +116,24 @@ class AdaptiveTheme {
|
||||
height: 1.5,
|
||||
),
|
||||
),
|
||||
|
||||
inputDecorationTheme: InputDecorationTheme(
|
||||
filled: true,
|
||||
fillColor: const Color(0xFF2A2A2A),
|
||||
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
|
||||
contentPadding:
|
||||
const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: BorderSide(color: Colors.white.withValues(alpha: 0.1), width: 1),
|
||||
borderSide:
|
||||
BorderSide(color: Colors.white.withValues(alpha: 0.1), width: 1),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderSide: const BorderSide(color: AppColors.primaryColor, width: 1.5),
|
||||
borderSide:
|
||||
const BorderSide(color: AppColors.primaryColor, width: 1.5),
|
||||
),
|
||||
errorBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
@@ -151,7 +150,6 @@ class AdaptiveTheme {
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
),
|
||||
|
||||
elevatedButtonTheme: ElevatedButtonThemeData(
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: AppColors.primaryColor,
|
||||
@@ -164,7 +162,6 @@ class AdaptiveTheme {
|
||||
elevation: 0,
|
||||
),
|
||||
),
|
||||
|
||||
dividerTheme: DividerThemeData(
|
||||
color: Colors.white.withValues(alpha: 0.1),
|
||||
thickness: 1,
|
||||
@@ -206,7 +203,6 @@ class AdaptiveTheme {
|
||||
background: Colors.white,
|
||||
surface: Colors.white,
|
||||
),
|
||||
|
||||
textTheme: const TextTheme(
|
||||
headlineLarge: TextStyle(
|
||||
color: Colors.black,
|
||||
@@ -234,7 +230,6 @@ class AdaptiveTheme {
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
|
||||
cardTheme: CardThemeData(
|
||||
elevation: 0,
|
||||
shape: RoundedRectangleBorder(
|
||||
@@ -242,7 +237,6 @@ class AdaptiveTheme {
|
||||
side: const BorderSide(color: Colors.black, width: 2),
|
||||
),
|
||||
),
|
||||
|
||||
elevatedButtonTheme: ElevatedButtonThemeData(
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: Colors.black,
|
||||
@@ -263,20 +257,17 @@ class AdaptiveTheme {
|
||||
|
||||
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
|
||||
statusBarColor: Colors.transparent,
|
||||
statusBarIconBrightness: brightness == Brightness.dark
|
||||
? Brightness.light
|
||||
: Brightness.dark,
|
||||
statusBarBrightness: brightness == Brightness.dark
|
||||
? Brightness.light
|
||||
: Brightness.dark,
|
||||
statusBarIconBrightness:
|
||||
brightness == Brightness.dark ? Brightness.light : Brightness.dark,
|
||||
statusBarBrightness:
|
||||
brightness == Brightness.dark ? Brightness.light : Brightness.dark,
|
||||
systemNavigationBarColor: isOled
|
||||
? Colors.black
|
||||
: (brightness == Brightness.dark
|
||||
? const Color(0xFF121212)
|
||||
: Colors.white),
|
||||
systemNavigationBarIconBrightness: brightness == Brightness.dark
|
||||
? Brightness.light
|
||||
: Brightness.dark,
|
||||
systemNavigationBarIconBrightness:
|
||||
brightness == Brightness.dark ? Brightness.light : Brightness.dark,
|
||||
));
|
||||
}
|
||||
|
||||
@@ -357,12 +348,12 @@ class ThemeSettings {
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() => {
|
||||
'mode': mode.name,
|
||||
'useSystemColors': useSystemColors,
|
||||
'largeText': largeText,
|
||||
'reduceMotion': reduceMotion,
|
||||
'highContrast': highContrast,
|
||||
};
|
||||
'mode': mode.name,
|
||||
'useSystemColors': useSystemColors,
|
||||
'largeText': largeText,
|
||||
'reduceMotion': reduceMotion,
|
||||
'highContrast': highContrast,
|
||||
};
|
||||
|
||||
factory ThemeSettings.fromJson(Map<String, dynamic> json) {
|
||||
return ThemeSettings(
|
||||
|
||||
@@ -34,7 +34,7 @@ class AppColors {
|
||||
// 그라데이션 컬러 - 다양한 효과를 위한 조합
|
||||
static const List<Color> blueGradient = [
|
||||
Color(0xFF2563EB), // 딥 블루
|
||||
Color(0xFF60A5FA) // 스카이 블루
|
||||
Color(0xFF60A5FA) // 스카이 블루
|
||||
];
|
||||
static const List<Color> tealGradient = [
|
||||
Color(0xFF14B8A6),
|
||||
|
||||
@@ -52,21 +52,21 @@ class AppTheme {
|
||||
textTheme: const TextTheme(
|
||||
// 헤드라인 - 페이지 제목
|
||||
headlineLarge: const TextStyle(
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
fontSize: 32,
|
||||
fontWeight: FontWeight.w700,
|
||||
letterSpacing: -0.5,
|
||||
height: 1.2,
|
||||
),
|
||||
headlineMedium: const TextStyle(
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.w700,
|
||||
letterSpacing: -0.5,
|
||||
height: 1.2,
|
||||
),
|
||||
headlineSmall: const TextStyle(
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
fontSize: 24,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.25,
|
||||
@@ -75,21 +75,21 @@ class AppTheme {
|
||||
|
||||
// 타이틀 - 카드, 섹션 제목
|
||||
titleLarge: const TextStyle(
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.2,
|
||||
height: 1.4,
|
||||
),
|
||||
titleMedium: TextStyle(
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: -0.1,
|
||||
height: 1.4,
|
||||
),
|
||||
titleSmall: TextStyle(
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: 0,
|
||||
@@ -98,21 +98,21 @@ class AppTheme {
|
||||
|
||||
// 본문 텍스트
|
||||
bodyLarge: TextStyle(
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w400,
|
||||
letterSpacing: 0.1,
|
||||
height: 1.5,
|
||||
),
|
||||
bodyMedium: TextStyle(
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w400,
|
||||
letterSpacing: 0.1,
|
||||
height: 1.5,
|
||||
),
|
||||
bodySmall: TextStyle(
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w400,
|
||||
letterSpacing: 0.2,
|
||||
@@ -121,21 +121,21 @@ class AppTheme {
|
||||
|
||||
// 라벨 텍스트
|
||||
labelLarge: TextStyle(
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: 0.1,
|
||||
height: 1.4,
|
||||
),
|
||||
labelMedium: TextStyle(
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w600,
|
||||
letterSpacing: 0.2,
|
||||
height: 1.4,
|
||||
),
|
||||
labelSmall: TextStyle(
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w500,
|
||||
letterSpacing: 0.2,
|
||||
|
||||
@@ -63,9 +63,8 @@ class MemoryManager {
|
||||
|
||||
/// 특정 패턴의 캐시 제거
|
||||
void clearCacheByPattern(String pattern) {
|
||||
final keysToRemove = _cache.keys
|
||||
.where((key) => key.contains(pattern))
|
||||
.toList();
|
||||
final keysToRemove =
|
||||
_cache.keys.where((key) => key.contains(pattern)).toList();
|
||||
|
||||
for (final key in keysToRemove) {
|
||||
_cache.remove(key);
|
||||
@@ -139,9 +138,7 @@ class MemoryManager {
|
||||
|
||||
/// 살아있는 위젯 수 확인
|
||||
int getAliveWidgetCount() {
|
||||
return _widgetReferences.values
|
||||
.where((ref) => ref.target != null)
|
||||
.length;
|
||||
return _widgetReferences.values.where((ref) => ref.target != null).length;
|
||||
}
|
||||
|
||||
/// 메모리 압박 시 대응
|
||||
@@ -231,16 +228,17 @@ class ImageCacheStatus {
|
||||
});
|
||||
|
||||
double get sizeUsagePercentage => (currentSize / maximumSize) * 100;
|
||||
double get bytesUsagePercentage => (currentSizeBytes / maximumSizeBytes) * 100;
|
||||
double get bytesUsagePercentage =>
|
||||
(currentSizeBytes / maximumSizeBytes) * 100;
|
||||
|
||||
Map<String, dynamic> toJson() => {
|
||||
'currentSize': currentSize,
|
||||
'maximumSize': maximumSize,
|
||||
'currentSizeBytes': currentSizeBytes,
|
||||
'maximumSizeBytes': maximumSizeBytes,
|
||||
'sizeUsagePercentage': sizeUsagePercentage.toStringAsFixed(2),
|
||||
'bytesUsagePercentage': bytesUsagePercentage.toStringAsFixed(2),
|
||||
};
|
||||
'currentSize': currentSize,
|
||||
'maximumSize': maximumSize,
|
||||
'currentSizeBytes': currentSizeBytes,
|
||||
'maximumSizeBytes': maximumSizeBytes,
|
||||
'sizeUsagePercentage': sizeUsagePercentage.toStringAsFixed(2),
|
||||
'bytesUsagePercentage': bytesUsagePercentage.toStringAsFixed(2),
|
||||
};
|
||||
}
|
||||
|
||||
/// 메모리 효율적인 리스트 뷰
|
||||
@@ -263,10 +261,8 @@ class MemoryEfficientListView<T> extends StatefulWidget {
|
||||
_MemoryEfficientListViewState<T>();
|
||||
}
|
||||
|
||||
class _MemoryEfficientListViewState<T>
|
||||
extends State<MemoryEfficientListView<T>>
|
||||
class _MemoryEfficientListViewState<T> extends State<MemoryEfficientListView<T>>
|
||||
with AutomaticKeepAliveClientMixin {
|
||||
|
||||
@override
|
||||
bool get wantKeepAlive => false;
|
||||
|
||||
|
||||
@@ -5,7 +5,8 @@ import 'dart:async';
|
||||
|
||||
/// 성능 최적화를 위한 유틸리티 클래스
|
||||
class PerformanceOptimizer {
|
||||
static final PerformanceOptimizer _instance = PerformanceOptimizer._internal();
|
||||
static final PerformanceOptimizer _instance =
|
||||
PerformanceOptimizer._internal();
|
||||
factory PerformanceOptimizer() => _instance;
|
||||
PerformanceOptimizer._internal();
|
||||
|
||||
@@ -104,7 +105,8 @@ class PerformanceOptimizer {
|
||||
}
|
||||
|
||||
/// 이미지 최적화 - 메모리 효율적인 크기로 조정
|
||||
static double getOptimalImageSize(BuildContext context, {
|
||||
static double getOptimalImageSize(
|
||||
BuildContext context, {
|
||||
required double originalSize,
|
||||
double maxSize = 1000,
|
||||
}) {
|
||||
@@ -154,8 +156,8 @@ class PerformanceOptimizer {
|
||||
static void trackWidget(String widgetName, bool isCreated) {
|
||||
if (!kDebugMode) return;
|
||||
|
||||
_widgetCounts[widgetName] = (_widgetCounts[widgetName] ?? 0) +
|
||||
(isCreated ? 1 : -1);
|
||||
_widgetCounts[widgetName] =
|
||||
(_widgetCounts[widgetName] ?? 0) + (isCreated ? 1 : -1);
|
||||
|
||||
// 위젯이 비정상적으로 많이 생성되면 경고
|
||||
if ((_widgetCounts[widgetName] ?? 0) > 100) {
|
||||
@@ -176,8 +178,10 @@ class MemoryInfo {
|
||||
|
||||
double get usagePercentage => (currentUsage / capacity) * 100;
|
||||
|
||||
String get formattedUsage => '${(currentUsage / 1024 / 1024).toStringAsFixed(2)} MB';
|
||||
String get formattedCapacity => '${(capacity / 1024 / 1024).toStringAsFixed(2)} MB';
|
||||
String get formattedUsage =>
|
||||
'${(currentUsage / 1024 / 1024).toStringAsFixed(2)} MB';
|
||||
String get formattedCapacity =>
|
||||
'${(capacity / 1024 / 1024).toStringAsFixed(2)} MB';
|
||||
}
|
||||
|
||||
/// 성능 측정 데코레이터
|
||||
|
||||
@@ -18,7 +18,7 @@ class PlatformHelper {
|
||||
static bool get isDesktop {
|
||||
if (kIsWeb) return false;
|
||||
return defaultTargetPlatform == TargetPlatform.linux ||
|
||||
defaultTargetPlatform == TargetPlatform.macOS ||
|
||||
defaultTargetPlatform == TargetPlatform.windows;
|
||||
defaultTargetPlatform == TargetPlatform.macOS ||
|
||||
defaultTargetPlatform == TargetPlatform.windows;
|
||||
}
|
||||
}
|
||||
@@ -86,8 +86,8 @@ class SubscriptionCategoryHelper {
|
||||
categorizedSubscriptions['shoppingEcommerce']!.add(subscription);
|
||||
}
|
||||
// 프로그래밍
|
||||
else if (_isInCategory(subscription.serviceName,
|
||||
LegacyServiceData.programmingServices)) {
|
||||
else if (_isInCategory(
|
||||
subscription.serviceName, LegacyServiceData.programmingServices)) {
|
||||
if (!categorizedSubscriptions.containsKey('programming')) {
|
||||
categorizedSubscriptions['programming'] = [];
|
||||
}
|
||||
|
||||
@@ -6,7 +6,8 @@ import '../../controllers/add_subscription_controller.dart';
|
||||
import '../../l10n/app_localizations.dart';
|
||||
|
||||
/// 구독 추가 화면의 App Bar
|
||||
class AddSubscriptionAppBar extends StatelessWidget implements PreferredSizeWidget {
|
||||
class AddSubscriptionAppBar extends StatelessWidget
|
||||
implements PreferredSizeWidget {
|
||||
final AddSubscriptionController controller;
|
||||
final double scrollOffset;
|
||||
final VoidCallback onScanSMS;
|
||||
|
||||
@@ -66,7 +66,8 @@ class AddSubscriptionEventSection extends StatelessWidget {
|
||||
Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: controller.gradientColors[0].withValues(alpha: 0.1),
|
||||
color: controller.gradientColors[0]
|
||||
.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Icon(
|
||||
@@ -155,7 +156,8 @@ class AddSubscriptionEventSection extends StatelessWidget {
|
||||
Expanded(
|
||||
child: Builder(
|
||||
builder: (context) {
|
||||
final locale = Localizations.localeOf(context);
|
||||
final locale =
|
||||
Localizations.localeOf(context);
|
||||
String infoText;
|
||||
switch (locale.languageCode) {
|
||||
case 'ko':
|
||||
@@ -168,7 +170,8 @@ class AddSubscriptionEventSection extends StatelessWidget {
|
||||
infoText = '设置折扣或促销价格';
|
||||
break;
|
||||
default:
|
||||
infoText = 'Set up discount or promotion price';
|
||||
infoText =
|
||||
'Set up discount or promotion price';
|
||||
}
|
||||
return Text(
|
||||
infoText,
|
||||
@@ -216,8 +219,10 @@ class AddSubscriptionEventSection extends StatelessWidget {
|
||||
setState(() {
|
||||
controller.eventStartDate = date;
|
||||
// 시작일 설정 시 종료일이 없으면 자동으로 1달 후로 설정
|
||||
if (date != null && controller.eventEndDate == null) {
|
||||
controller.eventEndDate = date.add(const Duration(days: 30));
|
||||
if (date != null &&
|
||||
controller.eventEndDate == null) {
|
||||
controller.eventEndDate =
|
||||
date.add(const Duration(days: 30));
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -238,7 +243,8 @@ class AddSubscriptionEventSection extends StatelessWidget {
|
||||
Builder(
|
||||
builder: (BuildContext innerContext) {
|
||||
// 현재 로케일 확인
|
||||
final currentLocale = Localizations.localeOf(innerContext);
|
||||
final currentLocale =
|
||||
Localizations.localeOf(innerContext);
|
||||
|
||||
// 로케일에 따라 직접 텍스트 설정
|
||||
String eventPriceLabel;
|
||||
|
||||
@@ -69,13 +69,17 @@ class AnalysisBadge extends StatelessWidget {
|
||||
String displayText = amountText;
|
||||
if (amountText.length > 12) {
|
||||
// 괄호 안의 내용 제거
|
||||
displayText = amountText.replaceAll(RegExp(r'\([^)]*\)'), '').trim();
|
||||
displayText =
|
||||
amountText.replaceAll(RegExp(r'\([^)]*\)'), '').trim();
|
||||
}
|
||||
if (displayText.length > 10) {
|
||||
// 통화 기호만 남기고 숫자만 표시
|
||||
final currencySymbol = CurrencyUtil.getCurrencySymbol(subscription.currency);
|
||||
displayText = displayText.replaceAll(currencySymbol, '').trim();
|
||||
displayText = '$currencySymbol${displayText.substring(0, 6)}...';
|
||||
final currencySymbol =
|
||||
CurrencyUtil.getCurrencySymbol(subscription.currency);
|
||||
displayText =
|
||||
displayText.replaceAll(currencySymbol, '').trim();
|
||||
displayText =
|
||||
'$currencySymbol${displayText.substring(0, 6)}...';
|
||||
}
|
||||
return Text(
|
||||
displayText,
|
||||
|
||||
@@ -48,10 +48,12 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
ThemedText.headline(
|
||||
text: AppLocalizations.of(context).eventDiscountStatus,
|
||||
text: AppLocalizations.of(context)
|
||||
.eventDiscountStatus,
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
),
|
||||
@@ -79,7 +81,10 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
AppLocalizations.of(context).servicesInProgress(provider.activeEventSubscriptions.length),
|
||||
AppLocalizations.of(context)
|
||||
.servicesInProgress(provider
|
||||
.activeEventSubscriptions
|
||||
.length),
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.bold,
|
||||
@@ -97,15 +102,18 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
colors: [
|
||||
const Color(0xFFFF6B6B).withValues(alpha: 0.1),
|
||||
const Color(0xFFFF8787).withValues(alpha: 0.1),
|
||||
const Color(0xFFFF6B6B)
|
||||
.withValues(alpha: 0.1),
|
||||
const Color(0xFFFF8787)
|
||||
.withValues(alpha: 0.1),
|
||||
],
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFFF6B6B).withValues(alpha: 0.3),
|
||||
color: const Color(0xFFFF6B6B)
|
||||
.withValues(alpha: 0.3),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
@@ -118,10 +126,12 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
ThemedText(
|
||||
AppLocalizations.of(context).monthlySavingAmount,
|
||||
AppLocalizations.of(context)
|
||||
.monthlySavingAmount,
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
@@ -154,24 +164,29 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
...provider.activeEventSubscriptions.map((sub) {
|
||||
final savings = sub.originalPrice - (sub.eventPrice ?? sub.originalPrice);
|
||||
final savings = sub.originalPrice -
|
||||
(sub.eventPrice ?? sub.originalPrice);
|
||||
final discountRate =
|
||||
((savings / sub.originalPrice) * 100).round();
|
||||
((savings / sub.originalPrice) * 100)
|
||||
.round();
|
||||
return Container(
|
||||
margin: const EdgeInsets.only(bottom: 8),
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.darkNavy.withValues(alpha: 0.05),
|
||||
color: AppColors.darkNavy
|
||||
.withValues(alpha: 0.05),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(
|
||||
color: AppColors.darkNavy.withValues(alpha: 0.1),
|
||||
color: AppColors.darkNavy
|
||||
.withValues(alpha: 0.1),
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
ThemedText(
|
||||
sub.serviceName,
|
||||
@@ -184,8 +199,8 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
Row(
|
||||
children: [
|
||||
FutureBuilder<String>(
|
||||
future: CurrencyUtil
|
||||
.formatAmount(
|
||||
future:
|
||||
CurrencyUtil.formatAmount(
|
||||
sub.originalPrice,
|
||||
sub.currency),
|
||||
builder: (context, snapshot) {
|
||||
@@ -194,9 +209,11 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
snapshot.data!,
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
decoration: TextDecoration
|
||||
.lineThrough,
|
||||
color: AppColors.navyGray,
|
||||
decoration:
|
||||
TextDecoration
|
||||
.lineThrough,
|
||||
color: AppColors
|
||||
.navyGray,
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -211,9 +228,10 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
FutureBuilder<String>(
|
||||
future: CurrencyUtil
|
||||
.formatAmount(
|
||||
sub.eventPrice ?? sub.originalPrice,
|
||||
future:
|
||||
CurrencyUtil.formatAmount(
|
||||
sub.eventPrice ??
|
||||
sub.originalPrice,
|
||||
sub.currency),
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
@@ -244,7 +262,8 @@ class EventAnalysisCard extends StatelessWidget {
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFFF6B6B)
|
||||
.withValues(alpha: 0.2),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
borderRadius:
|
||||
BorderRadius.circular(4),
|
||||
),
|
||||
child: Text(
|
||||
'$discountRate${AppLocalizations.of(context).discountPercent}',
|
||||
|
||||
@@ -35,7 +35,8 @@ class MonthlyExpenseChartCard extends StatelessWidget {
|
||||
if (maxValue <= 1000000) return 1000000;
|
||||
|
||||
// 큰 금액은 자릿수에 맞춰 반올림
|
||||
final magnitude = math.pow(10, maxValue.toString().split('.')[0].length - 1).toDouble();
|
||||
final magnitude =
|
||||
math.pow(10, maxValue.toString().split('.')[0].length - 1).toDouble();
|
||||
return ((maxValue / magnitude).ceil() * magnitude).toDouble();
|
||||
} else {
|
||||
// 소수점이 있는 통화 (달러, 위안)
|
||||
@@ -164,8 +165,7 @@ class MonthlyExpenseChartCard extends StatelessWidget {
|
||||
0,
|
||||
(max, data) => math.max(
|
||||
max, data['totalExpense'] as double)),
|
||||
locale
|
||||
),
|
||||
locale),
|
||||
barGroups: _getMonthlyBarGroups(locale),
|
||||
gridData: FlGridData(
|
||||
show: true,
|
||||
@@ -176,13 +176,12 @@ class MonthlyExpenseChartCard extends StatelessWidget {
|
||||
0,
|
||||
(max, data) => math.max(max,
|
||||
data['totalExpense'] as double)),
|
||||
locale
|
||||
),
|
||||
CurrencyUtil.getDefaultCurrency(locale)
|
||||
),
|
||||
locale),
|
||||
CurrencyUtil.getDefaultCurrency(locale)),
|
||||
getDrawingHorizontalLine: (value) {
|
||||
return FlLine(
|
||||
color: AppColors.navyGray.withValues(alpha: 0.1),
|
||||
color:
|
||||
AppColors.navyGray.withValues(alpha: 0.1),
|
||||
strokeWidth: 1,
|
||||
);
|
||||
},
|
||||
@@ -233,10 +232,11 @@ class MonthlyExpenseChartCard extends StatelessWidget {
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: CurrencyUtil.formatTotalAmountWithLocale(
|
||||
monthlyData[group.x]['totalExpense']
|
||||
as double,
|
||||
locale),
|
||||
text: CurrencyUtil
|
||||
.formatTotalAmountWithLocale(
|
||||
monthlyData[group.x]
|
||||
['totalExpense'] as double,
|
||||
locale),
|
||||
style: const TextStyle(
|
||||
color: Color(0xFFFBBF24),
|
||||
fontSize: 14,
|
||||
@@ -254,7 +254,8 @@ class MonthlyExpenseChartCard extends StatelessWidget {
|
||||
const SizedBox(height: 16),
|
||||
Center(
|
||||
child: ThemedText.caption(
|
||||
text: AppLocalizations.of(context).monthlySubscriptionExpense,
|
||||
text: AppLocalizations.of(context)
|
||||
.monthlySubscriptionExpense,
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.bold,
|
||||
|
||||
@@ -23,7 +23,8 @@ class SubscriptionPieChartCard extends StatefulWidget {
|
||||
});
|
||||
|
||||
@override
|
||||
State<SubscriptionPieChartCard> createState() => _SubscriptionPieChartCardState();
|
||||
State<SubscriptionPieChartCard> createState() =>
|
||||
_SubscriptionPieChartCardState();
|
||||
}
|
||||
|
||||
class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
@@ -78,7 +79,6 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
|
||||
// 파이 차트 섹션 데이터 (언어별 기본 통화로 환산)
|
||||
Future<List<PieChartSectionData>> _getPieSections() async {
|
||||
|
||||
if (widget.subscriptions.isEmpty) return [];
|
||||
|
||||
// 현재 locale 가져오기
|
||||
@@ -97,11 +97,13 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
sectionValues.add(value);
|
||||
} else if (subscription.currency == 'USD') {
|
||||
// USD를 기본 통화로 변환
|
||||
final converted = await ExchangeRateService().convertUsdToTarget(value, defaultCurrency);
|
||||
final converted = await ExchangeRateService()
|
||||
.convertUsdToTarget(value, defaultCurrency);
|
||||
sectionValues.add(converted ?? value);
|
||||
} else if (defaultCurrency == 'USD') {
|
||||
// 기본 통화가 USD인 경우 다른 통화를 USD로 변환
|
||||
final converted = await ExchangeRateService().convertTargetToUsd(value, subscription.currency);
|
||||
final converted = await ExchangeRateService()
|
||||
.convertTargetToUsd(value, subscription.currency);
|
||||
sectionValues.add(converted ?? value);
|
||||
} else {
|
||||
// 기타 통화는 일단 그대로 사용 (환율 정보가 없는 경우)
|
||||
@@ -159,7 +161,8 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
}
|
||||
|
||||
// 터치 상태를 반영한 섹션 데이터 생성
|
||||
List<PieChartSectionData> _applyTouchedState(List<PieChartSectionData> sections) {
|
||||
List<PieChartSectionData> _applyTouchedState(
|
||||
List<PieChartSectionData> sections) {
|
||||
return List.generate(sections.length, (i) {
|
||||
final section = sections[i];
|
||||
final isTouched = _touchedIndex == i;
|
||||
@@ -169,14 +172,16 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
return PieChartSectionData(
|
||||
value: section.value,
|
||||
title: section.title,
|
||||
titleStyle: section.titleStyle?.copyWith(fontSize: fontSize) ?? TextStyle(
|
||||
fontSize: fontSize,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: AppColors.pureWhite,
|
||||
shadows: const [
|
||||
Shadow(color: Colors.black26, blurRadius: 2, offset: Offset(0, 1))
|
||||
],
|
||||
),
|
||||
titleStyle: section.titleStyle?.copyWith(fontSize: fontSize) ??
|
||||
TextStyle(
|
||||
fontSize: fontSize,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: AppColors.pureWhite,
|
||||
shadows: const [
|
||||
Shadow(
|
||||
color: Colors.black26, blurRadius: 2, offset: Offset(0, 1))
|
||||
],
|
||||
),
|
||||
color: section.color,
|
||||
radius: radius,
|
||||
titlePositionPercentageOffset: section.titlePositionPercentageOffset,
|
||||
@@ -217,18 +222,20 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
ThemedText.headline(
|
||||
text: AppLocalizations.of(context).subscriptionServiceRatio,
|
||||
text: AppLocalizations.of(context)
|
||||
.subscriptionServiceRatio,
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
),
|
||||
),
|
||||
FutureBuilder<String>(
|
||||
future: CurrencyUtil.getExchangeRateInfoForLocale(
|
||||
context.watch<LocaleProvider>().locale.languageCode
|
||||
),
|
||||
context
|
||||
.watch<LocaleProvider>()
|
||||
.locale
|
||||
.languageCode),
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData &&
|
||||
snapshot.data!.isNotEmpty) {
|
||||
if (snapshot.hasData && snapshot.data!.isNotEmpty) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
@@ -236,15 +243,15 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFE5F2FF),
|
||||
borderRadius:
|
||||
BorderRadius.circular(4),
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFBFDBFE),
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context).exchangeRateFormat(snapshot.data!),
|
||||
AppLocalizations.of(context)
|
||||
.exchangeRateFormat(snapshot.data!),
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
@@ -272,7 +279,8 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
height: 250,
|
||||
child: Center(
|
||||
child: ThemedText(
|
||||
AppLocalizations.of(context).noSubscriptionServices,
|
||||
AppLocalizations.of(context)
|
||||
.noSubscriptionServices,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
),
|
||||
@@ -284,16 +292,19 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
child: FutureBuilder<List<PieChartSectionData>>(
|
||||
future: _pieSectionsFuture,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||
if (snapshot.connectionState ==
|
||||
ConnectionState.waiting) {
|
||||
return const Center(
|
||||
child: CircularProgressIndicator(),
|
||||
);
|
||||
}
|
||||
|
||||
if (!snapshot.hasData || snapshot.data!.isEmpty) {
|
||||
if (!snapshot.hasData ||
|
||||
snapshot.data!.isEmpty) {
|
||||
return Center(
|
||||
child: ThemedText(
|
||||
AppLocalizations.of(context).noSubscriptionServices,
|
||||
AppLocalizations.of(context)
|
||||
.noSubscriptionServices,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
),
|
||||
@@ -306,14 +317,16 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
borderData: FlBorderData(show: false),
|
||||
sectionsSpace: 2,
|
||||
centerSpaceRadius: 60,
|
||||
sections: _applyTouchedState(snapshot.data!),
|
||||
sections:
|
||||
_applyTouchedState(snapshot.data!),
|
||||
pieTouchData: PieTouchData(
|
||||
enabled: true,
|
||||
touchCallback: (FlTouchEvent event,
|
||||
pieTouchResponse) {
|
||||
// 터치 응답이 없거나 섹션이 없는 경우
|
||||
if (pieTouchResponse == null ||
|
||||
pieTouchResponse.touchedSection == null) {
|
||||
pieTouchResponse.touchedSection ==
|
||||
null) {
|
||||
// 차트 밖으로 나갔을 때만 리셋
|
||||
if (_touchedIndex != -1) {
|
||||
setState(() {
|
||||
@@ -331,7 +344,10 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
if (event is FlTapUpEvent) {
|
||||
setState(() {
|
||||
// 동일 섹션 탭하면 선택 해제, 아니면 선택
|
||||
_touchedIndex = (_touchedIndex == touchedIndex) ? -1 : touchedIndex;
|
||||
_touchedIndex = (_touchedIndex ==
|
||||
touchedIndex)
|
||||
? -1
|
||||
: touchedIndex;
|
||||
});
|
||||
return;
|
||||
}
|
||||
@@ -364,10 +380,10 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
(index) {
|
||||
final subscription =
|
||||
widget.subscriptions[index];
|
||||
final color = _chartColors[index % _chartColors.length];
|
||||
final color =
|
||||
_chartColors[index % _chartColors.length];
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
bottom: 4.0),
|
||||
padding: const EdgeInsets.only(bottom: 4.0),
|
||||
child: Row(
|
||||
children: [
|
||||
Container(
|
||||
@@ -385,31 +401,31 @@ class _SubscriptionPieChartCardState extends State<SubscriptionPieChartCard> {
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
),
|
||||
overflow:
|
||||
TextOverflow.ellipsis,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
FutureBuilder<String>(
|
||||
future: CurrencyUtil
|
||||
.formatSubscriptionAmountWithLocale(
|
||||
subscription,
|
||||
context.read<LocaleProvider>().locale.languageCode),
|
||||
context
|
||||
.read<LocaleProvider>()
|
||||
.locale
|
||||
.languageCode),
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
return ThemedText(
|
||||
snapshot.data!,
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight:
|
||||
FontWeight.bold,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
);
|
||||
}
|
||||
return const SizedBox(
|
||||
width: 20,
|
||||
height: 20,
|
||||
child:
|
||||
CircularProgressIndicator(
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -56,7 +56,8 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
ThemedText.headline(
|
||||
text: AppLocalizations.of(context).totalExpenseSummary,
|
||||
text:
|
||||
AppLocalizations.of(context).totalExpenseSummary,
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
),
|
||||
@@ -67,20 +68,24 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
padding: EdgeInsets.zero,
|
||||
constraints: const BoxConstraints(),
|
||||
onPressed: () async {
|
||||
final totalExpenseText = CurrencyUtil.formatTotalAmountWithLocale(totalExpense, locale);
|
||||
final totalExpenseText =
|
||||
CurrencyUtil.formatTotalAmountWithLocale(
|
||||
totalExpense, locale);
|
||||
await Clipboard.setData(
|
||||
ClipboardData(text: totalExpenseText));
|
||||
HapticFeedbackHelper.lightImpact();
|
||||
if (!context.mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(AppLocalizations.of(context).totalExpenseCopied(totalExpenseText)),
|
||||
content: Text(AppLocalizations.of(context)
|
||||
.totalExpenseCopied(totalExpenseText)),
|
||||
duration: const Duration(seconds: 2),
|
||||
behavior: SnackBarBehavior.floating,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
backgroundColor: AppColors.glassBackground.withValues(alpha: 0.3),
|
||||
backgroundColor: AppColors.glassBackground
|
||||
.withValues(alpha: 0.3),
|
||||
margin: const EdgeInsets.symmetric(
|
||||
horizontal: 16,
|
||||
vertical: 8,
|
||||
@@ -115,7 +120,8 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
ThemedText(
|
||||
CurrencyUtil.formatTotalAmountWithLocale(totalExpense, locale),
|
||||
CurrencyUtil.formatTotalAmountWithLocale(
|
||||
totalExpense, locale),
|
||||
style: const TextStyle(
|
||||
fontSize: 26,
|
||||
fontWeight: FontWeight.bold,
|
||||
@@ -134,10 +140,12 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.glassBackground.withValues(alpha: 0.3),
|
||||
color: AppColors.glassBackground
|
||||
.withValues(alpha: 0.3),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(
|
||||
color: AppColors.glassBorder.withValues(alpha: 0.2),
|
||||
color: AppColors.glassBorder
|
||||
.withValues(alpha: 0.2),
|
||||
),
|
||||
),
|
||||
child: const FaIcon(
|
||||
@@ -152,7 +160,8 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
ThemedText.caption(
|
||||
text: AppLocalizations.of(context).totalServices,
|
||||
text: AppLocalizations.of(context)
|
||||
.totalServices,
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.bold,
|
||||
@@ -160,7 +169,9 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
ThemedText(
|
||||
AppLocalizations.of(context).subscriptionCount(subscriptions.length),
|
||||
AppLocalizations.of(context)
|
||||
.subscriptionCount(
|
||||
subscriptions.length),
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
@@ -176,10 +187,12 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.glassBackground.withValues(alpha: 0.3),
|
||||
color: AppColors.glassBackground
|
||||
.withValues(alpha: 0.3),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(
|
||||
color: AppColors.glassBorder.withValues(alpha: 0.2),
|
||||
color: AppColors.glassBorder
|
||||
.withValues(alpha: 0.2),
|
||||
),
|
||||
),
|
||||
child: const FaIcon(
|
||||
@@ -194,7 +207,8 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
ThemedText.caption(
|
||||
text: AppLocalizations.of(context).averageCost,
|
||||
text: AppLocalizations.of(context)
|
||||
.averageCost,
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.bold,
|
||||
@@ -202,11 +216,13 @@ class TotalExpenseSummaryCard extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 2),
|
||||
ThemedText(
|
||||
CurrencyUtil.formatTotalAmountWithLocale(
|
||||
subscriptions.isEmpty
|
||||
? 0
|
||||
: totalExpense / subscriptions.length,
|
||||
locale),
|
||||
CurrencyUtil
|
||||
.formatTotalAmountWithLocale(
|
||||
subscriptions.isEmpty
|
||||
? 0
|
||||
: totalExpense /
|
||||
subscriptions.length,
|
||||
locale),
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.bold,
|
||||
|
||||
@@ -138,7 +138,8 @@ class FlipPageRoute<T> extends PageRouteBuilder<T> {
|
||||
transitionDuration: const Duration(milliseconds: 800),
|
||||
reverseTransitionDuration: const Duration(milliseconds: 800),
|
||||
transitionsBuilder: (context, animation, secondaryAnimation, child) {
|
||||
final isAnimatingForward = animation.status == AnimationStatus.forward;
|
||||
final isAnimatingForward =
|
||||
animation.status == AnimationStatus.forward;
|
||||
|
||||
final flipAnimation = Tween(
|
||||
begin: 0.0,
|
||||
|
||||
@@ -109,8 +109,8 @@ class AnimatedWaveBackground extends StatelessWidget {
|
||||
width: 30,
|
||||
height: 30,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white.withValues(alpha:
|
||||
0.1 + 0.1 * pulseController.value,
|
||||
color: Colors.white.withValues(
|
||||
alpha: 0.1 + 0.1 * pulseController.value,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(15),
|
||||
),
|
||||
|
||||
@@ -42,7 +42,8 @@ class AppNavigator {
|
||||
}
|
||||
|
||||
/// 구독 상세 화면으로 네비게이션
|
||||
static Future<void> toDetail(BuildContext context, SubscriptionModel subscription) async {
|
||||
static Future<void> toDetail(
|
||||
BuildContext context, SubscriptionModel subscription) async {
|
||||
print('AppNavigator.toDetail 호출됨: ${subscription.serviceName}');
|
||||
HapticFeedback.lightImpact();
|
||||
|
||||
@@ -196,6 +197,7 @@ class AppNavigationObserver extends NavigatorObserver {
|
||||
@override
|
||||
void didReplace({Route<dynamic>? newRoute, Route<dynamic>? oldRoute}) {
|
||||
super.didReplace(newRoute: newRoute, oldRoute: oldRoute);
|
||||
debugPrint('Navigation: Replace ${oldRoute?.settings.name} with ${newRoute?.settings.name}');
|
||||
debugPrint(
|
||||
'Navigation: Replace ${oldRoute?.settings.name} with ${newRoute?.settings.name}');
|
||||
}
|
||||
}
|
||||
@@ -68,7 +68,8 @@ class CategoryHeaderWidget extends StatelessWidget {
|
||||
final parts = <String>[];
|
||||
|
||||
// 개수는 항상 표시
|
||||
parts.add(AppLocalizations.of(context).subscriptionCount(subscriptionCount));
|
||||
parts
|
||||
.add(AppLocalizations.of(context).subscriptionCount(subscriptionCount));
|
||||
|
||||
// 통화 부분을 별도로 처리
|
||||
final currencyParts = <String>[];
|
||||
|
||||
@@ -74,8 +74,7 @@ class _DangerButtonState extends State<DangerButton> {
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
widget.confirmationMessage ??
|
||||
'이 작업은 되돌릴 수 없습니다.\n계속하시겠습니까?',
|
||||
widget.confirmationMessage ?? '이 작업은 되돌릴 수 없습니다.\n계속하시겠습니까?',
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
|
||||
@@ -43,8 +43,10 @@ class _PrimaryButtonState extends State<PrimaryButton> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final effectiveBackgroundColor = widget.backgroundColor ?? theme.primaryColor;
|
||||
final effectiveForegroundColor = widget.foregroundColor ?? AppColors.pureWhite;
|
||||
final effectiveBackgroundColor =
|
||||
widget.backgroundColor ?? theme.primaryColor;
|
||||
final effectiveForegroundColor =
|
||||
widget.foregroundColor ?? AppColors.pureWhite;
|
||||
|
||||
Widget button = AnimatedContainer(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
@@ -64,7 +66,8 @@ class _PrimaryButtonState extends State<PrimaryButton> {
|
||||
padding: widget.padding ?? const EdgeInsets.symmetric(vertical: 16),
|
||||
elevation: widget.enableHoverEffect && _isHovered ? 2 : 0,
|
||||
shadowColor: Colors.black.withValues(alpha: 0.08),
|
||||
disabledBackgroundColor: effectiveBackgroundColor.withValues(alpha: 0.6),
|
||||
disabledBackgroundColor:
|
||||
effectiveBackgroundColor.withValues(alpha: 0.6),
|
||||
),
|
||||
child: widget.isLoading
|
||||
? SizedBox(
|
||||
|
||||
@@ -66,13 +66,13 @@ class _SecondaryButtonState extends State<SecondaryButton> {
|
||||
: effectiveBorderColor,
|
||||
width: widget.borderWidth,
|
||||
),
|
||||
padding: widget.padding ?? const EdgeInsets.symmetric(
|
||||
vertical: 12,
|
||||
horizontal: 24,
|
||||
),
|
||||
backgroundColor: _isHovered
|
||||
? AppColors.glassBackground
|
||||
: Colors.transparent,
|
||||
padding: widget.padding ??
|
||||
const EdgeInsets.symmetric(
|
||||
vertical: 12,
|
||||
horizontal: 24,
|
||||
),
|
||||
backgroundColor:
|
||||
_isHovered ? AppColors.glassBackground : Colors.transparent,
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
@@ -179,9 +179,8 @@ class _TextLinkButtonState extends State<TextLinkButton> {
|
||||
fontSize: widget.fontSize,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: effectiveColor,
|
||||
decoration: _isHovered
|
||||
? TextDecoration.underline
|
||||
: TextDecoration.none,
|
||||
decoration:
|
||||
_isHovered ? TextDecoration.underline : TextDecoration.none,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -34,13 +34,14 @@ class SectionCard extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final effectiveBackgroundColor = backgroundColor ?? Colors.white;
|
||||
final effectiveShadow = boxShadow ?? [
|
||||
BoxShadow(
|
||||
color: Colors.black.withValues(alpha: 0.05),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
];
|
||||
final effectiveShadow = boxShadow ??
|
||||
[
|
||||
BoxShadow(
|
||||
color: Colors.black.withValues(alpha: 0.05),
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
];
|
||||
|
||||
Widget card = Container(
|
||||
height: height,
|
||||
|
||||
@@ -53,7 +53,8 @@ class ConfirmationDialog extends StatelessWidget {
|
||||
Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: (iconColor ?? effectiveConfirmColor).withValues(alpha: 0.1),
|
||||
color:
|
||||
(iconColor ?? effectiveConfirmColor).withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Icon(
|
||||
|
||||
@@ -193,7 +193,8 @@ class _CustomLoadingIndicatorState extends State<CustomLoadingIndicator>
|
||||
width: widget.size / 5,
|
||||
height: widget.size / 5,
|
||||
decoration: BoxDecoration(
|
||||
color: effectiveColor.withValues(alpha: 0.3 + value * 0.7),
|
||||
color:
|
||||
effectiveColor.withValues(alpha: 0.3 + value * 0.7),
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
);
|
||||
@@ -220,7 +221,8 @@ class _CustomLoadingIndicatorState extends State<CustomLoadingIndicator>
|
||||
height: widget.size * (0.3 + _animation.value * 0.5),
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: effectiveColor.withValues(alpha: 1 - _animation.value),
|
||||
color:
|
||||
effectiveColor.withValues(alpha: 1 - _animation.value),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -90,10 +90,11 @@ class BaseTextField extends StatelessWidget {
|
||||
minLines: minLines,
|
||||
readOnly: readOnly,
|
||||
cursorColor: cursorColor ?? theme.primaryColor,
|
||||
style: style ?? TextStyle(
|
||||
fontSize: 16,
|
||||
color: AppColors.textPrimary,
|
||||
),
|
||||
style: style ??
|
||||
TextStyle(
|
||||
fontSize: 16,
|
||||
color: AppColors.textPrimary,
|
||||
),
|
||||
decoration: InputDecoration(
|
||||
hintText: hintText,
|
||||
hintStyle: TextStyle(
|
||||
|
||||
@@ -106,8 +106,6 @@ class BillingCycleSelector extends StatelessWidget {
|
||||
if (isSelected) {
|
||||
return Colors.white;
|
||||
}
|
||||
return isGlassmorphism
|
||||
? AppColors.darkNavy
|
||||
: Colors.grey[700]!;
|
||||
return isGlassmorphism ? AppColors.darkNavy : Colors.grey[700]!;
|
||||
}
|
||||
}
|
||||
@@ -55,7 +55,8 @@ class CategorySelector extends StatelessWidget {
|
||||
Consumer<CategoryProvider>(
|
||||
builder: (context, categoryProvider, child) {
|
||||
return Text(
|
||||
categoryProvider.getLocalizedCategoryName(context, category.name),
|
||||
categoryProvider.getLocalizedCategoryName(
|
||||
context, category.name),
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
@@ -131,8 +132,6 @@ class CategorySelector extends StatelessWidget {
|
||||
if (isSelected) {
|
||||
return Colors.white;
|
||||
}
|
||||
return isGlassmorphism
|
||||
? AppColors.darkNavy
|
||||
: Colors.grey[700]!;
|
||||
return isGlassmorphism ? AppColors.darkNavy : Colors.grey[700]!;
|
||||
}
|
||||
}
|
||||
@@ -105,7 +105,11 @@ class _CurrencyInputFieldState extends State<CurrencyInputField> {
|
||||
}
|
||||
|
||||
double? _parseValue(String text) {
|
||||
final cleanText = text.replaceAll(',', '').replaceAll('₩', '').replaceAll('\$', '').trim();
|
||||
final cleanText = text
|
||||
.replaceAll(',', '')
|
||||
.replaceAll('₩', '')
|
||||
.replaceAll('\$', '')
|
||||
.trim();
|
||||
return double.tryParse(cleanText);
|
||||
}
|
||||
|
||||
@@ -128,10 +132,7 @@ class _CurrencyInputFieldState extends State<CurrencyInputField> {
|
||||
keyboardType: const TextInputType.numberWithOptions(decimal: true),
|
||||
inputFormatters: [
|
||||
FilteringTextInputFormatter.allow(
|
||||
widget.currency == 'KRW'
|
||||
? RegExp(r'[0-9]')
|
||||
: RegExp(r'[0-9.]')
|
||||
),
|
||||
widget.currency == 'KRW' ? RegExp(r'[0-9]') : RegExp(r'[0-9.]')),
|
||||
if (widget.currency == 'USD')
|
||||
// USD의 경우 소수점 이하 2자리까지만 허용
|
||||
TextInputFormatter.withFunction((oldValue, newValue) {
|
||||
@@ -157,16 +158,17 @@ class _CurrencyInputFieldState extends State<CurrencyInputField> {
|
||||
final parsedValue = _parseValue(value);
|
||||
widget.onChanged?.call(parsedValue);
|
||||
},
|
||||
validator: widget.validator ?? (value) {
|
||||
if (value == null || value.isEmpty) {
|
||||
return AppLocalizations.of(context).amountRequired;
|
||||
}
|
||||
final parsedValue = _parseValue(value);
|
||||
if (parsedValue == null || parsedValue <= 0) {
|
||||
return AppLocalizations.of(context).invalidAmount;
|
||||
}
|
||||
return null;
|
||||
},
|
||||
validator: widget.validator ??
|
||||
(value) {
|
||||
if (value == null || value.isEmpty) {
|
||||
return AppLocalizations.of(context).amountRequired;
|
||||
}
|
||||
final parsedValue = _parseValue(value);
|
||||
if (parsedValue == null || parsedValue <= 0) {
|
||||
return AppLocalizations.of(context).invalidAmount;
|
||||
}
|
||||
return null;
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -131,9 +131,7 @@ class _CurrencyOption extends StatelessWidget {
|
||||
|
||||
Color _getBackgroundColor(ThemeData theme) {
|
||||
if (isSelected) {
|
||||
return isGlassmorphism
|
||||
? theme.primaryColor
|
||||
: const Color(0xFF3B82F6);
|
||||
return isGlassmorphism ? theme.primaryColor : const Color(0xFF3B82F6);
|
||||
}
|
||||
return isGlassmorphism
|
||||
? AppColors.surfaceColorAlt
|
||||
@@ -154,8 +152,6 @@ class _CurrencyOption extends StatelessWidget {
|
||||
if (isSelected) {
|
||||
return Colors.white;
|
||||
}
|
||||
return isGlassmorphism
|
||||
? AppColors.navyGray
|
||||
: Colors.grey[600]!;
|
||||
return isGlassmorphism ? AppColors.navyGray : Colors.grey[600]!;
|
||||
}
|
||||
}
|
||||
@@ -57,31 +57,35 @@ class DatePickerField extends StatelessWidget {
|
||||
const SizedBox(height: 8),
|
||||
InkWell(
|
||||
focusNode: focusNode,
|
||||
onTap: enabled ? () async {
|
||||
final DateTime? picked = await showDatePicker(
|
||||
context: context,
|
||||
initialDate: selectedDate,
|
||||
firstDate: firstDate ?? DateTime.now().subtract(const Duration(days: 365 * 10)),
|
||||
lastDate: lastDate ?? DateTime.now().add(const Duration(days: 365 * 10)),
|
||||
builder: (BuildContext context, Widget? child) {
|
||||
return Theme(
|
||||
data: ThemeData.light().copyWith(
|
||||
colorScheme: ColorScheme.light(
|
||||
primary: effectivePrimaryColor,
|
||||
onPrimary: Colors.white,
|
||||
surface: Colors.white,
|
||||
onSurface: Colors.black,
|
||||
),
|
||||
),
|
||||
child: child!,
|
||||
);
|
||||
},
|
||||
);
|
||||
onTap: enabled
|
||||
? () async {
|
||||
final DateTime? picked = await showDatePicker(
|
||||
context: context,
|
||||
initialDate: selectedDate,
|
||||
firstDate: firstDate ??
|
||||
DateTime.now().subtract(const Duration(days: 365 * 10)),
|
||||
lastDate: lastDate ??
|
||||
DateTime.now().add(const Duration(days: 365 * 10)),
|
||||
builder: (BuildContext context, Widget? child) {
|
||||
return Theme(
|
||||
data: ThemeData.light().copyWith(
|
||||
colorScheme: ColorScheme.light(
|
||||
primary: effectivePrimaryColor,
|
||||
onPrimary: Colors.white,
|
||||
surface: Colors.white,
|
||||
onSurface: Colors.black,
|
||||
),
|
||||
),
|
||||
child: child!,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
if (picked != null && picked != selectedDate) {
|
||||
onDateSelected(picked);
|
||||
}
|
||||
} : null,
|
||||
if (picked != null && picked != selectedDate) {
|
||||
onDateSelected(picked);
|
||||
}
|
||||
}
|
||||
: null,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: Container(
|
||||
padding: contentPadding ?? const EdgeInsets.all(16),
|
||||
@@ -97,21 +101,19 @@ class DatePickerField extends StatelessWidget {
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
DateFormat(effectiveDateFormat, locale.toString()).format(selectedDate),
|
||||
DateFormat(effectiveDateFormat, locale.toString())
|
||||
.format(selectedDate),
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: enabled
|
||||
? AppColors.textPrimary
|
||||
: AppColors.textMuted,
|
||||
color:
|
||||
enabled ? AppColors.textPrimary : AppColors.textMuted,
|
||||
),
|
||||
),
|
||||
),
|
||||
Icon(
|
||||
Icons.calendar_today,
|
||||
size: 20,
|
||||
color: enabled
|
||||
? AppColors.navyGray
|
||||
: AppColors.textMuted,
|
||||
color: enabled ? AppColors.navyGray : AppColors.textMuted,
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -158,7 +160,8 @@ class DateRangePickerField extends StatelessWidget {
|
||||
primaryColor: primaryColor,
|
||||
onDateSelected: onStartDateSelected,
|
||||
firstDate: DateTime.now().subtract(const Duration(days: 365)),
|
||||
lastDate: endDate ?? DateTime.now().add(const Duration(days: 365 * 2)),
|
||||
lastDate:
|
||||
endDate ?? DateTime.now().add(const Duration(days: 365 * 2)),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
@@ -203,31 +206,33 @@ class _DateRangeItem extends StatelessWidget {
|
||||
final effectivePrimaryColor = primaryColor ?? theme.primaryColor;
|
||||
|
||||
return InkWell(
|
||||
onTap: enabled ? () async {
|
||||
final DateTime? picked = await showDatePicker(
|
||||
context: context,
|
||||
initialDate: date ?? DateTime.now(),
|
||||
firstDate: firstDate,
|
||||
lastDate: lastDate,
|
||||
builder: (BuildContext context, Widget? child) {
|
||||
return Theme(
|
||||
data: ThemeData.light().copyWith(
|
||||
colorScheme: ColorScheme.light(
|
||||
primary: effectivePrimaryColor,
|
||||
onPrimary: Colors.white,
|
||||
surface: Colors.white,
|
||||
onSurface: Colors.black,
|
||||
),
|
||||
),
|
||||
child: child!,
|
||||
);
|
||||
},
|
||||
);
|
||||
onTap: enabled
|
||||
? () async {
|
||||
final DateTime? picked = await showDatePicker(
|
||||
context: context,
|
||||
initialDate: date ?? DateTime.now(),
|
||||
firstDate: firstDate,
|
||||
lastDate: lastDate,
|
||||
builder: (BuildContext context, Widget? child) {
|
||||
return Theme(
|
||||
data: ThemeData.light().copyWith(
|
||||
colorScheme: ColorScheme.light(
|
||||
primary: effectivePrimaryColor,
|
||||
onPrimary: Colors.white,
|
||||
surface: Colors.white,
|
||||
onSurface: Colors.black,
|
||||
),
|
||||
),
|
||||
child: child!,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
if (picked != null) {
|
||||
onDateSelected(picked);
|
||||
}
|
||||
} : null,
|
||||
if (picked != null) {
|
||||
onDateSelected(picked);
|
||||
}
|
||||
}
|
||||
: null,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
@@ -252,14 +257,14 @@ class _DateRangeItem extends StatelessWidget {
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
date != null
|
||||
? DateFormat(AppLocalizations.of(context).dateFormatShort).format(date!)
|
||||
? DateFormat(AppLocalizations.of(context).dateFormatShort)
|
||||
.format(date!)
|
||||
: AppLocalizations.of(context).dateSelect,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: date != null
|
||||
? AppColors.textPrimary
|
||||
: AppColors.textMuted,
|
||||
color:
|
||||
date != null ? AppColors.textPrimary : AppColors.textMuted,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -27,172 +27,177 @@ class DetailEventSection extends StatelessWidget {
|
||||
final baseColor = controller.getCardColor();
|
||||
|
||||
return FadeTransition(
|
||||
opacity: fadeAnimation,
|
||||
child: SlideTransition(
|
||||
position: Tween<Offset>(
|
||||
begin: const Offset(0.0, 0.8),
|
||||
end: Offset.zero,
|
||||
).animate(CurvedAnimation(
|
||||
parent: controller.animationController!,
|
||||
curve: const Interval(0.4, 1.0, curve: Curves.easeOutCubic),
|
||||
)),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.glassCard,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: AppColors.glassBorder.withValues(alpha: 0.1),
|
||||
width: 1,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: AppColors.shadowBlack,
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
opacity: fadeAnimation,
|
||||
child: SlideTransition(
|
||||
position: Tween<Offset>(
|
||||
begin: const Offset(0.0, 0.8),
|
||||
end: Offset.zero,
|
||||
).animate(CurvedAnimation(
|
||||
parent: controller.animationController!,
|
||||
curve: const Interval(0.4, 1.0, curve: Curves.easeOutCubic),
|
||||
)),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.glassCard,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: AppColors.glassBorder.withValues(alpha: 0.1),
|
||||
width: 1,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: AppColors.shadowBlack,
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 헤더
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 헤더
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: baseColor.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.local_offer_rounded,
|
||||
color: baseColor,
|
||||
size: 24,
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: baseColor.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Icon(
|
||||
Icons.local_offer_rounded,
|
||||
color: baseColor,
|
||||
size: 24,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Text(
|
||||
AppLocalizations.of(context).eventPrice,
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Text(
|
||||
AppLocalizations.of(context).eventPrice,
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
// 이벤트 활성화 스위치
|
||||
Switch.adaptive(
|
||||
value: controller.isEventActive,
|
||||
onChanged: (value) {
|
||||
controller.isEventActive = value;
|
||||
if (!value) {
|
||||
// 이벤트 비활성화시 관련 정보 초기화
|
||||
controller.eventStartDate = null;
|
||||
controller.eventEndDate = null;
|
||||
controller.eventPriceController.clear();
|
||||
}
|
||||
},
|
||||
activeColor: baseColor,
|
||||
),
|
||||
],
|
||||
),
|
||||
// 이벤트 활성화 스위치
|
||||
Switch.adaptive(
|
||||
value: controller.isEventActive,
|
||||
onChanged: (value) {
|
||||
controller.isEventActive = value;
|
||||
if (!value) {
|
||||
// 이벤트 비활성화시 관련 정보 초기화
|
||||
controller.eventStartDate = null;
|
||||
controller.eventEndDate = null;
|
||||
controller.eventPriceController.clear();
|
||||
}
|
||||
},
|
||||
activeColor: baseColor,
|
||||
),
|
||||
// 이벤트 활성화시 표시될 필드들
|
||||
if (controller.isEventActive) ...[
|
||||
const SizedBox(height: 20),
|
||||
// 이벤트 설명
|
||||
Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.infoColor.withValues(alpha: 0.08),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: AppColors.infoColor.withValues(alpha: 0.3),
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.info_outline_rounded,
|
||||
color: AppColors.infoColor,
|
||||
size: 20,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
AppLocalizations.of(context).eventPriceHint,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: AppColors.darkNavy,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
// 이벤트 기간
|
||||
DateRangePickerField(
|
||||
startDate: controller.eventStartDate,
|
||||
endDate: controller.eventEndDate,
|
||||
onStartDateSelected: (date) {
|
||||
controller.eventStartDate = date;
|
||||
// 시작일 설정 시 종료일이 없으면 자동으로 1달 후로 설정
|
||||
if (date != null && controller.eventEndDate == null) {
|
||||
controller.eventEndDate =
|
||||
date.add(const Duration(days: 30));
|
||||
}
|
||||
},
|
||||
onEndDateSelected: (date) {
|
||||
controller.eventEndDate = date;
|
||||
},
|
||||
startLabel: AppLocalizations.of(context).startDate,
|
||||
endLabel: AppLocalizations.of(context).endDate,
|
||||
primaryColor: baseColor,
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
// 이벤트 가격
|
||||
CurrencyInputField(
|
||||
controller: controller.eventPriceController,
|
||||
currency: controller.currency,
|
||||
label: AppLocalizations.of(context).eventPrice,
|
||||
hintText: AppLocalizations.of(context).eventPriceHint,
|
||||
validator: controller.isEventActive
|
||||
? (value) {
|
||||
if (value == null || value.isEmpty) {
|
||||
return AppLocalizations.of(context)
|
||||
.eventPriceRequired;
|
||||
}
|
||||
final price =
|
||||
double.tryParse(value.replaceAll(',', ''));
|
||||
if (price == null || price <= 0) {
|
||||
return AppLocalizations.of(context)
|
||||
.invalidPrice;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
: null,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
// 할인율 표시
|
||||
if (controller.eventPriceController.text.isNotEmpty)
|
||||
_DiscountBadge(
|
||||
originalPrice: controller.subscription.monthlyCost,
|
||||
eventPrice: double.tryParse(controller
|
||||
.eventPriceController.text
|
||||
.replaceAll(',', '')) ??
|
||||
0,
|
||||
currency: controller.currency,
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
// 이벤트 활성화시 표시될 필드들
|
||||
if (controller.isEventActive) ...[
|
||||
const SizedBox(height: 20),
|
||||
// 이벤트 설명
|
||||
Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.infoColor.withValues(alpha: 0.08),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: AppColors.infoColor.withValues(alpha: 0.3),
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Icon(
|
||||
Icons.info_outline_rounded,
|
||||
color: AppColors.infoColor,
|
||||
size: 20,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
AppLocalizations.of(context).eventPriceHint,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: AppColors.darkNavy,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
// 이벤트 기간
|
||||
DateRangePickerField(
|
||||
startDate: controller.eventStartDate,
|
||||
endDate: controller.eventEndDate,
|
||||
onStartDateSelected: (date) {
|
||||
controller.eventStartDate = date;
|
||||
// 시작일 설정 시 종료일이 없으면 자동으로 1달 후로 설정
|
||||
if (date != null && controller.eventEndDate == null) {
|
||||
controller.eventEndDate = date.add(const Duration(days: 30));
|
||||
}
|
||||
},
|
||||
onEndDateSelected: (date) {
|
||||
controller.eventEndDate = date;
|
||||
},
|
||||
startLabel: AppLocalizations.of(context).startDate,
|
||||
endLabel: AppLocalizations.of(context).endDate,
|
||||
primaryColor: baseColor,
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
// 이벤트 가격
|
||||
CurrencyInputField(
|
||||
controller: controller.eventPriceController,
|
||||
currency: controller.currency,
|
||||
label: AppLocalizations.of(context).eventPrice,
|
||||
hintText: AppLocalizations.of(context).eventPriceHint,
|
||||
validator: controller.isEventActive
|
||||
? (value) {
|
||||
if (value == null || value.isEmpty) {
|
||||
return AppLocalizations.of(context).eventPriceRequired;
|
||||
}
|
||||
final price = double.tryParse(value.replaceAll(',', ''));
|
||||
if (price == null || price <= 0) {
|
||||
return AppLocalizations.of(context).invalidPrice;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
: null,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
// 할인율 표시
|
||||
if (controller.eventPriceController.text.isNotEmpty)
|
||||
_DiscountBadge(
|
||||
originalPrice: controller.subscription.monthlyCost,
|
||||
eventPrice: double.tryParse(
|
||||
controller.eventPriceController.text.replaceAll(',', '')
|
||||
) ?? 0,
|
||||
currency: controller.currency,
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
@@ -216,7 +221,8 @@ class _DiscountBadge extends StatelessWidget {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
final discountPercentage = ((originalPrice - eventPrice) / originalPrice * 100).round();
|
||||
final discountPercentage =
|
||||
((originalPrice - eventPrice) / originalPrice * 100).round();
|
||||
final discountAmount = originalPrice - eventPrice;
|
||||
|
||||
return Container(
|
||||
@@ -234,7 +240,9 @@ class _DiscountBadge extends StatelessWidget {
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context).discountPercent.replaceAll('@', discountPercentage.toString()),
|
||||
AppLocalizations.of(context)
|
||||
.discountPercent
|
||||
.replaceAll('@', discountPercentage.toString()),
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 12,
|
||||
@@ -256,7 +264,8 @@ class _DiscountBadge extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
String _getLocalizedDiscountAmount(BuildContext context, String currency, double amount) {
|
||||
String _getLocalizedDiscountAmount(
|
||||
BuildContext context, String currency, double amount) {
|
||||
final loc = AppLocalizations.of(context);
|
||||
switch (currency) {
|
||||
case 'KRW':
|
||||
@@ -264,9 +273,11 @@ class _DiscountBadge extends StatelessWidget {
|
||||
case 'JPY':
|
||||
return loc.discountAmountYen.replaceAll('@', amount.toInt().toString());
|
||||
case 'CNY':
|
||||
return loc.discountAmountYuan.replaceAll('@', amount.toStringAsFixed(2));
|
||||
return loc.discountAmountYuan
|
||||
.replaceAll('@', amount.toStringAsFixed(2));
|
||||
default: // USD
|
||||
return loc.discountAmountDollar.replaceAll('@', amount.toStringAsFixed(2));
|
||||
return loc.discountAmountDollar
|
||||
.replaceAll('@', amount.toStringAsFixed(2));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -32,151 +32,111 @@ class DetailFormSection extends StatelessWidget {
|
||||
final baseColor = controller.getCardColor();
|
||||
|
||||
return FadeTransition(
|
||||
opacity: fadeAnimation,
|
||||
child: SlideTransition(
|
||||
position: Tween<Offset>(
|
||||
begin: const Offset(0.0, 0.6),
|
||||
end: Offset.zero,
|
||||
).animate(CurvedAnimation(
|
||||
parent: controller.animationController!,
|
||||
curve: const Interval(0.3, 1.0, curve: Curves.easeOutCubic),
|
||||
)),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.glassCard,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: AppColors.glassBorder.withValues(alpha: 0.1),
|
||||
width: 1,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: AppColors.shadowBlack,
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
opacity: fadeAnimation,
|
||||
child: SlideTransition(
|
||||
position: Tween<Offset>(
|
||||
begin: const Offset(0.0, 0.6),
|
||||
end: Offset.zero,
|
||||
).animate(CurvedAnimation(
|
||||
parent: controller.animationController!,
|
||||
curve: const Interval(0.3, 1.0, curve: Curves.easeOutCubic),
|
||||
)),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.glassCard,
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(
|
||||
color: AppColors.glassBorder.withValues(alpha: 0.1),
|
||||
width: 1,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: AppColors.shadowBlack,
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// 서비스명 필드
|
||||
BaseTextField(
|
||||
controller: controller.serviceNameController,
|
||||
focusNode: controller.serviceNameFocus,
|
||||
label: AppLocalizations.of(context).subscriptionName,
|
||||
hintText: AppLocalizations.of(context).serviceNameExample,
|
||||
textInputAction: TextInputAction.next,
|
||||
onEditingComplete: () {
|
||||
controller.monthlyCostFocus.requestFocus();
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// 월 지출 및 통화 선택
|
||||
Row(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: CurrencyInputField(
|
||||
controller: controller.monthlyCostController,
|
||||
currency: controller.currency,
|
||||
label: AppLocalizations.of(context).monthlyExpense,
|
||||
focusNode: controller.monthlyCostFocus,
|
||||
textInputAction: TextInputAction.next,
|
||||
onEditingComplete: () {
|
||||
controller.billingCycleFocus.requestFocus();
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).currency,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
CurrencySelector(
|
||||
currency: controller.currency,
|
||||
isGlassmorphism: true,
|
||||
onChanged: (value) {
|
||||
controller.currency = value;
|
||||
// 통화 변경시 금액 포맷 업데이트
|
||||
if (value == 'KRW') {
|
||||
final amount = double.tryParse(
|
||||
controller.monthlyCostController.text.replaceAll(',', '')
|
||||
);
|
||||
if (amount != null) {
|
||||
controller.monthlyCostController.text =
|
||||
amount.toInt().toString();
|
||||
}
|
||||
}
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// 결제 주기
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).billingCycle,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
BillingCycleSelector(
|
||||
billingCycle: controller.billingCycle,
|
||||
baseColor: baseColor,
|
||||
isGlassmorphism: true,
|
||||
onChanged: (value) {
|
||||
controller.billingCycle = value;
|
||||
// 서비스명 필드
|
||||
BaseTextField(
|
||||
controller: controller.serviceNameController,
|
||||
focusNode: controller.serviceNameFocus,
|
||||
label: AppLocalizations.of(context).subscriptionName,
|
||||
hintText: AppLocalizations.of(context).serviceNameExample,
|
||||
textInputAction: TextInputAction.next,
|
||||
onEditingComplete: () {
|
||||
controller.monthlyCostFocus.requestFocus();
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// 다음 결제일
|
||||
DatePickerField(
|
||||
selectedDate: controller.nextBillingDate,
|
||||
onDateSelected: (date) {
|
||||
controller.nextBillingDate = date;
|
||||
},
|
||||
label: AppLocalizations.of(context).nextBillingDate,
|
||||
firstDate: DateTime.now(),
|
||||
lastDate: DateTime.now().add(const Duration(days: 365 * 2)),
|
||||
primaryColor: baseColor,
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
// 월 지출 및 통화 선택
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(
|
||||
flex: 2,
|
||||
child: CurrencyInputField(
|
||||
controller: controller.monthlyCostController,
|
||||
currency: controller.currency,
|
||||
label: AppLocalizations.of(context).monthlyExpense,
|
||||
focusNode: controller.monthlyCostFocus,
|
||||
textInputAction: TextInputAction.next,
|
||||
onEditingComplete: () {
|
||||
controller.billingCycleFocus.requestFocus();
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).currency,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
CurrencySelector(
|
||||
currency: controller.currency,
|
||||
isGlassmorphism: true,
|
||||
onChanged: (value) {
|
||||
controller.currency = value;
|
||||
// 통화 변경시 금액 포맷 업데이트
|
||||
if (value == 'KRW') {
|
||||
final amount = double.tryParse(controller
|
||||
.monthlyCostController.text
|
||||
.replaceAll(',', ''));
|
||||
if (amount != null) {
|
||||
controller.monthlyCostController.text =
|
||||
amount.toInt().toString();
|
||||
}
|
||||
}
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// 카테고리 선택
|
||||
Consumer<CategoryProvider>(
|
||||
builder: (context, categoryProvider, child) {
|
||||
return Column(
|
||||
// 결제 주기
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).category,
|
||||
AppLocalizations.of(context).billingCycle,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
@@ -184,27 +144,67 @@ class DetailFormSection extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
CategorySelector(
|
||||
categories: categoryProvider.categories,
|
||||
selectedCategoryId: controller.selectedCategoryId,
|
||||
BillingCycleSelector(
|
||||
billingCycle: controller.billingCycle,
|
||||
baseColor: baseColor,
|
||||
isGlassmorphism: true,
|
||||
onChanged: (categoryId) {
|
||||
controller.selectedCategoryId = categoryId;
|
||||
onChanged: (value) {
|
||||
controller.billingCycle = value;
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// 다음 결제일
|
||||
DatePickerField(
|
||||
selectedDate: controller.nextBillingDate,
|
||||
onDateSelected: (date) {
|
||||
controller.nextBillingDate = date;
|
||||
},
|
||||
label: AppLocalizations.of(context).nextBillingDate,
|
||||
firstDate: DateTime.now(),
|
||||
lastDate:
|
||||
DateTime.now().add(const Duration(days: 365 * 2)),
|
||||
primaryColor: baseColor,
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
|
||||
// 카테고리 선택
|
||||
Consumer<CategoryProvider>(
|
||||
builder: (context, categoryProvider, child) {
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).category,
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
CategorySelector(
|
||||
categories: categoryProvider.categories,
|
||||
selectedCategoryId: controller.selectedCategoryId,
|
||||
baseColor: baseColor,
|
||||
isGlassmorphism: true,
|
||||
onChanged: (categoryId) {
|
||||
controller.selectedCategoryId = categoryId;
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -34,191 +34,215 @@ class DetailHeaderSection extends StatelessWidget {
|
||||
final gradient = controller.getGradient(baseColor);
|
||||
|
||||
return Container(
|
||||
height: 320,
|
||||
decoration: BoxDecoration(gradient: gradient),
|
||||
child: Stack(
|
||||
children: [
|
||||
// 배경 패턴
|
||||
Positioned(
|
||||
top: -50,
|
||||
right: -50,
|
||||
child: RotationTransition(
|
||||
turns: rotateAnimation,
|
||||
child: Container(
|
||||
width: 200,
|
||||
height: 200,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.white.withValues(alpha: 0.1),
|
||||
height: 320,
|
||||
decoration: BoxDecoration(gradient: gradient),
|
||||
child: Stack(
|
||||
children: [
|
||||
// 배경 패턴
|
||||
Positioned(
|
||||
top: -50,
|
||||
right: -50,
|
||||
child: RotationTransition(
|
||||
turns: rotateAnimation,
|
||||
child: Container(
|
||||
width: 200,
|
||||
height: 200,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.white.withValues(alpha: 0.1),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Positioned(
|
||||
bottom: -30,
|
||||
left: -30,
|
||||
child: Container(
|
||||
width: 150,
|
||||
height: 150,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.white.withValues(alpha: 0.08),
|
||||
),
|
||||
),
|
||||
),
|
||||
// 콘텐츠
|
||||
SafeArea(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 뒤로가기 버튼
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
IconButton(
|
||||
icon: const Icon(
|
||||
Icons.arrow_back_ios_new_rounded,
|
||||
color: Colors.white,
|
||||
),
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(
|
||||
Icons.delete_outline_rounded,
|
||||
color: Colors.white,
|
||||
),
|
||||
onPressed: controller.deleteSubscription,
|
||||
),
|
||||
],
|
||||
Positioned(
|
||||
bottom: -30,
|
||||
left: -30,
|
||||
child: Container(
|
||||
width: 150,
|
||||
height: 150,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Colors.white.withValues(alpha: 0.08),
|
||||
),
|
||||
const Spacer(),
|
||||
// 서비스 정보
|
||||
FadeTransition(
|
||||
opacity: fadeAnimation,
|
||||
child: SlideTransition(
|
||||
position: slideAnimation,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
),
|
||||
),
|
||||
// 콘텐츠
|
||||
SafeArea(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 뒤로가기 버튼
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
// 서비스 아이콘과 이름
|
||||
Row(
|
||||
IconButton(
|
||||
icon: const Icon(
|
||||
Icons.arrow_back_ios_new_rounded,
|
||||
color: Colors.white,
|
||||
),
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(
|
||||
Icons.delete_outline_rounded,
|
||||
color: Colors.white,
|
||||
),
|
||||
onPressed: controller.deleteSubscription,
|
||||
),
|
||||
],
|
||||
),
|
||||
const Spacer(),
|
||||
// 서비스 정보
|
||||
FadeTransition(
|
||||
opacity: fadeAnimation,
|
||||
child: SlideTransition(
|
||||
position: slideAnimation,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Hero(
|
||||
tag: 'icon_${subscription.id}',
|
||||
child: Container(
|
||||
width: 56,
|
||||
height: 56,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withValues(alpha: 0.1),
|
||||
blurRadius: 8,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: WebsiteIcon(
|
||||
url: controller.websiteUrlController.text,
|
||||
serviceName: controller.serviceNameController.text,
|
||||
size: 48,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
controller.displayName ?? controller.serviceNameController.text,
|
||||
style: const TextStyle(
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.w800,
|
||||
// 서비스 아이콘과 이름
|
||||
Row(
|
||||
children: [
|
||||
Hero(
|
||||
tag: 'icon_${subscription.id}',
|
||||
child: Container(
|
||||
width: 56,
|
||||
height: 56,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white,
|
||||
letterSpacing: -0.5,
|
||||
shadows: [
|
||||
Shadow(
|
||||
color: Colors.black26,
|
||||
offset: Offset(0, 2),
|
||||
blurRadius: 4,
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black
|
||||
.withValues(alpha: 0.1),
|
||||
blurRadius: 8,
|
||||
offset: const Offset(0, 4),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
AppLocalizations.of(context).billingCyclePayment.replaceAll('@',
|
||||
_getLocalizedBillingCycle(context, controller.billingCycle)),
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.white.withValues(alpha: 0.8),
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
child: WebsiteIcon(
|
||||
url: controller
|
||||
.websiteUrlController.text,
|
||||
serviceName: controller
|
||||
.serviceNameController.text,
|
||||
size: 48,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
controller.displayName ??
|
||||
controller
|
||||
.serviceNameController.text,
|
||||
style: const TextStyle(
|
||||
fontSize: 28,
|
||||
fontWeight: FontWeight.w800,
|
||||
color: Colors.white,
|
||||
letterSpacing: -0.5,
|
||||
shadows: [
|
||||
Shadow(
|
||||
color: Colors.black26,
|
||||
offset: Offset(0, 2),
|
||||
blurRadius: 4,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
AppLocalizations.of(context)
|
||||
.billingCyclePayment
|
||||
.replaceAll(
|
||||
'@',
|
||||
_getLocalizedBillingCycle(
|
||||
context,
|
||||
controller.billingCycle)),
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.white
|
||||
.withValues(alpha: 0.8),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
// 결제 정보 카드
|
||||
Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white.withValues(alpha: 0.15),
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
_InfoColumn(
|
||||
label: AppLocalizations.of(context)
|
||||
.nextBillingDate,
|
||||
value: AppLocalizations.of(context)
|
||||
.formatDate(
|
||||
controller.nextBillingDate),
|
||||
),
|
||||
FutureBuilder<String>(
|
||||
future: () async {
|
||||
final locale = context
|
||||
.read<LocaleProvider>()
|
||||
.locale
|
||||
.languageCode;
|
||||
final amount = double.tryParse(
|
||||
controller
|
||||
.monthlyCostController.text
|
||||
.replaceAll(',', '')) ??
|
||||
0;
|
||||
return CurrencyUtil
|
||||
.formatAmountWithLocale(
|
||||
amount,
|
||||
controller.currency,
|
||||
locale,
|
||||
);
|
||||
}(),
|
||||
builder: (context, snapshot) {
|
||||
return _InfoColumn(
|
||||
label: AppLocalizations.of(context)
|
||||
.monthlyExpense,
|
||||
value: snapshot.data ?? '-',
|
||||
alignment: CrossAxisAlignment.end,
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
// 결제 정보 카드
|
||||
Container(
|
||||
padding: const EdgeInsets.all(16),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white.withValues(alpha: 0.15),
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
_InfoColumn(
|
||||
label: AppLocalizations.of(context).nextBillingDate,
|
||||
value: AppLocalizations.of(context).formatDate(controller.nextBillingDate),
|
||||
),
|
||||
FutureBuilder<String>(
|
||||
future: () async {
|
||||
final locale = context.read<LocaleProvider>().locale.languageCode;
|
||||
final amount = double.tryParse(
|
||||
controller.monthlyCostController.text.replaceAll(',', '')
|
||||
) ?? 0;
|
||||
return CurrencyUtil.formatAmountWithLocale(
|
||||
amount,
|
||||
controller.currency,
|
||||
locale,
|
||||
);
|
||||
}(),
|
||||
builder: (context, snapshot) {
|
||||
return _InfoColumn(
|
||||
label: AppLocalizations.of(context).monthlyExpense,
|
||||
value: snapshot.data ?? '-',
|
||||
alignment: CrossAxisAlignment.end,
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
String _getLocalizedBillingCycle(BuildContext context, String cycle) {
|
||||
final loc = AppLocalizations.of(context);
|
||||
switch (cycle.toLowerCase()) {
|
||||
|
||||
@@ -58,7 +58,8 @@ class EmptyStateWidget extends StatelessWidget {
|
||||
borderRadius: BorderRadius.circular(16),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: AppColors.primaryColor.withValues(alpha: 0.3),
|
||||
color:
|
||||
AppColors.primaryColor.withValues(alpha: 0.3),
|
||||
spreadRadius: 0,
|
||||
blurRadius: 16,
|
||||
offset: const Offset(0, 8),
|
||||
|
||||
@@ -81,7 +81,8 @@ class _ExpandableFabState extends State<ExpandableFab>
|
||||
animation: _expandAnimation,
|
||||
builder: (context, child) {
|
||||
return Container(
|
||||
color: AppColors.shadowBlack.withValues(alpha: 3.75 * _expandAnimation.value),
|
||||
color: AppColors.shadowBlack
|
||||
.withValues(alpha: 3.75 * _expandAnimation.value),
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -124,8 +124,11 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar>
|
||||
_NavigationItem(
|
||||
icon: Icons.settings_rounded,
|
||||
label: AppLocalizations.of(context).settings,
|
||||
isSelected: PlatformHelper.isIOS ? widget.selectedIndex == 3 : widget.selectedIndex == 4,
|
||||
onTap: () => _onItemTapped(PlatformHelper.isIOS ? 3 : 4),
|
||||
isSelected: PlatformHelper.isIOS
|
||||
? widget.selectedIndex == 3
|
||||
: widget.selectedIndex == 4,
|
||||
onTap: () =>
|
||||
_onItemTapped(PlatformHelper.isIOS ? 3 : 4),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
@@ -6,7 +6,8 @@ import 'themed_text.dart';
|
||||
import '../l10n/app_localizations.dart';
|
||||
|
||||
/// 글래스모피즘 효과가 적용된 통일된 앱바
|
||||
class GlassmorphicAppBar extends StatelessWidget implements PreferredSizeWidget {
|
||||
class GlassmorphicAppBar extends StatelessWidget
|
||||
implements PreferredSizeWidget {
|
||||
final String title;
|
||||
final List<Widget>? actions;
|
||||
final Widget? leading;
|
||||
@@ -54,12 +55,16 @@ class GlassmorphicAppBar extends StatelessWidget implements PreferredSizeWidget
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
colors: [
|
||||
(backgroundColor ?? (isDarkMode
|
||||
? AppColors.glassBackgroundDark
|
||||
: AppColors.glassBackground)).withValues(alpha: opacity),
|
||||
(backgroundColor ?? (isDarkMode
|
||||
? AppColors.glassSurfaceDark
|
||||
: AppColors.glassSurface)).withValues(alpha: opacity * 0.8),
|
||||
(backgroundColor ??
|
||||
(isDarkMode
|
||||
? AppColors.glassBackgroundDark
|
||||
: AppColors.glassBackground))
|
||||
.withValues(alpha: opacity),
|
||||
(backgroundColor ??
|
||||
(isDarkMode
|
||||
? AppColors.glassSurfaceDark
|
||||
: AppColors.glassSurface))
|
||||
.withValues(alpha: opacity * 0.8),
|
||||
],
|
||||
),
|
||||
border: Border(
|
||||
@@ -77,26 +82,29 @@ class GlassmorphicAppBar extends StatelessWidget implements PreferredSizeWidget
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Flexible(
|
||||
child: SizedBox(
|
||||
height: kToolbarHeight,
|
||||
child: NavigationToolbar(
|
||||
leading: leading ?? (automaticallyImplyLeading && (canPop || onBackPressed != null)
|
||||
? _buildBackButton(context)
|
||||
: null),
|
||||
middle: _buildTitle(context),
|
||||
trailing: actions != null
|
||||
? Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: actions!,
|
||||
)
|
||||
: null,
|
||||
centerMiddle: centerTitle,
|
||||
middleSpacing: titleSpacing ?? NavigationToolbar.kMiddleSpacing,
|
||||
Flexible(
|
||||
child: SizedBox(
|
||||
height: kToolbarHeight,
|
||||
child: NavigationToolbar(
|
||||
leading: leading ??
|
||||
(automaticallyImplyLeading &&
|
||||
(canPop || onBackPressed != null)
|
||||
? _buildBackButton(context)
|
||||
: null),
|
||||
middle: _buildTitle(context),
|
||||
trailing: actions != null
|
||||
? Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: actions!,
|
||||
)
|
||||
: null,
|
||||
centerMiddle: centerTitle,
|
||||
middleSpacing:
|
||||
titleSpacing ?? NavigationToolbar.kMiddleSpacing,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (bottom != null) bottom!,
|
||||
if (bottom != null) bottom!,
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -109,10 +117,11 @@ class GlassmorphicAppBar extends StatelessWidget implements PreferredSizeWidget
|
||||
Widget _buildBackButton(BuildContext context) {
|
||||
return IconButton(
|
||||
icon: const Icon(Icons.arrow_back_ios_new_rounded),
|
||||
onPressed: onBackPressed ?? () {
|
||||
HapticFeedback.lightImpact();
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
onPressed: onBackPressed ??
|
||||
() {
|
||||
HapticFeedback.lightImpact();
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
splashRadius: 24,
|
||||
tooltip: AppLocalizations.of(context).back,
|
||||
color: ThemedText.getContrastColor(context),
|
||||
@@ -214,23 +223,26 @@ class GlassmorphicSliverAppBar extends StatelessWidget {
|
||||
backgroundColor: Colors.transparent,
|
||||
elevation: 0,
|
||||
automaticallyImplyLeading: false,
|
||||
leading: leading ?? (automaticallyImplyLeading && (canPop || onBackPressed != null)
|
||||
? IconButton(
|
||||
icon: const Icon(Icons.arrow_back_ios_new_rounded),
|
||||
onPressed: onBackPressed ?? () {
|
||||
HapticFeedback.lightImpact();
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
splashRadius: 24,
|
||||
tooltip: AppLocalizations.of(context).back,
|
||||
)
|
||||
: null),
|
||||
leading: leading ??
|
||||
(automaticallyImplyLeading && (canPop || onBackPressed != null)
|
||||
? IconButton(
|
||||
icon: const Icon(Icons.arrow_back_ios_new_rounded),
|
||||
onPressed: onBackPressed ??
|
||||
() {
|
||||
HapticFeedback.lightImpact();
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
splashRadius: 24,
|
||||
tooltip: AppLocalizations.of(context).back,
|
||||
)
|
||||
: null),
|
||||
actions: actions,
|
||||
centerTitle: centerTitle,
|
||||
flexibleSpace: LayoutBuilder(
|
||||
builder: (BuildContext context, BoxConstraints constraints) {
|
||||
final top = constraints.biggest.height;
|
||||
final isCollapsed = top <= kToolbarHeight + MediaQuery.of(context).padding.top;
|
||||
final isCollapsed =
|
||||
top <= kToolbarHeight + MediaQuery.of(context).padding.top;
|
||||
|
||||
return FlexibleSpaceBar(
|
||||
title: isCollapsed
|
||||
@@ -244,7 +256,8 @@ class GlassmorphicSliverAppBar extends StatelessWidget {
|
||||
)
|
||||
: null,
|
||||
centerTitle: centerTitle,
|
||||
titlePadding: const EdgeInsets.only(left: 16, bottom: 16, right: 16),
|
||||
titlePadding:
|
||||
const EdgeInsets.only(left: 16, bottom: 16, right: 16),
|
||||
background: Stack(
|
||||
fit: StackFit.expand,
|
||||
children: [
|
||||
@@ -259,11 +272,13 @@ class GlassmorphicSliverAppBar extends StatelessWidget {
|
||||
end: Alignment.bottomRight,
|
||||
colors: [
|
||||
(isDarkMode
|
||||
? AppColors.glassBackgroundDark
|
||||
: AppColors.glassBackground).withValues(alpha: opacity),
|
||||
? AppColors.glassBackgroundDark
|
||||
: AppColors.glassBackground)
|
||||
.withValues(alpha: opacity),
|
||||
(isDarkMode
|
||||
? AppColors.glassSurfaceDark
|
||||
: AppColors.glassSurface).withValues(alpha: opacity * 0.8),
|
||||
? AppColors.glassSurfaceDark
|
||||
: AppColors.glassSurface)
|
||||
.withValues(alpha: opacity * 0.8),
|
||||
],
|
||||
),
|
||||
border: Border(
|
||||
|
||||
@@ -80,11 +80,14 @@ class _GlassmorphicScaffoldState extends State<GlassmorphicScaffold>
|
||||
final currentScroll = _scrollController!.position.pixels;
|
||||
|
||||
// 스크롤 방향에 따라 플로팅 네비게이션 바 표시/숨김
|
||||
if (currentScroll > 50 && _scrollController!.position.userScrollDirection == ScrollDirection.reverse) {
|
||||
if (currentScroll > 50 &&
|
||||
_scrollController!.position.userScrollDirection ==
|
||||
ScrollDirection.reverse) {
|
||||
if (_isFloatingNavBarVisible) {
|
||||
setState(() => _isFloatingNavBarVisible = false);
|
||||
}
|
||||
} else if (_scrollController!.position.userScrollDirection == ScrollDirection.forward) {
|
||||
} else if (_scrollController!.position.userScrollDirection ==
|
||||
ScrollDirection.forward) {
|
||||
if (!_isFloatingNavBarVisible) {
|
||||
setState(() => _isFloatingNavBarVisible = true);
|
||||
}
|
||||
@@ -159,7 +162,9 @@ class _GlassmorphicScaffoldState extends State<GlassmorphicScaffold>
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
colors: gradientColors.map((color) => color.withOpacity(0.3)).toList(),
|
||||
colors: gradientColors
|
||||
.map((color) => color.withOpacity(0.3))
|
||||
.toList(),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -273,8 +278,10 @@ class WavePainter extends CustomPainter {
|
||||
path.moveTo(0, size.height);
|
||||
|
||||
for (double x = 0; x <= size.width; x++) {
|
||||
final y = math.sin((x / size.width * 2 * math.pi) + (progress * 2 * math.pi)) * 20 +
|
||||
size.height * 0.5;
|
||||
final y =
|
||||
math.sin((x / size.width * 2 * math.pi) + (progress * 2 * math.pi)) *
|
||||
20 +
|
||||
size.height * 0.5;
|
||||
path.lineTo(x, y);
|
||||
}
|
||||
|
||||
|
||||
@@ -56,28 +56,32 @@ class GlassmorphismCard extends StatelessWidget {
|
||||
padding: padding,
|
||||
decoration: BoxDecoration(
|
||||
color: backgroundColor ?? AppColors.glassCard,
|
||||
gradient: gradient ?? LinearGradient(
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
colors: isDarkMode
|
||||
? AppColors.glassGradientDark
|
||||
: AppColors.glassGradient,
|
||||
),
|
||||
gradient: gradient ??
|
||||
LinearGradient(
|
||||
begin: Alignment.topLeft,
|
||||
end: Alignment.bottomRight,
|
||||
colors: isDarkMode
|
||||
? AppColors.glassGradientDark
|
||||
: AppColors.glassGradient,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(borderRadius),
|
||||
border: border ?? Border.all(
|
||||
color: isDarkMode
|
||||
? AppColors.primaryColor.withValues(alpha: 0.3)
|
||||
: AppColors.glassBorder,
|
||||
width: 1,
|
||||
),
|
||||
boxShadow: boxShadow ?? [
|
||||
BoxShadow(
|
||||
color: AppColors.shadowBlack, // color.md 가이드: rgba(0,0,0,0.08)
|
||||
blurRadius: 20,
|
||||
spreadRadius: -5,
|
||||
offset: const Offset(0, 10),
|
||||
),
|
||||
],
|
||||
border: border ??
|
||||
Border.all(
|
||||
color: isDarkMode
|
||||
? AppColors.primaryColor.withValues(alpha: 0.3)
|
||||
: AppColors.glassBorder,
|
||||
width: 1,
|
||||
),
|
||||
boxShadow: boxShadow ??
|
||||
[
|
||||
BoxShadow(
|
||||
color: AppColors
|
||||
.shadowBlack, // color.md 가이드: rgba(0,0,0,0.08)
|
||||
blurRadius: 20,
|
||||
spreadRadius: -5,
|
||||
offset: const Offset(0, 10),
|
||||
),
|
||||
],
|
||||
),
|
||||
child: GlassmorphicIndicator(
|
||||
child: child,
|
||||
@@ -119,7 +123,8 @@ class AnimatedGlassmorphismCard extends StatefulWidget {
|
||||
});
|
||||
|
||||
@override
|
||||
State<AnimatedGlassmorphismCard> createState() => _AnimatedGlassmorphismCardState();
|
||||
State<AnimatedGlassmorphismCard> createState() =>
|
||||
_AnimatedGlassmorphismCardState();
|
||||
}
|
||||
|
||||
class _AnimatedGlassmorphismCardState extends State<AnimatedGlassmorphismCard>
|
||||
|
||||
@@ -52,8 +52,10 @@ class HomeContent extends StatelessWidget {
|
||||
}
|
||||
|
||||
// 카테고리별 구독 구분
|
||||
final categoryProvider = Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categorizedSubscriptions = SubscriptionCategoryHelper.categorizeSubscriptions(
|
||||
final categoryProvider =
|
||||
Provider.of<CategoryProvider>(context, listen: false);
|
||||
final categorizedSubscriptions =
|
||||
SubscriptionCategoryHelper.categorizeSubscriptions(
|
||||
provider.subscriptions,
|
||||
categoryProvider,
|
||||
context,
|
||||
@@ -107,8 +109,8 @@ class HomeContent extends StatelessWidget {
|
||||
child: Text(
|
||||
AppLocalizations.of(context).mySubscriptions,
|
||||
style: Theme.of(context).textTheme.titleLarge?.copyWith(
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
color: AppColors.darkNavy,
|
||||
),
|
||||
),
|
||||
),
|
||||
SlideTransition(
|
||||
@@ -120,7 +122,8 @@ class HomeContent extends StatelessWidget {
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).subscriptionCount(provider.subscriptions.length),
|
||||
AppLocalizations.of(context)
|
||||
.subscriptionCount(provider.subscriptions.length),
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
|
||||
@@ -88,7 +88,8 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).monthlyTotalSubscriptionCost,
|
||||
AppLocalizations.of(context)
|
||||
.monthlyTotalSubscriptionCost,
|
||||
style: TextStyle(
|
||||
color: AppColors
|
||||
.darkNavy, // color.md 가이드: 밝은 배경 위 어두운 텍스트
|
||||
@@ -99,9 +100,12 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
// 환율 정보 표시 (영어 사용자는 표시 안함)
|
||||
if (locale != 'en')
|
||||
FutureBuilder<String>(
|
||||
future: CurrencyUtil.getExchangeRateInfoForLocale(locale),
|
||||
future:
|
||||
CurrencyUtil.getExchangeRateInfoForLocale(
|
||||
locale),
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData && snapshot.data!.isNotEmpty) {
|
||||
if (snapshot.hasData &&
|
||||
snapshot.data!.isNotEmpty) {
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
@@ -116,7 +120,9 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context).exchangeRateDisplay.replaceAll('@', snapshot.data!),
|
||||
AppLocalizations.of(context)
|
||||
.exchangeRateDisplay
|
||||
.replaceAll('@', snapshot.data!),
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
@@ -133,7 +139,8 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
const SizedBox(height: 8),
|
||||
// 월별 총 비용 표시 (언어별 기본 통화)
|
||||
FutureBuilder<double>(
|
||||
future: CurrencyUtil.calculateTotalMonthlyExpenseInDefaultCurrency(
|
||||
future: CurrencyUtil
|
||||
.calculateTotalMonthlyExpenseInDefaultCurrency(
|
||||
provider.subscriptions,
|
||||
locale,
|
||||
),
|
||||
@@ -142,7 +149,10 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
return const CircularProgressIndicator();
|
||||
}
|
||||
final monthlyCost = snapshot.data!;
|
||||
final decimals = (defaultCurrency == 'KRW' || defaultCurrency == 'JPY') ? 0 : 2;
|
||||
final decimals = (defaultCurrency == 'KRW' ||
|
||||
defaultCurrency == 'JPY')
|
||||
? 0
|
||||
: 2;
|
||||
|
||||
return Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.baseline,
|
||||
@@ -150,9 +160,13 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
children: [
|
||||
Text(
|
||||
NumberFormat.currency(
|
||||
locale: defaultCurrency == 'KRW' ? 'ko_KR' :
|
||||
defaultCurrency == 'JPY' ? 'ja_JP' :
|
||||
defaultCurrency == 'CNY' ? 'zh_CN' : 'en_US',
|
||||
locale: defaultCurrency == 'KRW'
|
||||
? 'ko_KR'
|
||||
: defaultCurrency == 'JPY'
|
||||
? 'ja_JP'
|
||||
: defaultCurrency == 'CNY'
|
||||
? 'zh_CN'
|
||||
: 'en_US',
|
||||
symbol: '',
|
||||
decimalDigits: decimals,
|
||||
).format(monthlyCost),
|
||||
@@ -179,7 +193,8 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
const SizedBox(height: 16),
|
||||
// 연간 비용 및 총 구독 수 표시
|
||||
FutureBuilder<double>(
|
||||
future: CurrencyUtil.calculateTotalMonthlyExpenseInDefaultCurrency(
|
||||
future: CurrencyUtil
|
||||
.calculateTotalMonthlyExpenseInDefaultCurrency(
|
||||
provider.subscriptions,
|
||||
locale,
|
||||
),
|
||||
@@ -189,17 +204,25 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
}
|
||||
final monthlyCost = snapshot.data!;
|
||||
final yearlyCost = monthlyCost * 12;
|
||||
final decimals = (defaultCurrency == 'KRW' || defaultCurrency == 'JPY') ? 0 : 2;
|
||||
final decimals = (defaultCurrency == 'KRW' ||
|
||||
defaultCurrency == 'JPY')
|
||||
? 0
|
||||
: 2;
|
||||
|
||||
return Row(
|
||||
children: [
|
||||
_buildInfoBox(
|
||||
context,
|
||||
title: AppLocalizations.of(context).estimatedAnnualCost,
|
||||
title: AppLocalizations.of(context)
|
||||
.estimatedAnnualCost,
|
||||
value: '${NumberFormat.currency(
|
||||
locale: defaultCurrency == 'KRW' ? 'ko_KR' :
|
||||
defaultCurrency == 'JPY' ? 'ja_JP' :
|
||||
defaultCurrency == 'CNY' ? 'zh_CN' : 'en_US',
|
||||
locale: defaultCurrency == 'KRW'
|
||||
? 'ko_KR'
|
||||
: defaultCurrency == 'JPY'
|
||||
? 'ja_JP'
|
||||
: defaultCurrency == 'CNY'
|
||||
? 'zh_CN'
|
||||
: 'en_US',
|
||||
symbol: currencySymbol,
|
||||
decimalDigits: decimals,
|
||||
).format(yearlyCost)}',
|
||||
@@ -207,8 +230,10 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
const SizedBox(width: 16),
|
||||
_buildInfoBox(
|
||||
context,
|
||||
title: AppLocalizations.of(context).totalSubscriptionServices,
|
||||
value: '$totalSubscriptions${AppLocalizations.of(context).servicesUnit}',
|
||||
title: AppLocalizations.of(context)
|
||||
.totalSubscriptionServices,
|
||||
value:
|
||||
'$totalSubscriptions${AppLocalizations.of(context).servicesUnit}',
|
||||
),
|
||||
],
|
||||
);
|
||||
@@ -255,7 +280,8 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
AppLocalizations.of(context).eventDiscountActive,
|
||||
AppLocalizations.of(context)
|
||||
.eventDiscountActive,
|
||||
style: TextStyle(
|
||||
color: AppColors
|
||||
.darkNavy, // color.md 가이드: 밝은 배경 위 어두운 텍스트
|
||||
@@ -266,7 +292,8 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
const SizedBox(height: 2),
|
||||
// 이벤트 절약액 표시 (언어별 기본 통화)
|
||||
FutureBuilder<double>(
|
||||
future: CurrencyUtil.calculateTotalEventSavingsInDefaultCurrency(
|
||||
future: CurrencyUtil
|
||||
.calculateTotalEventSavingsInDefaultCurrency(
|
||||
provider.subscriptions,
|
||||
locale,
|
||||
),
|
||||
@@ -275,15 +302,24 @@ class MainScreenSummaryCard extends StatelessWidget {
|
||||
return const SizedBox();
|
||||
}
|
||||
final eventSavings = snapshot.data!;
|
||||
final decimals = (defaultCurrency == 'KRW' || defaultCurrency == 'JPY') ? 0 : 2;
|
||||
final decimals =
|
||||
(defaultCurrency == 'KRW' ||
|
||||
defaultCurrency == 'JPY')
|
||||
? 0
|
||||
: 2;
|
||||
|
||||
return Row(
|
||||
children: [
|
||||
Text(
|
||||
NumberFormat.currency(
|
||||
locale: defaultCurrency == 'KRW' ? 'ko_KR' :
|
||||
defaultCurrency == 'JPY' ? 'ja_JP' :
|
||||
defaultCurrency == 'CNY' ? 'zh_CN' : 'en_US',
|
||||
locale: defaultCurrency == 'KRW'
|
||||
? 'ko_KR'
|
||||
: defaultCurrency == 'JPY'
|
||||
? 'ja_JP'
|
||||
: defaultCurrency ==
|
||||
'CNY'
|
||||
? 'zh_CN'
|
||||
: 'en_US',
|
||||
symbol: currencySymbol,
|
||||
decimalDigits: decimals,
|
||||
).format(eventSavings),
|
||||
|
||||
@@ -44,7 +44,7 @@ class _NativeAdWidgetState extends State<NativeAdWidget> {
|
||||
}
|
||||
|
||||
_nativeAd = NativeAd(
|
||||
adUnitId: _testAdUnitId(), // 실제 배포 시 교체 필요
|
||||
adUnitId: _testAdUnitId(), // 실제 광고 단위 ID
|
||||
factoryId: 'listTile', // Android/iOS 모두 동일하게 맞춰야 함
|
||||
request: const AdRequest(),
|
||||
listener: NativeAdListener(
|
||||
@@ -63,15 +63,15 @@ class _NativeAdWidgetState extends State<NativeAdWidget> {
|
||||
)..load();
|
||||
}
|
||||
|
||||
/// 테스트 광고 단위 ID 반환 함수
|
||||
/// 광고 단위 ID 반환 함수
|
||||
/// Theme.of(context)를 사용하지 않고 Platform 클래스 직접 사용
|
||||
String _testAdUnitId() {
|
||||
if (Platform.isAndroid) {
|
||||
// Android 테스트 네이티브 광고 ID
|
||||
return 'ca-app-pub-3940256099942544/2247696110';
|
||||
// Android 네이티브 광고 ID
|
||||
return 'ca-app-pub-6691216385521068/4512709971';
|
||||
} else if (Platform.isIOS) {
|
||||
// iOS 테스트 네이티브 광고 ID
|
||||
return 'ca-app-pub-3940256099942544/3986624511';
|
||||
// iOS 네이티브 광고 ID
|
||||
return 'ca-app-pub-6691216385521068/4512709971';
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -30,25 +30,25 @@ class SkeletonLoading extends StatelessWidget {
|
||||
blur: 10,
|
||||
opacity: 0.1,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Container(
|
||||
width: 100,
|
||||
height: 24,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.grey[300],
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Container(
|
||||
width: 100,
|
||||
height: 24,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.grey[300],
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
_buildSkeletonColumn(),
|
||||
_buildSkeletonColumn(),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
_buildSkeletonColumn(),
|
||||
_buildSkeletonColumn(),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// 구독 목록 스켈레톤
|
||||
|
||||
@@ -43,7 +43,8 @@ class _SubscriptionCardWidgetState extends State<SubscriptionCardWidget> {
|
||||
void initState() {
|
||||
super.initState();
|
||||
// URL 필드 자동 설정
|
||||
if (widget.websiteUrlController.text.isEmpty && widget.subscription.websiteUrl != null) {
|
||||
if (widget.websiteUrlController.text.isEmpty &&
|
||||
widget.subscription.websiteUrl != null) {
|
||||
widget.websiteUrlController.text = widget.subscription.websiteUrl!;
|
||||
}
|
||||
}
|
||||
@@ -256,7 +257,8 @@ class _SubscriptionCardWidgetState extends State<SubscriptionCardWidget> {
|
||||
const SizedBox(height: 8),
|
||||
CategorySelector(
|
||||
categories: categoryProvider.categories,
|
||||
selectedCategoryId: widget.selectedCategoryId ?? widget.subscription.category,
|
||||
selectedCategoryId:
|
||||
widget.selectedCategoryId ?? widget.subscription.category,
|
||||
onChanged: widget.onCategoryChanged,
|
||||
baseColor: _getCategoryColor(categoryProvider),
|
||||
isGlassmorphism: true,
|
||||
@@ -304,7 +306,8 @@ class _SubscriptionCardWidgetState extends State<SubscriptionCardWidget> {
|
||||
}
|
||||
|
||||
Color? _getCategoryColor(CategoryProvider categoryProvider) {
|
||||
final categoryId = widget.selectedCategoryId ?? widget.subscription.category;
|
||||
final categoryId =
|
||||
widget.selectedCategoryId ?? widget.subscription.category;
|
||||
if (categoryId == null) return null;
|
||||
|
||||
final category = categoryProvider.getCategoryById(categoryId);
|
||||
|
||||
@@ -325,8 +325,8 @@ class _RippleAnimationState extends State<RippleAnimation>
|
||||
height: 100 + 200 * _animation.value,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: widget.rippleColor.withValues(alpha:
|
||||
(1 - _animation.value) * 0.3,
|
||||
color: widget.rippleColor.withValues(
|
||||
alpha: (1 - _animation.value) * 0.3,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -60,7 +60,6 @@ class _SubscriptionCardState extends State<SubscriptionCard>
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@override
|
||||
void didUpdateWidget(SubscriptionCard oldWidget) {
|
||||
super.didUpdateWidget(oldWidget);
|
||||
@@ -203,7 +202,8 @@ class _SubscriptionCardState extends State<SubscriptionCard>
|
||||
daysUntilNext = 7; // 다음 주 같은 요일
|
||||
}
|
||||
|
||||
if (daysUntilNext == 0) return AppLocalizations.of(context).paymentDueToday;
|
||||
if (daysUntilNext == 0)
|
||||
return AppLocalizations.of(context).paymentDueToday;
|
||||
return AppLocalizations.of(context).paymentDueInDays(daysUntilNext);
|
||||
}
|
||||
|
||||
@@ -234,15 +234,15 @@ class _SubscriptionCardState extends State<SubscriptionCard>
|
||||
}
|
||||
|
||||
final categoryProvider = context.watch<CategoryProvider>();
|
||||
final category = categoryProvider.getCategoryById(widget.subscription.categoryId!);
|
||||
final category =
|
||||
categoryProvider.getCategoryById(widget.subscription.categoryId!);
|
||||
|
||||
if (category == null) {
|
||||
return AppColors.blueGradient;
|
||||
}
|
||||
|
||||
final categoryColor = Color(
|
||||
int.parse(category.color.replaceAll('#', '0xFF'))
|
||||
);
|
||||
final categoryColor =
|
||||
Color(int.parse(category.color.replaceAll('#', '0xFF')));
|
||||
|
||||
return [
|
||||
categoryColor,
|
||||
@@ -300,11 +300,13 @@ class _SubscriptionCardState extends State<SubscriptionCard>
|
||||
padding: EdgeInsets.zero,
|
||||
borderRadius: 16,
|
||||
blur: _isHovering ? 15 : 10,
|
||||
width: double.infinity, // 전체 너비를 차지하도록 설정
|
||||
onTap: widget.onTap ?? () async {
|
||||
print('[SubscriptionCard] AnimatedGlassmorphismCard onTap 호출됨 - ${widget.subscription.serviceName}');
|
||||
await AppNavigator.toDetail(context, widget.subscription);
|
||||
},
|
||||
width: double.infinity, // 전체 너비를 차지하도록 설정
|
||||
onTap: widget.onTap ??
|
||||
() async {
|
||||
print(
|
||||
'[SubscriptionCard] AnimatedGlassmorphismCard onTap 호출됨 - ${widget.subscription.serviceName}');
|
||||
await AppNavigator.toDetail(context, widget.subscription);
|
||||
},
|
||||
child: Column(
|
||||
children: [
|
||||
// 그라데이션 상단 바 효과
|
||||
@@ -330,281 +332,290 @@ class _SubscriptionCardState extends State<SubscriptionCard>
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
// 서비스 아이콘
|
||||
WebsiteIcon(
|
||||
key: ValueKey(
|
||||
'subscription_icon_${widget.subscription.id}'),
|
||||
url: widget.subscription.websiteUrl,
|
||||
serviceName: widget.subscription.serviceName,
|
||||
size: 48,
|
||||
isHovered: _isHovering,
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
|
||||
// 서비스 정보
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
// 서비스 아이콘
|
||||
WebsiteIcon(
|
||||
key: ValueKey(
|
||||
'subscription_icon_${widget.subscription.id}'),
|
||||
url: widget.subscription.websiteUrl,
|
||||
serviceName: widget.subscription.serviceName,
|
||||
size: 48,
|
||||
isHovered: _isHovering,
|
||||
// 서비스명
|
||||
Flexible(
|
||||
child: Text(
|
||||
_displayName ??
|
||||
widget.subscription.serviceName,
|
||||
style: const TextStyle(
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 18,
|
||||
color: AppColors
|
||||
.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
|
||||
// 서비스 정보
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
// 서비스명
|
||||
Flexible(
|
||||
child: Text(
|
||||
_displayName ?? widget.subscription.serviceName,
|
||||
style: const TextStyle(
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 18,
|
||||
color: AppColors.darkNavy, // color.md 가이드: 메인 텍스트
|
||||
),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
|
||||
// 배지들
|
||||
Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// 이벤트 배지
|
||||
if (widget.subscription.isCurrentlyInEvent) ...[
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 3,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
gradient: const LinearGradient(
|
||||
colors: [
|
||||
Color(0xFFFF6B6B),
|
||||
Color(0xFFFF8787),
|
||||
],
|
||||
),
|
||||
borderRadius:
|
||||
BorderRadius.circular(12),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(
|
||||
Icons.local_offer_rounded,
|
||||
size: 11,
|
||||
color: AppColors.pureWhite,
|
||||
),
|
||||
const SizedBox(width: 3),
|
||||
Text(
|
||||
AppLocalizations.of(context).event,
|
||||
style: const TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.pureWhite,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
],
|
||||
|
||||
// 결제 주기 배지
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 3,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.surfaceColorAlt,
|
||||
borderRadius:
|
||||
BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: AppColors.borderColor,
|
||||
width: 0.5,
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context).getBillingCycleName(widget.subscription.billingCycle),
|
||||
style: const TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
),
|
||||
),
|
||||
),
|
||||
// 배지들
|
||||
Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// 이벤트 배지
|
||||
if (widget
|
||||
.subscription.isCurrentlyInEvent) ...[
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 3,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
gradient: const LinearGradient(
|
||||
colors: [
|
||||
Color(0xFFFF6B6B),
|
||||
Color(0xFFFF8787),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
const SizedBox(height: 6),
|
||||
|
||||
// 가격 정보
|
||||
Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
// 가격 표시 (이벤트 가격 반영)
|
||||
// 가격 표시 (언어별 통화)
|
||||
FutureBuilder<String>(
|
||||
future: _getFormattedPrice(),
|
||||
builder: (context, snapshot) {
|
||||
if (!snapshot.hasData) {
|
||||
return const SizedBox();
|
||||
}
|
||||
|
||||
if (widget.subscription.isCurrentlyInEvent && snapshot.data!.contains('|')) {
|
||||
final prices = snapshot.data!.split('|');
|
||||
return Row(
|
||||
children: [
|
||||
Text(
|
||||
prices[0],
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: AppColors.navyGray,
|
||||
decoration: TextDecoration.lineThrough,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
prices[1],
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: Color(0xFFFF6B6B),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
} else {
|
||||
return Text(
|
||||
snapshot.data!,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: widget.subscription.isCurrentlyInEvent
|
||||
? const Color(0xFFFF6B6B)
|
||||
: AppColors.primaryColor,
|
||||
),
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
|
||||
// 결제 예정일 정보
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 3,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: isNearBilling
|
||||
? AppColors.warningColor
|
||||
.withValues(alpha: 0.1)
|
||||
: AppColors.successColor
|
||||
.withValues(alpha: 0.1),
|
||||
borderRadius:
|
||||
BorderRadius.circular(12),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
isNearBilling
|
||||
? Icons
|
||||
.access_time_filled_rounded
|
||||
: Icons
|
||||
.check_circle_rounded,
|
||||
size: 12,
|
||||
color: isNearBilling
|
||||
? AppColors.warningColor
|
||||
: AppColors.successColor,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
_getNextBillingText(),
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: isNearBilling
|
||||
? AppColors.warningColor
|
||||
: AppColors.successColor,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
// 이벤트 절약액 표시
|
||||
if (widget.subscription.isCurrentlyInEvent &&
|
||||
widget.subscription.eventSavings > 0) ...[
|
||||
const SizedBox(height: 4),
|
||||
Row(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 6,
|
||||
vertical: 2,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFFF6B6B).withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(
|
||||
Icons.savings_rounded,
|
||||
size: 14,
|
||||
color: Color(0xFFFF6B6B),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
// 이벤트 절약액 표시 (언어별 통화)
|
||||
FutureBuilder<String>(
|
||||
future: CurrencyUtil.formatEventSavingsWithLocale(
|
||||
widget.subscription,
|
||||
localeProvider.locale.languageCode,
|
||||
),
|
||||
builder: (context, snapshot) {
|
||||
if (!snapshot.hasData) {
|
||||
return const SizedBox();
|
||||
}
|
||||
return Text(
|
||||
'${snapshot.data!} ${AppLocalizations.of(context).saving}',
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Color(0xFFFF6B6B),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
const Icon(
|
||||
Icons.local_offer_rounded,
|
||||
size: 11,
|
||||
color: AppColors.pureWhite,
|
||||
),
|
||||
const SizedBox(width: 3),
|
||||
Text(
|
||||
AppLocalizations.of(context).event,
|
||||
style: const TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.pureWhite,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
// 이벤트 종료일까지 남은 일수
|
||||
if (widget.subscription.eventEndDate != null) ...[
|
||||
Text(
|
||||
AppLocalizations.of(context).daysRemaining(widget.subscription.eventEndDate!.difference(DateTime.now()).inDays),
|
||||
style: const TextStyle(
|
||||
fontSize: 11,
|
||||
color: AppColors.navyGray, // color.md 가이드: 서브 텍스트
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(width: 6),
|
||||
],
|
||||
|
||||
// 결제 주기 배지
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 3,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.surfaceColorAlt,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: AppColors.borderColor,
|
||||
width: 0.5,
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context)
|
||||
.getBillingCycleName(
|
||||
widget.subscription.billingCycle),
|
||||
style: const TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors
|
||||
.navyGray, // color.md 가이드: 서브 텍스트
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
const SizedBox(height: 6),
|
||||
|
||||
// 가격 정보
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
// 가격 표시 (이벤트 가격 반영)
|
||||
// 가격 표시 (언어별 통화)
|
||||
FutureBuilder<String>(
|
||||
future: _getFormattedPrice(),
|
||||
builder: (context, snapshot) {
|
||||
if (!snapshot.hasData) {
|
||||
return const SizedBox();
|
||||
}
|
||||
|
||||
if (widget.subscription.isCurrentlyInEvent &&
|
||||
snapshot.data!.contains('|')) {
|
||||
final prices = snapshot.data!.split('|');
|
||||
return Row(
|
||||
children: [
|
||||
Text(
|
||||
prices[0],
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: AppColors.navyGray,
|
||||
decoration:
|
||||
TextDecoration.lineThrough,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Text(
|
||||
prices[1],
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: Color(0xFFFF6B6B),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
} else {
|
||||
return Text(
|
||||
snapshot.data!,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: widget
|
||||
.subscription.isCurrentlyInEvent
|
||||
? const Color(0xFFFF6B6B)
|
||||
: AppColors.primaryColor,
|
||||
),
|
||||
);
|
||||
}
|
||||
},
|
||||
),
|
||||
|
||||
// 결제 예정일 정보
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 3,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: isNearBilling
|
||||
? AppColors.warningColor
|
||||
.withValues(alpha: 0.1)
|
||||
: AppColors.successColor
|
||||
.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
isNearBilling
|
||||
? Icons.access_time_filled_rounded
|
||||
: Icons.check_circle_rounded,
|
||||
size: 12,
|
||||
color: isNearBilling
|
||||
? AppColors.warningColor
|
||||
: AppColors.successColor,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
_getNextBillingText(),
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: isNearBilling
|
||||
? AppColors.warningColor
|
||||
: AppColors.successColor,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
// 이벤트 절약액 표시
|
||||
if (widget.subscription.isCurrentlyInEvent &&
|
||||
widget.subscription.eventSavings > 0) ...[
|
||||
const SizedBox(height: 4),
|
||||
Row(
|
||||
children: [
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 6,
|
||||
vertical: 2,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFFF6B6B)
|
||||
.withValues(alpha: 0.1),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(
|
||||
Icons.savings_rounded,
|
||||
size: 14,
|
||||
color: Color(0xFFFF6B6B),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
// 이벤트 절약액 표시 (언어별 통화)
|
||||
FutureBuilder<String>(
|
||||
future: CurrencyUtil
|
||||
.formatEventSavingsWithLocale(
|
||||
widget.subscription,
|
||||
localeProvider.locale.languageCode,
|
||||
),
|
||||
builder: (context, snapshot) {
|
||||
if (!snapshot.hasData) {
|
||||
return const SizedBox();
|
||||
}
|
||||
return Text(
|
||||
'${snapshot.data!} ${AppLocalizations.of(context).saving}',
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Color(0xFFFF6B6B),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
// 이벤트 종료일까지 남은 일수
|
||||
if (widget.subscription.eventEndDate !=
|
||||
null) ...[
|
||||
Text(
|
||||
AppLocalizations.of(context).daysRemaining(
|
||||
widget.subscription.eventEndDate!
|
||||
.difference(DateTime.now())
|
||||
.inDays),
|
||||
style: const TextStyle(
|
||||
fontSize: 11,
|
||||
color: AppColors
|
||||
.navyGray, // color.md 가이드: 서브 텍스트
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
@@ -46,12 +46,17 @@ class SubscriptionListWidget extends StatelessWidget {
|
||||
child: Consumer<CategoryProvider>(
|
||||
builder: (context, categoryProvider, child) {
|
||||
return CategoryHeaderWidget(
|
||||
categoryName: categoryProvider.getLocalizedCategoryName(context, category),
|
||||
categoryName: categoryProvider.getLocalizedCategoryName(
|
||||
context, category),
|
||||
subscriptionCount: subscriptions.length,
|
||||
totalCostUSD: _calculateTotalByCurrency(subscriptions, 'USD'),
|
||||
totalCostKRW: _calculateTotalByCurrency(subscriptions, 'KRW'),
|
||||
totalCostJPY: _calculateTotalByCurrency(subscriptions, 'JPY'),
|
||||
totalCostCNY: _calculateTotalByCurrency(subscriptions, 'CNY'),
|
||||
totalCostUSD:
|
||||
_calculateTotalByCurrency(subscriptions, 'USD'),
|
||||
totalCostKRW:
|
||||
_calculateTotalByCurrency(subscriptions, 'KRW'),
|
||||
totalCostJPY:
|
||||
_calculateTotalByCurrency(subscriptions, 'JPY'),
|
||||
totalCostCNY:
|
||||
_calculateTotalByCurrency(subscriptions, 'CNY'),
|
||||
);
|
||||
},
|
||||
),
|
||||
@@ -95,30 +100,38 @@ class SubscriptionListWidget extends StatelessWidget {
|
||||
child: SwipeableSubscriptionCard(
|
||||
subscription: subscriptions[subIndex],
|
||||
onTap: () {
|
||||
print('[SubscriptionListWidget] SwipeableSubscriptionCard onTap 호출됨');
|
||||
AppNavigator.toDetail(context, subscriptions[subIndex]);
|
||||
print(
|
||||
'[SubscriptionListWidget] SwipeableSubscriptionCard onTap 호출됨');
|
||||
AppNavigator.toDetail(
|
||||
context, subscriptions[subIndex]);
|
||||
},
|
||||
onDelete: () async {
|
||||
// 현재 로케일에 맞는 서비스명 가져오기
|
||||
final localeProvider = Provider.of<LocaleProvider>(
|
||||
final localeProvider =
|
||||
Provider.of<LocaleProvider>(
|
||||
context,
|
||||
listen: false,
|
||||
);
|
||||
final locale = localeProvider.locale.languageCode;
|
||||
final displayName = await SubscriptionUrlMatcher.getServiceDisplayName(
|
||||
serviceName: subscriptions[subIndex].serviceName,
|
||||
final locale =
|
||||
localeProvider.locale.languageCode;
|
||||
final displayName = await SubscriptionUrlMatcher
|
||||
.getServiceDisplayName(
|
||||
serviceName:
|
||||
subscriptions[subIndex].serviceName,
|
||||
locale: locale,
|
||||
);
|
||||
|
||||
// 삭제 확인 다이얼로그 표시
|
||||
final shouldDelete = await DeleteConfirmationDialog.show(
|
||||
final shouldDelete =
|
||||
await DeleteConfirmationDialog.show(
|
||||
context: context,
|
||||
serviceName: displayName,
|
||||
);
|
||||
|
||||
if (shouldDelete && context.mounted) {
|
||||
// 사용자가 확인한 경우에만 삭제 진행
|
||||
final provider = Provider.of<SubscriptionProvider>(
|
||||
final provider =
|
||||
Provider.of<SubscriptionProvider>(
|
||||
context,
|
||||
listen: false,
|
||||
);
|
||||
@@ -129,7 +142,8 @@ class SubscriptionListWidget extends StatelessWidget {
|
||||
if (context.mounted) {
|
||||
AppSnackBar.showError(
|
||||
context: context,
|
||||
message: AppLocalizations.of(context).subscriptionDeleted(displayName),
|
||||
message: AppLocalizations.of(context)
|
||||
.subscriptionDeleted(displayName),
|
||||
icon: Icons.delete_forever_rounded,
|
||||
);
|
||||
}
|
||||
@@ -152,7 +166,8 @@ class SubscriptionListWidget extends StatelessWidget {
|
||||
}
|
||||
|
||||
/// 특정 통화의 총 합계를 계산합니다.
|
||||
double _calculateTotalByCurrency(List<SubscriptionModel> subscriptions, String currency) {
|
||||
double _calculateTotalByCurrency(
|
||||
List<SubscriptionModel> subscriptions, String currency) {
|
||||
return subscriptions
|
||||
.where((sub) => sub.currency == currency)
|
||||
.fold(0.0, (sum, sub) => sum + sub.monthlyCost);
|
||||
|
||||
@@ -258,7 +258,8 @@ class _SwipeableSubscriptionCardState extends State<SwipeableSubscriptionCard>
|
||||
angle: _currentOffset / 2000,
|
||||
child: SubscriptionCard(
|
||||
subscription: widget.subscription,
|
||||
onTap: widget.onTap, // onTap 콜백을 전달하여 SubscriptionCard 내부에서도 탭 처리 가능하도록 함
|
||||
onTap: widget
|
||||
.onTap, // onTap 콜백을 전달하여 SubscriptionCard 내부에서도 탭 처리 가능하도록 함
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -35,7 +35,8 @@ class ThemedText extends StatelessWidget {
|
||||
});
|
||||
|
||||
/// 배경 밝기에 따른 텍스트 색상 결정
|
||||
static Color getContrastColor(BuildContext context, {
|
||||
static Color getContrastColor(
|
||||
BuildContext context, {
|
||||
bool forceLight = false,
|
||||
bool forceDark = false,
|
||||
}) {
|
||||
@@ -46,7 +47,7 @@ class ThemedText extends StatelessWidget {
|
||||
|
||||
// 글래스모피즘 환경에서는 배경이 밝으므로 어두운 텍스트 사용
|
||||
if (_isGlassmorphicContext(context)) {
|
||||
return AppColors.darkNavy; // color.md 가이드: 밝은 배경 위 어두운 텍스트
|
||||
return AppColors.darkNavy; // color.md 가이드: 밝은 배경 위 어두운 텍스트
|
||||
}
|
||||
|
||||
// 일반 환경
|
||||
@@ -58,21 +59,22 @@ class ThemedText extends StatelessWidget {
|
||||
/// 글래스모피즘 컨텍스트인지 확인
|
||||
static bool _isGlassmorphicContext(BuildContext context) {
|
||||
// 부모 위젯 체인에서 글래스모피즘 카드가 있는지 확인
|
||||
final glassmorphic = context.findAncestorWidgetOfExactType<GlassmorphicIndicator>();
|
||||
final glassmorphic =
|
||||
context.findAncestorWidgetOfExactType<GlassmorphicIndicator>();
|
||||
return glassmorphic != null;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final textColor = color ?? getContrastColor(
|
||||
context,
|
||||
forceLight: forceLight,
|
||||
forceDark: forceDark,
|
||||
);
|
||||
final textColor = color ??
|
||||
getContrastColor(
|
||||
context,
|
||||
forceLight: forceLight,
|
||||
forceDark: forceDark,
|
||||
);
|
||||
|
||||
final finalColor = opacity != null
|
||||
? textColor.withValues(alpha: opacity!)
|
||||
: textColor;
|
||||
final finalColor =
|
||||
opacity != null ? textColor.withValues(alpha: opacity!) : textColor;
|
||||
|
||||
final defaultStyle = DefaultTextStyle.of(context).style;
|
||||
|
||||
@@ -204,8 +206,8 @@ class GlassmorphicTextWrapper extends StatelessWidget {
|
||||
return GlassmorphicIndicator(
|
||||
child: DefaultTextStyle(
|
||||
style: DefaultTextStyle.of(context).style.copyWith(
|
||||
color: ThemedText.getContrastColor(context),
|
||||
),
|
||||
color: ThemedText.getContrastColor(context),
|
||||
),
|
||||
child: child,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -104,8 +104,6 @@ class FaviconCache {
|
||||
|
||||
// 구글 파비콘 API 서비스
|
||||
class GoogleFaviconService {
|
||||
|
||||
|
||||
// 구글 파비콘 API URL 생성
|
||||
static String getFaviconUrl(String domain, int size) {
|
||||
final directUrl =
|
||||
@@ -137,7 +135,8 @@ class GoogleFaviconService {
|
||||
static String getBase64PlaceholderIcon(String serviceName, Color color) {
|
||||
// 간단한 SVG 생성 (서비스 이름의 첫 글자를 원 안에 표시)
|
||||
final initial = serviceName.isNotEmpty ? serviceName[0].toUpperCase() : '?';
|
||||
final colorHex = color.toARGB32().toRadixString(16).padLeft(8, '0').substring(2);
|
||||
final colorHex =
|
||||
color.toARGB32().toRadixString(16).padLeft(8, '0').substring(2);
|
||||
|
||||
// 공백 없이 SVG 생성 (공백이 있으면 Base64 디코딩 후 이미지 로드 시 문제 발생)
|
||||
final svgContent =
|
||||
@@ -568,7 +567,8 @@ class _WebsiteIconState extends State<WebsiteIcon>
|
||||
boxShadow: widget.isHovered
|
||||
? [
|
||||
BoxShadow(
|
||||
color: _getColorFromName().withValues(alpha: 0.3), // 약 0.3 알파값
|
||||
color:
|
||||
_getColorFromName().withValues(alpha: 0.3), // 약 0.3 알파값
|
||||
blurRadius: 12,
|
||||
spreadRadius: 0,
|
||||
offset: const Offset(0, 4),
|
||||
|
||||
Reference in New Issue
Block a user