lib/application_wrapper.dart

@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:lightmeter/data/analytics/analytics.dart';
-import 'package:lightmeter/data/analytics/api/analytics_firebase.dart';
 import 'package:lightmeter/data/caffeine_service.dart';
 import 'package:lightmeter/data/haptics_service.dart';
 import 'package:lightmeter/data/light_sensor_service.dart';
@@ -38,7 +36,6 @@ class ApplicationWrapper extends StatelessWidget {
           final userPreferencesService = UserPreferencesService(snapshot.data![0] as SharedPreferences);
           final hasLightSensor = snapshot.data![1] as bool;
           return ServicesProvider(
-            analytics: const LightmeterAnalytics(api: LightmeterAnalyticsFirebase()),
             caffeineService: const CaffeineService(),
             environment: env.copyWith(hasLightSensor: hasLightSensor),
             hapticsService: const HapticsService(),

lib/data/analytics/analytics.dart

@@ -1,34 +0,0 @@
-import 'dart:async';
-import 'dart:developer';
-
-import 'package:flutter/foundation.dart';
-import 'package:lightmeter/data/analytics/api/analytics_api_interface.dart';
-import 'package:lightmeter/data/analytics/entity/analytics_event.dart';
-
-class LightmeterAnalytics {
-  final ILightmeterAnalyticsApi _api;
-
-  const LightmeterAnalytics({required ILightmeterAnalyticsApi api}) : _api = api;
-
-  Future<void> logEvent(
-    LightmeterAnalyticsEvent event, {
-    Map<String, dynamic>? parameters,
-  }) async {
-    if (kDebugMode) {
-      log('<LightmeterAnalytics> logEvent: ${event.name} / $parameters');
-      return;
-    }
-
-    return _api.logEvent(
-      event: event,
-      parameters: parameters,
-    );
-  }
-
-  Future<void> logUnlockProFeatures(String listTileTitle) async {
-    return logEvent(
-      LightmeterAnalyticsEvent.unlockProFeatures,
-      parameters: {"listTileTitle": listTileTitle},
-    );
-  }
-}

lib/data/analytics/api/analytics_api_interface.dart

@@ -1,8 +0,0 @@
-import 'package:lightmeter/data/analytics/entity/analytics_event.dart';
-
-abstract class ILightmeterAnalyticsApi {
-  Future<void> logEvent({
-    required LightmeterAnalyticsEvent event,
-    Map<String, dynamic>? parameters,
-  });
-}

lib/data/analytics/api/analytics_firebase.dart

@@ -1,26 +0,0 @@
-import 'package:firebase_analytics/firebase_analytics.dart';
-import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/foundation.dart';
-import 'package:lightmeter/data/analytics/api/analytics_api_interface.dart';
-import 'package:lightmeter/data/analytics/entity/analytics_event.dart';
-
-class LightmeterAnalyticsFirebase implements ILightmeterAnalyticsApi {
-  const LightmeterAnalyticsFirebase();
-
-  @override
-  Future<void> logEvent({
-    required LightmeterAnalyticsEvent event,
-    Map<String, dynamic>? parameters,
-  }) async {
-    try {
-      await FirebaseAnalytics.instance.logEvent(
-        name: event.name,
-        parameters: parameters,
-      );
-    } on FirebaseException catch (e) {
-      debugPrint('Firebase Analytics Exception: $e');
-    } catch (e) {
-      debugPrint(e.toString());
-    }
-  }
-}

lib/data/analytics/entity/analytics_event.dart

@@ -1,3 +0,0 @@
-enum LightmeterAnalyticsEvent {
-  unlockProFeatures,
-}

lib/providers/services_provider.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:lightmeter/data/analytics/analytics.dart';
 import 'package:lightmeter/data/caffeine_service.dart';
 import 'package:lightmeter/data/haptics_service.dart';
 import 'package:lightmeter/data/light_sensor_service.dart';
@@ -11,7 +10,6 @@ import 'package:lightmeter/environment.dart';
 
 // coverage:ignore-start
 class ServicesProvider extends InheritedWidget {
-  final LightmeterAnalytics analytics;
   final CaffeineService caffeineService;
   final Environment environment;
   final HapticsService hapticsService;
@@ -22,7 +20,6 @@ class ServicesProvider extends InheritedWidget {
   final VolumeEventsService volumeEventsService;
 
   const ServicesProvider({
-    required this.analytics,
     required this.caffeineService,
     required this.environment,
     required this.hapticsService,

lib/screens/settings/components/lightmeter_pro/components/buy_pro/widget_list_tile_buy_pro.dart

@@ -2,35 +2,25 @@ import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/feature.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/remote_config_provider.dart';
-import 'package:lightmeter/providers/services_provider.dart';
-import 'package:lightmeter/res/dimens.dart';
+import 'package:lightmeter/screens/settings/components/shared/iap_list_tile/widget_list_tile_iap.dart';
 import 'package:lightmeter/screens/settings/components/utils/show_buy_pro_dialog.dart';
-import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 
 class BuyProListTile extends StatelessWidget {
   const BuyProListTile({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final unlockFeaturesEnabled = RemoteConfig.isEnabled(context, Feature.unlockProFeaturesText);
-    final status = IAPProducts.productOf(context, IAPProductType.paidFeatures)?.status;
-    final isPending = status == IAPProductStatus.purchased || status == null;
-    return ListTile(
+    return IAPListTile(
       leading: const Icon(Icons.star),
-      title: Text(unlockFeaturesEnabled ? S.of(context).unlockProFeatures : S.of(context).buyLightmeterPro),
+      title: Text(
+        RemoteConfig.isEnabled(context, Feature.unlockProFeaturesText)
+            ? S.of(context).unlockProFeatures
+            : S.of(context).buyLightmeterPro,
+      ),
       onTap: () {
         showBuyProDialog(context);
-        ServicesProvider.of(context)
-            .analytics
-            .logUnlockProFeatures(unlockFeaturesEnabled ? 'Unlock Pro features' : 'Buy Lightmeter Pro');
       },
-      trailing: isPending
-          ? const SizedBox(
-              height: Dimens.grid24,
-              width: Dimens.grid24,
-              child: CircularProgressIndicator(),
-            )
-          : null,
+      showPendingTrailing: true,
     );
   }
 }

lib/screens/settings/components/shared/iap_list_tile/widget_list_tile_iap.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/res/dimens.dart';
+import 'package:lightmeter/screens/settings/components/utils/show_buy_pro_dialog.dart';
 import 'package:m3_lightmeter_iap/m3_lightmeter_iap.dart';
 
 /// Depends on the product status and replaces [onTap] with purchase callback
@@ -22,14 +23,24 @@ class IAPListTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final isPurchased = IAPProducts.isPurchased(context, IAPProductType.paidFeatures);
-    return Opacity(
-      opacity: isPurchased ? Dimens.enabledOpacity : Dimens.disabledOpacity,
-      child: ListTile(
+    final status = IAPProducts.productOf(context, IAPProductType.paidFeatures)?.status;
+    final isPending = status == IAPProductStatus.purchased || status == null;
+    return ListTile(
       leading: leading,
       title: title,
-        onTap: isPurchased ? onTap : null,
-      ),
+      onTap: switch (status) {
+        IAPProductStatus.purchasable => () => showBuyProDialog(context),
+        IAPProductStatus.pending => null,
+        IAPProductStatus.purchased => onTap,
+        null => null,
+      },
+      trailing: showPendingTrailing && isPending
+          ? const SizedBox(
+              height: Dimens.grid24,
+              width: Dimens.grid24,
+              child: CircularProgressIndicator(),
+            )
+          : null,
     );
   }
 }

pubspec.yaml

@@ -13,7 +13,6 @@ dependencies:
   clipboard: 0.1.3
   dynamic_color: 1.6.6
   exif: 3.1.4
-  firebase_analytics: 10.6.2
   firebase_core: 2.20.0
   firebase_crashlytics: 3.4.2
   firebase_remote_config: 4.3.2