general small bugfixes

This commit is contained in:
esefxdz committed 2026-06-13 14:32:57 +03:00
1 parent 0c39e0c5ee
commit 128a3b1320
5 files changed
+43 -36

No files matched your search

+3 -2
View File
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:paladinvpn/logic/vpn_connection.dart';
import 'package:paladinvpn/logic/ad_manager.dart';
import 'package:paladinvpn/components/online_dot.dart';
import 'package:paladinvpn/components/watch_ad_button.dart';
@@ -32,8 +33,8 @@ class BottomBar extends StatelessWidget {
// Server online/offline chip
OnlineDot(isOnline: isOnline),
const Spacer(),
// Support button — only visible while connected
if (isOnline) const WatchAdButton(),
// Support button — only visible while connected AND ads are enabled
if (isOnline && AdManager.adsEnabled) const WatchAdButton(),
],
),
);
+4 -21
View File
@@ -3,7 +3,6 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:paladinvpn/logic/vpn_connection.dart';
import 'package:paladinvpn/logic/session_timer.dart';
import 'package:paladinvpn/logic/ad_manager.dart';
import 'package:paladinvpn/components/clock_display.dart';
class ConnectButton extends StatefulWidget {
@@ -64,7 +63,6 @@ class _ConnectButtonState extends State<ConnectButton>
final vpn = context.read<VpnConnection>();
final timer = context.read<SessionTimer>();
final ad = context.read<AdManager>();
if (vpn.status == VpnStatus.connected) {
// Disconnect — apply a short cooldown to prevent rapid toggle spam
@@ -77,17 +75,6 @@ class _ConnectButtonState extends State<ConnectButton>
});
} else if (vpn.status == VpnStatus.disconnected ||
vpn.status == VpnStatus.error) {
// Only attempt connect if an ad is loaded (or we're in dev/web mode)
if (!ad.isAdLoaded && !ad.isAdLoading) {
ad.preloadAd(); // trigger a reload in background
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Ad is not ready yet. Please wait a moment.'),
duration: Duration(seconds: 2),
),
);
return;
}
HapticFeedback.lightImpact();
final success = await vpn.connect();
if (success) {
@@ -105,8 +92,8 @@ class _ConnectButtonState extends State<ConnectButton>
@override
Widget build(BuildContext context) {
return Consumer3<VpnConnection, SessionTimer, AdManager>(
builder: (context, vpn, timer, ad, _) {
return Consumer2<VpnConnection, SessionTimer>(
builder: (context, vpn, timer, _) {
final isConnected = vpn.status == VpnStatus.connected;
final isConnecting = vpn.status == VpnStatus.connecting;
@@ -149,7 +136,7 @@ class _ConnectButtonState extends State<ConnectButton>
child: Center(
child: isConnected
? const ClockDisplay()
: _buildDisconnectedIcon(vpn.status, _inCooldown, ad),
: _buildDisconnectedIcon(vpn.status, _inCooldown),
),
);
},
@@ -159,7 +146,7 @@ class _ConnectButtonState extends State<ConnectButton>
);
}
Widget _buildDisconnectedIcon(VpnStatus status, bool inCooldown, AdManager ad) {
Widget _buildDisconnectedIcon(VpnStatus status, bool inCooldown) {
if (status == VpnStatus.connecting || status == VpnStatus.disconnecting) {
return const SizedBox(
width: 48,
@@ -183,10 +170,6 @@ class _ConnectButtonState extends State<ConnectButton>
label = 'TRY AGAIN';
icon = Icons.refresh;
tint = const Color(0xFFEF5350); // soft red — something went wrong
} else if (!ad.isAdLoaded && !ad.isAdLoading) {
label = 'LOADING AD…';
icon = Icons.hourglass_empty;
tint = const Color.fromRGBO(74, 85, 104, 0.7);
} else {
label = 'TAP TO CONNECT';
icon = Icons.power_settings_new;