課金ページの修正

.github/workflows/unit_test.yml

@@ -26,7 +26,7 @@ jobs:
         FILE_FIREBASE_IOS_PRODUCTION: ${{ secrets.FILE_FIREBASE_IOS_PRODUCTION }}
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '2.10.0'
+        flutter-version: '2.10.2'
     - run: flutter pub get
     - name: Run iOS
       run: flutter build ios --debug --no-codesign --flavor development --target lib/main.dev.dart --no-sound-null-safety
@@ -45,7 +45,7 @@ jobs:
         FILE_FIREBASE_ANDROID_PRODUCTION: ${{ secrets.FILE_FIREBASE_ANDROID_PRODUCTION }}
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '2.10.0'
+        flutter-version: '2.10.2'
     - run: flutter pub get
     - run: flutter build apk --debug --flavor development --target lib/main.dev.dart --no-sound-null-safety
   test:
@@ -58,6 +58,6 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '2.10.0'
+        flutter-version: '2.10.2'
     - run: flutter pub get
     - run: flutter test 

ios/Podfile.lock

@@ -197,14 +197,14 @@ PODS:
   - package_info (0.0.1):
     - Flutter
   - PromisesObjC (2.0.0)
-  - Purchases (3.13.1):
-    - PurchasesCoreSwift (= 3.13.1)
-  - purchases_flutter (3.8.0):
+  - Purchases (3.13.2):
+    - PurchasesCoreSwift (= 3.13.2)
+  - purchases_flutter (3.9.5):
     - Flutter
-    - PurchasesHybridCommon (= 1.11.1)
-  - PurchasesCoreSwift (3.13.1)
-  - PurchasesHybridCommon (1.11.1):
-    - Purchases (= 3.13.1)
+    - PurchasesHybridCommon (= 1.11.2)
+  - PurchasesCoreSwift (3.13.2)
+  - PurchasesHybridCommon (1.11.2):
+    - Purchases (= 3.13.2)
   - shared_preferences_ios (0.0.1):
     - Flutter
   - sign_in_with_apple (0.0.1):
@@ -337,10 +337,10 @@ SPEC CHECKSUMS:
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
-  Purchases: 2693d6444609de044ab25fcda9561bef038f24da
-  purchases_flutter: 214d452aaf860496aeee822487eafcdd962fab33
-  PurchasesCoreSwift: ca55f9ef671f89abed133775dd9e53f55007828d
-  PurchasesHybridCommon: a0313de4f31fbaf137518b2686ccdca4c91dd2b4
+  Purchases: 03200de9288724e77de435000d1828601e6b8e00
+  purchases_flutter: cf2b742f12b7ffef6f618c7f1ba1961e652825b1
+  PurchasesCoreSwift: 2ea4b33e5cece5c8a0751594ef7c6cbfcbd747a9
+  PurchasesHybridCommon: 56ef42d85c3e930d49aff4ac5fa027373d2e1bb8
   shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32
   sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
   url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af

l10n.yaml

@@ -0,0 +1,3 @@
+arb-dir: lib/l10n
+template-arb-file: app_ja.arb
+output-localization-file: app_localizations.dart

lib/domain/premium_introduction/components/annual_purchase_button.dart

@@ -3,7 +3,7 @@ import 'package:intl/intl.dart';
 import 'package:pilll/components/atoms/color.dart';
 import 'package:pilll/components/atoms/font.dart';
 import 'package:pilll/components/atoms/text_color.dart';
-import 'package:pilll/domain/premium_introduction/components/purchase_buttons_state.dart';
+import 'package:pilll/domain/premium_introduction/premium_introduction_state.dart';
 import 'package:purchases_flutter/purchases_flutter.dart';
 
 class AnnualPurchaseButton extends StatelessWidget {
@@ -20,9 +20,11 @@ class AnnualPurchaseButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final monthlyPrice = annualPackage.product.price / 12;
+    Locale locale = Localizations.localeOf(context);
     final monthlyPriceString =
-        NumberFormat.simpleCurrency(decimalDigits: 0, name: "JPY")
+        NumberFormat.simpleCurrency(locale: locale.toString(), decimalDigits: 0)
             .format(monthlyPrice);
+
     return GestureDetector(
       onTap: () {
         onTap(annualPackage);

lib/domain/premium_introduction/components/premium_introduction_discount.dart

@@ -4,13 +4,18 @@ import 'package:flutter_svg/svg.dart';
 import 'package:pilll/components/atoms/font.dart';
 import 'package:pilll/components/atoms/text_color.dart';
 import 'package:pilll/domain/premium_introduction/util/discount_deadline.dart';
+import 'package:purchases_flutter/object_wrappers.dart';
 
 class PremiumIntroductionDiscountRow extends HookConsumerWidget {
+  final Package monthlyPremiumPackage;
   final DateTime? discountEntitlementDeadlineDate;
 
-  const PremiumIntroductionDiscountRow(
-      {Key? key, required this.discountEntitlementDeadlineDate})
-      : super(key: key);
+  const PremiumIntroductionDiscountRow({
+    Key? key,
+    required this.discountEntitlementDeadlineDate,
+    required this.monthlyPremiumPackage,
+  }) : super(key: key);
+
   Widget build(BuildContext context, WidgetRef ref) {
     final discountEntitlementDeadlineDate =
         this.discountEntitlementDeadlineDate;
@@ -75,7 +80,7 @@ class PremiumIntroductionDiscountRow extends HookConsumerWidget {
           Stack(
             children: [
               Text(
-                "¥480",
+                "${monthlyPremiumPackage.product.priceString}",
                 textAlign: TextAlign.center,
                 style: TextColorStyle.main.merge(
                   TextStyle(
@@ -86,7 +91,7 @@ class PremiumIntroductionDiscountRow extends HookConsumerWidget {
                 ),
               ),
               Positioned(
-                left: 30,
+                left: 24,
                 child: SvgPicture.asset("images/strikethrough.svg"),
               ),
             ],

lib/domain/premium_introduction/components/purchase_buttons.dart

@@ -4,8 +4,8 @@ import 'package:pilll/analytics.dart';
 import 'package:pilll/components/page/hud.dart';
 import 'package:pilll/domain/premium_introduction/components/annual_purchase_button.dart';
 import 'package:pilll/domain/premium_introduction/components/monthly_purchase_button.dart';
-import 'package:pilll/domain/premium_introduction/components/purchase_buttons_state.dart';
 import 'package:pilll/domain/premium_introduction/premium_complete_dialog.dart';
+import 'package:pilll/domain/premium_introduction/premium_introduction_state.dart';
 import 'package:pilll/domain/premium_introduction/premium_introduction_store.dart';
 import 'package:pilll/entity/user_error.dart';
 import 'package:pilll/error/error_alert.dart';
@@ -14,41 +14,39 @@ import 'package:purchases_flutter/purchases_flutter.dart';
 
 class PurchaseButtons extends HookConsumerWidget {
   final PremiumIntroductionStore store;
-  final Offerings offerings;
+  final OfferingType offeringType;
+  final Package monthlyPackage;
+  final Package annualPackage;
 
   const PurchaseButtons({
     Key? key,
     required this.store,
-    required this.offerings,
+    required this.offeringType,
+    required this.monthlyPackage,
+    required this.annualPackage,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final state = ref.watch(purchaseButtonsStateProvider(offerings));
-    final monthlyPackage = state.monthlyPackage;
-    final annualPackage = state.annualPackage;
-
     return Row(
       children: [
         Spacer(),
-        if (monthlyPackage != null)
-          MonthlyPurchaseButton(
-            monthlyPackage: monthlyPackage,
-            onTap: (monthlyPackage) async {
-              analytics.logEvent(name: "pressed_monthly_purchase_button");
-              await _purchase(context, monthlyPackage);
-            },
-          ),
+        MonthlyPurchaseButton(
+          monthlyPackage: monthlyPackage,
+          onTap: (monthlyPackage) async {
+            analytics.logEvent(name: "pressed_monthly_purchase_button");
+            await _purchase(context, monthlyPackage);
+          },
+        ),
         SizedBox(width: 16),
-        if (annualPackage != null)
-          AnnualPurchaseButton(
-            annualPackage: annualPackage,
-            offeringType: state.offeringType,
-            onTap: (annualPackage) async {
-              analytics.logEvent(name: "pressed_annual_purchase_button");
-              await _purchase(context, annualPackage);
-            },
-          ),
+        AnnualPurchaseButton(
+          annualPackage: annualPackage,
+          offeringType: offeringType,
+          onTap: (annualPackage) async {
+            analytics.logEvent(name: "pressed_annual_purchase_button");
+            await _purchase(context, annualPackage);
+          },
+        ),
         Spacer(),
       ],
     );