Refactor onboarding screen and improve code formatting

- Added .env file to pubspec.yaml for environment configuration.
- Simplified the OnboardingScreen constructor for better readability.
- Enhanced code formatting in onboarding_screen.dart for consistency.
- Improved main.dart routing for onboarding screen.
- Cleaned up unnecessary whitespace in various service files.

Author: Anton-Dodonov

lib/main.dart

@@ -99,9 +99,8 @@ class App extends StatelessWidget {
       home: homeScreen,
       routes: {
         '/': (context) => const MainScreen(),
-        '/onboarding': (context) => OnboardingScreen(
-              onboardingService: onboardingService,
-            ),
+        '/onboarding': (context) =>
+            OnboardingScreen(onboardingService: onboardingService),
       },
       localizationsDelegates: const [
         AppLocalizations.delegate,

lib/pages/onboarding/onboarding_screen.dart

@@ -5,11 +5,8 @@ import '../../services/config_service.dart';
 
 class OnboardingScreen extends StatefulWidget {
   final OnboardingService onboardingService;
-  
-  const OnboardingScreen({
-    super.key, 
-    required this.onboardingService,
-  });
+
+  const OnboardingScreen({super.key, required this.onboardingService});
 
   @override
   State<OnboardingScreen> createState() => _OnboardingScreenState();
@@ -21,28 +18,28 @@ class _OnboardingScreenState extends State<OnboardingScreen>
   late Animation<double> _fadeAnimation;
   late Animation<double> _slideAnimation;
   int _currentStep = 0;
-  
+
   List<OnboardingStep> _getSteps() {
     return [
       // Шаг 1: Подключение к телеграм боту
       OnboardingStep(
         title: 'Welcome',
-        description: ConfigService.requiresTelegramBot 
-          ? 'To connect, go to the telegram bot to get your unique subscription'
-          : 'To connect, go to the telegram bot (optional)',
+        description: ConfigService.requiresTelegramBot
+            ? 'To connect, go to the telegram bot to get your unique subscription'
+            : 'To connect, go to the telegram bot (optional)',
         telegramBot: '@${ConfigService.telegramBotUsername}',
         icon: Icons.telegram,
         color: const Color(0xFF0088CC),
         showSkip: ConfigService.canSkipOnboarding,
         isWelcome: true,
       ),
-      
+
       // Шаг 2: Настройки успешно получены
       OnboardingStep(
         title: 'Settings Received',
         description: ConfigService.requiresTelegramBot
-          ? 'Your unique subscription has been successfully received'
-          : 'Your settings have been successfully received',
+            ? 'Your unique subscription has been successfully received'
+            : 'Your settings have been successfully received',
         icon: Icons.check_circle,
         color: const Color(0xFF4CAF50),
         isLast: true,
@@ -58,22 +55,14 @@ class _OnboardingScreenState extends State<OnboardingScreen>
       duration: const Duration(milliseconds: 800),
       vsync: this,
     );
-    _fadeAnimation = Tween<double>(
-      begin: 0.0,
-      end: 1.0,
-    ).animate(CurvedAnimation(
-      parent: _animationController,
-      curve: Curves.easeInOut,
-    ));
-    _slideAnimation = Tween<double>(
-      begin: 0.8,
-      end: 1.0,
-    ).animate(CurvedAnimation(
-      parent: _animationController,
-      curve: Curves.easeInOut,
-    ));
+    _fadeAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
+      CurvedAnimation(parent: _animationController, curve: Curves.easeInOut),
+    );
+    _slideAnimation = Tween<double>(begin: 0.8, end: 1.0).animate(
+      CurvedAnimation(parent: _animationController, curve: Curves.easeInOut),
+    );
     _animationController.forward();
-    
+
     // Слушаем изменения в onboarding сервисе для обработки deep links
     widget.onboardingService.addListener(_onOnboardingChanged);
   }
@@ -137,12 +126,18 @@ class _OnboardingScreenState extends State<OnboardingScreen>
     final botUrl = ConfigService.telegramBotFullUrl;
     try {
       if (await canLaunchUrl(Uri.parse(botUrl))) {
-        await launchUrl(Uri.parse(botUrl), mode: LaunchMode.externalApplication);
+        await launchUrl(
+          Uri.parse(botUrl),
+          mode: LaunchMode.externalApplication,
+        );
       } else {
         // Fallback to web browser
         final webUrl = ConfigService.telegramBotWebUrl;
         if (await canLaunchUrl(Uri.parse(webUrl))) {
-          await launchUrl(Uri.parse(webUrl), mode: LaunchMode.externalApplication);
+          await launchUrl(
+            Uri.parse(webUrl),
+            mode: LaunchMode.externalApplication,
+          );
         }
       }
     } catch (e) {
@@ -154,18 +149,14 @@ class _OnboardingScreenState extends State<OnboardingScreen>
   Widget build(BuildContext context) {
     final steps = _getSteps();
     final currentStepData = steps[_currentStep];
-    
+
     return Scaffold(
       body: Container(
         decoration: const BoxDecoration(
           gradient: LinearGradient(
             begin: Alignment.topCenter,
             end: Alignment.bottomCenter,
-            colors: [
-              Colors.white,
-              Color(0xFFF8F9FA),
-              Color(0xFFE9ECEF),
-            ],
+            colors: [Colors.white, Color(0xFFF8F9FA), Color(0xFFE9ECEF)],
           ),
         ),
         child: SafeArea(
@@ -178,13 +169,15 @@ class _OnboardingScreenState extends State<OnboardingScreen>
                   child: Padding(
                     padding: const EdgeInsets.all(20),
                     child: TextButton(
-                      onPressed: ConfigService.canSkipOnboarding ? _skipOnboarding : null,
+                      onPressed: ConfigService.canSkipOnboarding
+                          ? _skipOnboarding
+                          : null,
                       child: Text(
                         'Skip',
                         style: TextStyle(
-                          color: ConfigService.canSkipOnboarding 
-                            ? const Color(0xFF6C757D)
-                            : const Color(0xFF6C757D).withOpacity(0.3),
+                          color: ConfigService.canSkipOnboarding
+                              ? const Color(0xFF6C757D)
+                              : const Color(0xFF6C757D).withOpacity(0.3),
                           fontSize: 16,
                           fontWeight: FontWeight.w500,
                         ),
@@ -193,7 +186,7 @@ class _OnboardingScreenState extends State<OnboardingScreen>
                   ),
                 ),
               ],
-              
+
               // Main content
               Expanded(
                 child: Padding(
@@ -207,7 +200,7 @@ class _OnboardingScreenState extends State<OnboardingScreen>
                   ),
                 ),
               ),
-              
+
               // Navigation buttons
               Container(
                 padding: const EdgeInsets.all(20),
@@ -244,7 +237,9 @@ class _OnboardingScreenState extends State<OnboardingScreen>
                     ],
                     Expanded(
                       child: ElevatedButton(
-                        onPressed: currentStepData.isWelcome ? _openTelegramBot : _nextStep,
+                        onPressed: currentStepData.isWelcome
+                            ? _openTelegramBot
+                            : _nextStep,
                         style: ElevatedButton.styleFrom(
                           backgroundColor: currentStepData.color,
                           foregroundColor: Colors.white,
@@ -257,17 +252,23 @@ class _OnboardingScreenState extends State<OnboardingScreen>
                           mainAxisAlignment: MainAxisAlignment.center,
                           children: [
                             Text(
-                              currentStepData.isWelcome 
-                                ? (ConfigService.requiresTelegramBot 
-                                    ? 'Go to telegram bot' 
-                                    : 'Go to telegram bot (optional)')
-                                : (currentStepData.isLast ? 'Get Started' : 'Next'),
+                              currentStepData.isWelcome
+                                  ? (ConfigService.requiresTelegramBot
+                                        ? 'Go to telegram bot'
+                                        : 'Go to telegram bot (optional)')
+                                  : (currentStepData.isLast
+                                        ? 'Get Started'
+                                        : 'Next'),
                               style: const TextStyle(
                                 fontWeight: FontWeight.w600,
                               ),
                             ),
                             const SizedBox(width: 8),
-                            Icon(currentStepData.isWelcome ? Icons.telegram : Icons.arrow_forward),
+                            Icon(
+                              currentStepData.isWelcome
+                                  ? Icons.telegram
+                                  : Icons.arrow_forward,
+                            ),
                           ],
                         ),
                       ),
@@ -320,15 +321,11 @@ class _OnboardingScreenState extends State<OnboardingScreen>
               color: step.color.withOpacity(0.1),
               shape: BoxShape.circle,
             ),
-            child: Icon(
-              step.icon,
-              size: 60,
-              color: step.color,
-            ),
+            child: Icon(step.icon, size: 60, color: step.color),
           ),
           const SizedBox(height: 32),
         ],
-        
+
         // Title
         Text(
           step.title,
@@ -340,7 +337,7 @@ class _OnboardingScreenState extends State<OnboardingScreen>
           textAlign: TextAlign.center,
         ),
         const SizedBox(height: 16),
-        
+
         // Description
         Text(
           step.description,
@@ -351,7 +348,7 @@ class _OnboardingScreenState extends State<OnboardingScreen>
           ),
           textAlign: TextAlign.center,
         ),
-        
+
         // Telegram bot handle
         if (step.telegramBot != null) ...[
           const SizedBox(height: 16),
@@ -399,4 +396,3 @@ class OnboardingStep {
     this.isLast = false,
   });
 }
-

lib/services/config_service.dart

@@ -261,4 +261,3 @@ class ConfigService {
     print('===============================');
   }
 }
-

lib/services/deep_link_service.dart

@@ -48,26 +48,29 @@ class DeepLinkService {
     }
 
     // Обработка deep links во время работы приложения
-    _subscription = _appLinks.uriLinkStream.listen((Uri? uri) {
-      if (uri != null) {
-        _handleDeepLink(uri.toString());
-      }
-    }, onError: (err) {
-      print('❌ Deep link error: $err');
-    });
+    _subscription = _appLinks.uriLinkStream.listen(
+      (Uri? uri) {
+        if (uri != null) {
+          _handleDeepLink(uri.toString());
+        }
+      },
+      onError: (err) {
+        print('❌ Deep link error: $err');
+      },
+    );
   }
 
   /// Обработка deep link
   void _handleDeepLink(String link) {
     print('📎 Received deep link: $link');
-    
+
     if (link.startsWith('vpnclient://')) {
       // Обработка deep link для завершения onboarding
       if (_onboardingService != null) {
         _onboardingService!.handleDeepLink(link);
       }
     }
-    
+
     // Можно добавить обработку других deep links здесь
     // Например: vpnclient://add-server?url=...
     // или: vpnclient://connect?server_id=...
@@ -82,4 +85,3 @@ class DeepLinkService {
     print('DeepLinkService disposed');
   }
 }
-