Merge branch 'dev' into release

Author: goku-kamehameha

lib/app/app.dart

@@ -5,6 +5,7 @@ import 'package:defyx_vpn/app/router/app_router.dart';
 import 'package:defyx_vpn/core/theme/app_theme.dart';
 import 'package:defyx_vpn/modules/core/vpn.dart';
 import 'package:defyx_vpn/modules/core/desktop_platform_handler.dart';
+import 'package:defyx_vpn/modules/main/presentation/widgets/ump_service.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -46,14 +47,21 @@ class App extends ConsumerWidget {
     if (shouldUseInternalAds) {
       debugPrint('Using internal ads');
     } else {
-      _initializeMobileAds();
+      _initializeMobileAdsWithConsent();
     }
   }
 
-  Future<void> _initializeMobileAds() async {
+  Future<void> _initializeMobileAdsWithConsent() async {
     try {
       if (Platform.isAndroid || Platform.isIOS) {
-        await MobileAds.instance.initialize();
+        // Request UMP consent first (required for GDPR compliance)
+        UmpService.requestConsent(
+          onDone: () async {
+            // Initialize Mobile Ads after consent flow completes
+            await MobileAds.instance.initialize();
+            debugPrint('Google AdMob initialized with UMP consent');
+          },
+        );
       }
     } catch (error) {
       debugPrint('Error initializing Google AdMob: $error');

lib/modules/main/presentation/screens/main_screen.dart

@@ -34,7 +34,6 @@ class _MainScreenState extends ConsumerState<MainScreen> {
   final AnimationService _animationService = AnimationService();
   bool _showHeaderShadow = false;
   ConnectionStatus? _previousConnectionStatus;
-  bool? _previousShowCountdown;
   late MainScreenLogic _logic;
   late final GoogleAds _googleAds;
   late ScrollManager _scrollManager;
@@ -109,10 +108,6 @@ class _MainScreenState extends ConsumerState<MainScreen> {
     });
   }
 
-  void _handleAdsStateChange(bool showCountdown) {
-    _scrollManager.handleAdsStateChange(showCountdown);
-  }
-
   void _checkInitialConnectionState() {
     Future.delayed(const Duration(milliseconds: 1000), () {
       if (!mounted) return;
@@ -178,15 +173,6 @@ class _MainScreenState extends ConsumerState<MainScreen> {
         _previousConnectionStatus = connectionState.status;
         _handleConnectionStateChange(connectionState.status);
       }
-
-      if (mounted &&
-          _previousShowCountdown != null &&
-          _previousShowCountdown != adsState.showCountdown &&
-          _previousShowCountdown! &&
-          !adsState.showCountdown) {
-        _handleAdsStateChange(adsState.showCountdown);
-      }
-      _previousShowCountdown = adsState.showCountdown;
     });
 
     return MainScreenBackground(
@@ -240,7 +226,13 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                             ),
                             _buildContentSection(
                                 connectionState.status, adsState),
-                            SizedBox(height: 0.15.sh),
+                            SizedBox(
+                              height: connectionState.status ==
+                                          ConnectionStatus.connected &&
+                                      adsState.showCountdown
+                                  ? 140.h
+                                  : 0.15.sh,
+                            ),
                           ],
                         ),
                       ],
@@ -299,8 +291,8 @@ class _MainScreenState extends ConsumerState<MainScreen> {
         );
 
       default:
-        final shouldShowAd =
-            status == ConnectionStatus.connected && adsState.showCountdown;
+        // Show ads only when connected to VPN
+        final shouldShowAd = status == ConnectionStatus.connected && adsState.showCountdown;
 
         return SizedBox(
           height: 280.h,

lib/modules/main/presentation/widgets/google_ads.dart

@@ -19,32 +19,28 @@ Future<bool> _shouldShowGoogleAds(WidgetRef ref) async {
 
 class GoogleAdsState {
   final bool nativeAdIsLoaded;
+  final bool adLoadFailed;
   final int countdown;
   final bool showCountdown;
-  final bool shouldDisposeAd;
-  final bool adLoadFailed;
 
   const GoogleAdsState({
     this.nativeAdIsLoaded = false,
+    this.adLoadFailed = false,
     this.countdown = _countdownDuration,
     this.showCountdown = true,
-    this.shouldDisposeAd = false,
-    this.adLoadFailed = false,
   });
 
   GoogleAdsState copyWith({
     bool? nativeAdIsLoaded,
+    bool? adLoadFailed,
     int? countdown,
     bool? showCountdown,
-    bool? shouldDisposeAd,
-    bool? adLoadFailed,
   }) {
     return GoogleAdsState(
       nativeAdIsLoaded: nativeAdIsLoaded ?? this.nativeAdIsLoaded,
+      adLoadFailed: adLoadFailed ?? this.adLoadFailed,
       countdown: countdown ?? this.countdown,
       showCountdown: showCountdown ?? this.showCountdown,
-      shouldDisposeAd: shouldDisposeAd ?? this.shouldDisposeAd,
-      adLoadFailed: adLoadFailed ?? this.adLoadFailed,
     );
   }
 }
@@ -62,35 +58,27 @@ class GoogleAdsNotifier extends StateNotifier<GoogleAdsState> {
     state = state.copyWith(
       countdown: _countdownDuration,
       showCountdown: true,
-      shouldDisposeAd: false,
     );
     _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
       if (state.countdown > 0) {
         state = state.copyWith(countdown: state.countdown - 1);
       } else {
         state = state.copyWith(
           showCountdown: false,
-          shouldDisposeAd: true,
-          nativeAdIsLoaded: false,
+          // Keep nativeAdIsLoaded true - ad stays loaded, just hidden
         );
         timer.cancel();
       }
     });
   }
 
-  void resestCountDown() {
-    state = state.copyWith(countdown: _countdownDuration);
-  }
-
   void setAdLoaded(bool isLoaded) {
     debugPrint('Ad loaded: $isLoaded');
     state = state.copyWith(
       nativeAdIsLoaded: isLoaded,
       adLoadFailed: false,
     );
-    if (isLoaded &&
-        state.showCountdown &&
-        state.countdown == _countdownDuration) {
+    if (isLoaded && state.showCountdown && state.countdown == _countdownDuration) {
       startCountdownTimer();
     }
   }
@@ -102,10 +90,6 @@ class GoogleAdsNotifier extends StateNotifier<GoogleAdsState> {
     );
   }
 
-  void acknowledgeDisposal() {
-    state = state.copyWith(shouldDisposeAd: false);
-  }
-
   void resetState() {
     state = const GoogleAdsState();
   }
@@ -188,6 +172,8 @@ class _GoogleAdsState extends ConsumerState<GoogleAds> {
   void _initializeAds() async {
     if (_isDisposed || _hasInitialized) return;
 
+    _hasInitialized = true;
+
     try {
       // Disable Google Ads on non-mobile platforms.
       if (!(Platform.isAndroid || Platform.isIOS)) {
@@ -329,6 +315,9 @@ class _GoogleAdsState extends ConsumerState<GoogleAds> {
   @override
   void dispose() {
     _isDisposed = true;
+    _nativeAd?.dispose();
+    _nativeAd = null;
+    _globalAdInitialized = false;
     super.dispose();
   }
 
@@ -338,24 +327,17 @@ class _GoogleAdsState extends ConsumerState<GoogleAds> {
     final shouldShowGoogle = ref.watch(shouldShowGoogleAdsProvider);
     final customAdData = ref.watch(customAdDataProvider);
 
+    // Restart countdown on new connection for fresh 60-second impressions
+    // Ad stays loaded through disconnect/reconnect - no disposal
     ref.listen(connectionStateProvider, (previous, next) {
-      if (next.status == ConnectionStatus.disconnected && !_isDisposed) {
-        if (_nativeAd != null) {
-          _nativeAd?.dispose();
-          _nativeAd = null;
-        }
-        if (mounted) {
-          setState(() {
-            _isLoading = false;
-          });
-        }
-        ref.read(googleAdsProvider.notifier).acknowledgeDisposal();
-        _globalAdInitialized = false;
-      }
-      if (next.status == ConnectionStatus.connected) {
-        ref.read(googleAdsProvider.notifier).resestCountDown();
+      if (next.status == ConnectionStatus.connected && 
+          previous?.status != ConnectionStatus.connected &&
+          adsState.nativeAdIsLoaded &&
+          !_isDisposed) {
+        ref.read(googleAdsProvider.notifier).startCountdownTimer();
       }
     });
+
     return SizedBox(
       height: 280.h,
       width: 336.w,

lib/modules/main/presentation/widgets/tips_slider_section.dart

@@ -15,24 +15,10 @@ class TipsSliderSection extends StatelessWidget {
   Widget build(BuildContext context) {
     final isDisconnected = status == ConnectionStatus.disconnected;
 
-    return AnimatedSize(
-      duration: const Duration(milliseconds: 400),
-      curve: Curves.easeInOut,
-      alignment: Alignment.topCenter,
-      child: AnimatedSlide(
-        duration: const Duration(milliseconds: 500),
-        curve: Curves.easeOutBack,
-        offset: isDisconnected ? Offset.zero : const Offset(0.0, 0.3),
-        child: AnimatedOpacity(
-          duration: const Duration(milliseconds: 400),
-          opacity: isDisconnected ? 1.0 : 0.0,
-          child: isDisconnected
-              ? Column(
-                  children: [SizedBox(height: 0.05.sh), const TipsSlider()],
-                )
-              : const SizedBox.shrink(),
-        ),
-      ),
-    );
+    return isDisconnected
+        ? Column(
+            children: [SizedBox(height: 0.05.sh), const TipsSlider()],
+          )
+        : const SizedBox.shrink();
   }
 }

pubspec.yaml

@@ -1,7 +1,7 @@
 name: defyx_vpn
 description: "A new Vpn app"
 publish_to: "none"
-version: 4.4.0+242
+version: 4.4.1+243
 
 environment:
   sdk: ^3.5.3
@@ -103,7 +103,7 @@ msix_config:
   display_name: Defyx VPN
   publisher_display_name: UnboundTech UG
   identity_name: UnboundTechUG.6065AEC5A207
-  msix_version: 4.4.0.0
+  msix_version: 4.4.1.0
   publisher: "CN=62937938-2AE2-4C12-9ED8-4C418C0CADF2"
   logo_path: assets/images/logo.png
   capabilities: runFullTrust,internetClientServer,privateNetworkClientServer,unvirtualizedResources