tiny fixes and cosmetic
This commit is contained in:
esefxdz committed
1 parent
a659e3bb2e
commit
156d9f49b2
5 files changed
+278
-96
No files matched your search
@@ -1,92 +1,115 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:revoltvpn/logic/app_colors.dart';
|
||||
import 'package:revoltvpn/logic/session_timer.dart';
|
||||
// =============================================================================
|
||||
// clock_display.dart — EDUCATIONAL REFERENCE (not used in production)
|
||||
// =============================================================================
|
||||
//
|
||||
// This widget was the original combined timer + speed + syncing display.
|
||||
// It was replaced by the separate TimerBox and SpeedBox widgets in the
|
||||
// Reality-era UI refactor.
|
||||
//
|
||||
// What's worth studying here:
|
||||
//
|
||||
// 1. TEXT GLOW EFFECT — the yellow glow around the countdown timer:
|
||||
// ```
|
||||
// shadows: [Shadow(color: AppColors.accent50, blurRadius: 16)]
|
||||
// ```
|
||||
// This exact effect was ported to timer_box.dart and is what gives
|
||||
// the countdown its signature pulsing-yellow look.
|
||||
//
|
||||
// 2. SYNCING PLACEHOLDER — conditional spinner + label when the first
|
||||
// server poll hasn't returned yet. Shows "Syncing…" with a small
|
||||
// CircularProgressIndicator instead of flashing 00:00:00.
|
||||
//
|
||||
// 3. COMBINED DISPLAY — clock + speed stacked in a Column inside a
|
||||
// fixed 200×200 SizedBox. The modern UI split these into separate
|
||||
// boxes for the stacked layout, but the stacking approach here is
|
||||
// a good reference for compact combined displays.
|
||||
//
|
||||
// Kept in the repo for reference. Safe to delete if you're pruning.
|
||||
// =============================================================================
|
||||
|
||||
class ClockDisplay extends StatelessWidget {
|
||||
const ClockDisplay({super.key});
|
||||
// import 'package:flutter/material.dart';
|
||||
// import 'package:provider/provider.dart';
|
||||
// import 'package:revoltvpn/logic/app_colors.dart';
|
||||
// import 'package:revoltvpn/logic/session_timer.dart';
|
||||
|
||||
// class ClockDisplay extends StatelessWidget {
|
||||
// const ClockDisplay({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Consumer<SessionTimer>(
|
||||
builder: (context, timer, _) {
|
||||
final bool showSyncing = !timer.hasSyncedOnce;
|
||||
// @override
|
||||
// Widget build(BuildContext context) {
|
||||
// return Consumer<SessionTimer>(
|
||||
// builder: (context, timer, _) {
|
||||
// final bool showSyncing = !timer.hasSyncedOnce;
|
||||
|
||||
return SizedBox(
|
||||
width: 200,
|
||||
height: 200,
|
||||
child: Stack(
|
||||
alignment: Alignment.center,
|
||||
children: [
|
||||
// Center content: countdown + speed (or syncing placeholder)
|
||||
Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (showSyncing) ...[
|
||||
// Syncing placeholder — spinner + label
|
||||
const SizedBox(
|
||||
width: 32,
|
||||
height: 32,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
color: AppColors.accent50,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
const Text(
|
||||
'Syncing…',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.accent60,
|
||||
letterSpacing: 1.5,
|
||||
),
|
||||
),
|
||||
] else ...[
|
||||
// Glowing countdown timer
|
||||
Text(
|
||||
timer.formatted,
|
||||
style: const TextStyle(
|
||||
fontSize: 40,
|
||||
fontWeight: FontWeight.w800,
|
||||
color: AppColors.textWhite,
|
||||
letterSpacing: 2,
|
||||
shadows: [
|
||||
Shadow(
|
||||
color: AppColors.accent50,
|
||||
blurRadius: 16,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
|
||||
// Speed indicator
|
||||
Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(Icons.speed, color: AppColors.textDim, size: 14),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
timer.currentSpeedKBps > 0.5
|
||||
? '${timer.currentSpeedKBps.toStringAsFixed(1)} KB/s'
|
||||
: 'Idle',
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
color: AppColors.textDim,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
// return SizedBox(
|
||||
// width: 200,
|
||||
// height: 200,
|
||||
// child: Stack(
|
||||
// alignment: Alignment.center,
|
||||
// children: [
|
||||
// Column(
|
||||
// mainAxisSize: MainAxisSize.min,
|
||||
// children: [
|
||||
// if (showSyncing) ...[
|
||||
// const SizedBox(
|
||||
// width: 32,
|
||||
// height: 32,
|
||||
// child: CircularProgressIndicator(
|
||||
// strokeWidth: 2,
|
||||
// color: AppColors.accent50,
|
||||
// ),
|
||||
// ),
|
||||
// const SizedBox(height: 10),
|
||||
// const Text(
|
||||
// 'Syncing…',
|
||||
// style: TextStyle(
|
||||
// fontSize: 16,
|
||||
// fontWeight: FontWeight.w600,
|
||||
// color: AppColors.accent60,
|
||||
// letterSpacing: 1.5,
|
||||
// ),
|
||||
// ),
|
||||
// ] else ...[
|
||||
// Text(
|
||||
// timer.formatted,
|
||||
// style: const TextStyle(
|
||||
// fontSize: 40,
|
||||
// fontWeight: FontWeight.w800,
|
||||
// color: AppColors.textWhite,
|
||||
// letterSpacing: 2,
|
||||
// shadows: [
|
||||
// Shadow(
|
||||
// color: AppColors.accent50,
|
||||
// blurRadius: 16,
|
||||
// ),
|
||||
// ],
|
||||
// ),
|
||||
// ),
|
||||
// const SizedBox(height: 6),
|
||||
// Row(
|
||||
// mainAxisSize: MainAxisSize.min,
|
||||
// children: [
|
||||
// const Icon(Icons.speed, color: AppColors.textDim, size: 14),
|
||||
// const SizedBox(width: 4),
|
||||
// Text(
|
||||
// timer.currentSpeedKBps > 0.5
|
||||
// ? '${timer.currentSpeedKBps.toStringAsFixed(1)} KB/s'
|
||||
// : 'Idle',
|
||||
// style: const TextStyle(
|
||||
// fontSize: 12,
|
||||
// color: AppColors.textDim,
|
||||
// fontWeight: FontWeight.w500,
|
||||
// ),
|
||||
// ),
|
||||
// ],
|
||||
// ),
|
||||
// ],
|
||||
// ],
|
||||
// ),
|
||||
// ],
|
||||
// ),
|
||||
// );
|
||||
// },
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
@@ -21,7 +21,6 @@ class SessionTimer extends ChangeNotifier {
|
||||
bool _isDisconnecting = false;
|
||||
bool _userInitiatedStop = false;
|
||||
|
||||
bool _isThrottled = false;
|
||||
|
||||
int? _currentPort;
|
||||
bool _portSwitchInProgress = false;
|
||||
@@ -66,7 +65,7 @@ class SessionTimer extends ChangeNotifier {
|
||||
if (vpnConnection.status == VpnStatus.connected &&
|
||||
!isRunning &&
|
||||
vpnConnection.isStartupRestoration) {
|
||||
start('resume');
|
||||
_resumeTicking();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -225,7 +224,6 @@ class SessionTimer extends ChangeNotifier {
|
||||
!_portSwitchInProgress) {
|
||||
debugPrint('[Timer] Port changed $_currentPort → $serverPort — reconnecting…');
|
||||
_currentPort = serverPort;
|
||||
_isThrottled = data['is_throttled'] ?? false;
|
||||
_portSwitchInProgress = true;
|
||||
|
||||
_timer?.cancel();
|
||||
@@ -238,17 +236,12 @@ class SessionTimer extends ChangeNotifier {
|
||||
return;
|
||||
}
|
||||
_currentPort = serverPort;
|
||||
_isThrottled = data['is_throttled'] ?? false;
|
||||
|
||||
_consecutiveFailures = 0;
|
||||
_offlineSeconds = 0;
|
||||
_hasSyncedOnce = true;
|
||||
|
||||
notifyListeners();
|
||||
} else if (response.statusCode == 404) {
|
||||
// Peer not found on server (expired / deleted natively)
|
||||
stop();
|
||||
await vpnConnection.disconnect();
|
||||
} else {
|
||||
_markSyncFailure();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user