flutter_app/android/app/src/main/AndroidManifest.xml

@@ -1,15 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
     <application
-        android:label="PozoApp"
+        android:label="pozo_app"
         android:name="${applicationName}"
-        android:icon="@mipmap/launcher_icon">
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:exported="true"

flutter_app/android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/splash_bg" />
+    <item android:drawable="?android:colorBackground" />
 
     <!-- You can insert your own image assets here -->
     <!-- <item>

flutter_app/android/app/src/main/res/drawable/launch_background.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/splash_bg" />
+    <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
     <!-- <item>

flutter_app/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>

flutter_app/android/app/src/main/res/values-night/styles.xml

@@ -5,7 +5,6 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:windowSplashScreenBackground">@color/splash_bg</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

flutter_app/android/app/src/main/res/values/colors.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="splash_bg">#d2242e</color>
-	<color name="ic_launcher_background">#d2242e</color>
-</resources>

flutter_app/android/app/src/main/res/values/styles.xml

@@ -5,7 +5,6 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:windowSplashScreenBackground">@color/splash_bg</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

flutter_app/android/build.gradle.kts

@@ -11,28 +11,6 @@ rootProject.layout.buildDirectory.value(newBuildDir)
 subprojects {
     val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
     project.layout.buildDirectory.value(newSubprojectBuildDir)
-
-    afterEvaluate {
-        if (extensions.findByName("android") != null) {
-            val android = extensions.findByName("android") as com.android.build.gradle.BaseExtension
-            if (android.namespace == null) {
-                var manifestPackage: String? = null
-                val manifestFile = project.projectDir.resolve("src/main/AndroidManifest.xml")
-                if (manifestFile.exists()) {
-                    val content = manifestFile.readText()
-                    val match = Regex("package=\"([^\"]+)\"").find(content)
-                    if (match != null) {
-                        manifestPackage = match.groupValues[1]
-                    }
-                }
-                if (manifestPackage != null) {
-                    android.namespace = manifestPackage
-                } else {
-                    android.namespace = "co.gittouch." + project.name.replace("-", "_")
-                }
-            }
-        }
-    }
 }
 subprojects {
     project.evaluationDependsOn(":app")

flutter_app/ios/Runner.xcodeproj/project.pbxproj

@@ -427,7 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -484,7 +484,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

flutter_app/ios/Runner/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>PozoApp</string>
+	<string>Pozo App</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>PozoApp</string>
+	<string>pozo_app</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -45,19 +45,5 @@
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
-	<key>NSCameraUsageDescription</key>
-	<string>PozoApp requires camera access to capture shop facade photos and document images for business verification.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>PozoApp requires photo gallery access to upload documents and shop facade images.</string>
-	<key>NSContactsUsageDescription</key>
-	<string>PozoApp requires contacts access to let you search and auto-fill mobile numbers during registration and billing.</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>PozoApp needs your location to automatically fetch and verify your shop's address.</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>PozoApp needs your location to automatically fetch and verify your shop's address.</string>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>tel</string>
-	</array>
 </dict>
 </plist>

flutter_app/lib/feedback_helper.dart

@@ -1,151 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:audioplayers/audioplayers.dart';
-import 'package:vibration/vibration.dart';
-import 'package:flutter/foundation.dart' show kIsWeb, debugPrint;
-import 'dart:io' show Platform;
-
-class AppFeedback {
-  // Global settings for sound and haptic vibration feedback
-  static bool isSoundEnabled = true;
-  static bool isHapticEnabled = true;
-
-  static final Map<String, AudioPlayer> _players = {
-    'click.mp3': AudioPlayer(),
-    'select.mp3': AudioPlayer(),
-    'success.mp3': AudioPlayer(),
-    'error.mp3': AudioPlayer(),
-  };
-
-  static bool _initialized = false;
-
-  /// Preload sounds to achieve zero latency
-  static void init() {
-    if (_initialized) return;
-    try {
-      _players.forEach((key, player) {
-        player.setReleaseMode(ReleaseMode.stop);
-        player.setSource(AssetSource('sounds/$key'));
-      });
-      _initialized = true;
-    } catch (e) {
-      debugPrint('Error initializing AppFeedback: $e');
-    }
-  }
-
-  /// Play a sound from assets/sounds/ with zero delay
-  static Future<void> playSound(String fileName) async {
-    if (!isSoundEnabled) return;
-    try {
-      if (!_initialized) {
-        init();
-      }
-      final player = _players[fileName];
-      if (player != null) {
-        // Stop/seek and resume for instant audio
-        await player.seek(Duration.zero);
-        await player.resume();
-      } else {
-        // Fallback for dynamically added files
-        final tempPlayer = AudioPlayer();
-        await tempPlayer.play(AssetSource('sounds/$fileName'));
-      }
-    } catch (e) {
-      debugPrint('Audio playback error for $fileName: $e');
-    }
-  }
-
-  /// Helper to check Android platform safely
-  static bool get _isAndroid => !kIsWeb && Platform.isAndroid;
-
-  /// Trigger native vibration for Android with customized duration (in milliseconds)
-  static void _triggerVibration(int duration) async {
-    if (!isHapticEnabled || kIsWeb) return;
-    try {
-      if (_isAndroid) {
-        if (await Vibration.hasVibrator() == true) {
-          Vibration.vibrate(duration: duration);
-        }
-      }
-    } catch (e) {
-      debugPrint('Vibration error: $e');
-    }
-  }
-
-  /// Light haptic feedback + subtle click sound
-  static void click() {
-    if (isHapticEnabled) {
-      HapticFeedback.lightImpact();
-      _triggerVibration(30);
-    }
-    playSound('click.mp3');
-  }
-
-  /// Medium haptic + selection sound
-  static void select() {
-    if (isHapticEnabled) {
-      HapticFeedback.mediumImpact();
-      _triggerVibration(60);
-    }
-    playSound('select.mp3');
-  }
-
-  /// Celebration sound + strong haptic vibration
-  static void success() {
-    if (isHapticEnabled) {
-      HapticFeedback.heavyImpact();
-      _doubleVibrate();
-    }
-    playSound('success.mp3');
-  }
-
-  /// Wrong input -> error haptic (double vibrate) + error sound
-  static void error() {
-    if (isHapticEnabled) {
-      _doubleVibrate();
-    }
-    playSound('error.mp3');
-  }
-
-  /// Light haptic feedback (e.g. chip selections)
-  static void lightHaptic() {
-    if (!isHapticEnabled) return;
-    HapticFeedback.lightImpact();
-    _triggerVibration(30);
-  }
-
-  /// Medium haptic feedback
-  static void mediumHaptic() {
-    if (!isHapticEnabled) return;
-    HapticFeedback.mediumImpact();
-    _triggerVibration(60);
-  }
-
-  /// Heavy haptic feedback
-  static void heavyHaptic() {
-    if (!isHapticEnabled) return;
-    HapticFeedback.heavyImpact();
-    _triggerVibration(100);
-  }
-
-  /// Subtle haptic feedback (e.g. screen navigation)
-  static void subtleHaptic() {
-    if (!isHapticEnabled) return;
-    HapticFeedback.selectionClick();
-    _triggerVibration(20);
-  }
-
-  /// Double vibrate pattern using vibration package
-  static Future<void> _doubleVibrate() async {
-    if (!isHapticEnabled) return;
-    try {
-      if (!kIsWeb && await Vibration.hasVibrator() == true) {
-        // Double vibrate pattern: wait 0, vibrate 100ms, wait 100ms, vibrate 100ms
-        Vibration.vibrate(pattern: [0, 100, 100, 100]);
-      } else {
-        HapticFeedback.mediumImpact();
-      }
-    } catch (e) {
-      HapticFeedback.mediumImpact();
-    }
-  }
-}

flutter_app/lib/main.dart

@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
 import 'theme.dart';
 import 'screens/welcome_screen.dart';
-import 'feedback_helper.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
-  AppFeedback.init();
   runApp(const PozoApp());
 }
 

flutter_app/lib/route_transitions.dart

@@ -1,307 +0,0 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'feedback_helper.dart';
-
-class FadeSlidePageRoute<T> extends PageRouteBuilder<T> {
-  final Widget child;
-
-  FadeSlidePageRoute({required this.child})
-      : super(
-          pageBuilder: (context, animation, secondaryAnimation) => child,
-          transitionsBuilder: (context, animation, secondaryAnimation, child) {
-            final fadeAnimation = CurvedAnimation(
-              parent: animation,
-              curve: Curves.easeOut,
-            );
-
-            final slideAnimation = Tween<Offset>(
-              begin: const Offset(0.0, 0.05),
-              end: Offset.zero,
-            ).animate(
-              CurvedAnimation(
-                parent: animation,
-                curve: Curves.easeOutCubic,
-              ),
-            );
-
-            return FadeTransition(
-              opacity: fadeAnimation,
-              child: SlideTransition(
-                position: slideAnimation,
-                child: child,
-              ),
-            );
-          },
-          transitionDuration: const Duration(milliseconds: 300),
-          reverseTransitionDuration: const Duration(milliseconds: 200),
-        ) {
-    AppFeedback.subtleHaptic();
-  }
-}
-
-void showTopAlert(
-  BuildContext context,
-  String message, {
-  bool isError = false,
-  IconData? icon,
-}) {
-  final overlayState = Overlay.of(context);
-  late OverlayEntry overlayEntry;
-
-  overlayEntry = OverlayEntry(
-    builder: (context) => _TopAlertWidget(
-      message: message,
-      isError: isError,
-      icon: icon,
-      onDismiss: () {
-        overlayEntry.remove();
-      },
-    ),
-  );
-
-  overlayState.insert(overlayEntry);
-}
-
-class _TopAlertWidget extends StatefulWidget {
-  final String message;
-  final bool isError;
-  final IconData? icon;
-  final VoidCallback onDismiss;
-
-  const _TopAlertWidget({
-    required this.message,
-    required this.isError,
-    this.icon,
-    required this.onDismiss,
-  });
-
-  @override
-  State<_TopAlertWidget> createState() => _TopAlertWidgetState();
-}
-
-class _TopAlertWidgetState extends State<_TopAlertWidget> with SingleTickerProviderStateMixin {
-  late AnimationController _controller;
-  late Animation<double> _slideAnimation;
-  late Animation<double> _opacityAnimation;
-  Timer? _dismissTimer;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 400),
-    );
-
-    _slideAnimation = CurvedAnimation(
-      parent: _controller,
-      curve: Curves.easeOutBack,
-    );
-
-    _opacityAnimation = CurvedAnimation(
-      parent: _controller,
-      curve: Curves.easeIn,
-    );
-
-    _controller.forward();
-
-    _dismissTimer = Timer(const Duration(milliseconds: 2800), () {
-      if (mounted) {
-        _controller.reverse().then((_) {
-          widget.onDismiss();
-        });
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _dismissTimer?.cancel();
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final mediaQuery = MediaQuery.of(context);
-    final topPadding = mediaQuery.padding.top + 16.0;
-
-    IconData alertIcon = widget.icon ?? 
-        (widget.isError ? Icons.error_outline : Icons.check_circle_outline);
-    Color backgroundColor = widget.isError ? const Color(0xFFBA1A20) : const Color(0xFF2E7D32);
-    
-    return AnimatedBuilder(
-      animation: _controller,
-      builder: (context, child) {
-        return Positioned(
-          top: topPadding * _slideAnimation.value - 80.0 * (1.0 - _slideAnimation.value),
-          left: 16.0,
-          right: 16.0,
-          child: Opacity(
-            opacity: _opacityAnimation.value,
-            child: Material(
-              color: Colors.transparent,
-              child: Align(
-                alignment: Alignment.topCenter,
-                child: ConstrainedBox(
-                  constraints: const BoxConstraints(maxWidth: 450),
-                  child: Container(
-                    padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
-                    decoration: BoxDecoration(
-                      color: backgroundColor,
-                      borderRadius: BorderRadius.circular(20),
-                      boxShadow: [
-                        BoxShadow(
-                          color: Colors.black.withOpacity(0.12),
-                          blurRadius: 16,
-                          offset: const Offset(0, 6),
-                        ),
-                      ],
-                    ),
-                    child: Row(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Icon(
-                          alertIcon,
-                          color: Colors.white,
-                          size: 20,
-                        ),
-                        const SizedBox(width: 12),
-                        Expanded(
-                          child: Text(
-                            widget.message,
-                            style: const TextStyle(
-                              color: Colors.white,
-                              fontSize: 14,
-                              fontWeight: FontWeight.w600,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}
-
-class SlideFadeEntrance extends StatefulWidget {
-  final Widget child;
-  final Duration delay;
-  final Duration duration;
-
-  const SlideFadeEntrance({
-    super.key,
-    required this.child,
-    this.delay = Duration.zero,
-    this.duration = const Duration(milliseconds: 500),
-  });
-
-  @override
-  State<SlideFadeEntrance> createState() => _SlideFadeEntranceState();
-}
-
-class _SlideFadeEntranceState extends State<SlideFadeEntrance> with SingleTickerProviderStateMixin {
-  late AnimationController _controller;
-  late Animation<double> _opacityAnimation;
-  late Animation<double> _slideAnimation;
-  Timer? _timer;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: widget.duration,
-    );
-
-    _opacityAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
-      CurvedAnimation(parent: _controller, curve: Curves.easeIn),
-    );
-
-    _slideAnimation = Tween<double>(begin: 12.0, end: 0.0).animate(
-      CurvedAnimation(parent: _controller, curve: Curves.easeOutCubic),
-    );
-
-    if (widget.delay == Duration.zero) {
-      _controller.forward();
-    } else {
-      _timer = Timer(widget.delay, () {
-        if (mounted) {
-          _controller.forward();
-        }
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    _timer?.cancel();
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AnimatedBuilder(
-      animation: _controller,
-      builder: (context, child) {
-        return Opacity(
-          opacity: _opacityAnimation.value,
-          child: Transform.translate(
-            offset: Offset(0.0, _slideAnimation.value),
-            child: child,
-          ),
-        );
-      },
-      child: widget.child,
-    );
-  }
-}
-
-class InteractiveScale extends StatefulWidget {
-  final Widget child;
-  final VoidCallback? onTap;
-  final double hoverScale;
-  final double tapScale;
-
-  const InteractiveScale({
-    super.key,
-    required this.child,
-    this.onTap,
-    this.hoverScale = 1.03,
-    this.tapScale = 0.96,
-  });
-
-  @override
-  State<InteractiveScale> createState() => _InteractiveScaleState();
-}
-
-class _InteractiveScaleState extends State<InteractiveScale> {
-  double _scale = 1.0;
-
-  @override
-  Widget build(BuildContext context) {
-    return MouseRegion(
-      onEnter: (_) => setState(() => _scale = widget.hoverScale),
-      onExit: (_) => setState(() => _scale = 1.0),
-      child: AnimatedScale(
-        scale: _scale,
-        duration: const Duration(milliseconds: 120),
-        child: GestureDetector(
-          behavior: HitTestBehavior.opaque,
-          onTapDown: (_) => setState(() => _scale = widget.tapScale),
-          onTapUp: (_) => setState(() => _scale = widget.hoverScale),
-          onTapCancel: () => setState(() => _scale = 1.0),
-          onTap: widget.onTap,
-          child: widget.child,
-        ),
-      ),
-    );
-  }
-}

flutter_app/lib/screens/billing_dashboard_screen.dart

@@ -1,7 +1,5 @@
 import 'dart:math';
 import 'package:flutter/material.dart';
-import '../route_transitions.dart';
-import '../feedback_helper.dart';
 
 class ProductItem {
   final String id;
@@ -137,7 +135,6 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
   }
 
   void _simulateBarcodeScan() {
-    AppFeedback.click();
     if (!widget.barcodeScanner) return;
     final random = Random();
     final randomProduct = _products[random.nextInt(_products.length)];
@@ -163,7 +160,13 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
   }
 
   void _showErrorSnackBar(String message) {
-    showTopAlert(context, message, isError: true);
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(message),
+        backgroundColor: Colors.red[800],
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
   }
 
   double get _subtotal {
@@ -179,7 +182,6 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
   double get _total => _subtotal + _cgst + _sgst;
 
   void _handleReviewAndGenerate() {
-    AppFeedback.success();
     final random = Random();
     final invoiceVal = 'POZO-${random.nextInt(90000) + 10000}';
     setState(() {
@@ -189,7 +191,6 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
   }
 
   void _closeReceiptAndReset() {
-    AppFeedback.click();
     setState(() {
       _printingInvoice = false;
       _billingList.clear();
@@ -210,10 +211,7 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
             elevation: 4,
             leading: IconButton(
               icon: const Icon(Icons.arrow_back, color: Colors.white),
-              onPressed: () {
+              onPressed: () => Navigator.pop(context),
-                AppFeedback.click();
-                Navigator.pop(context);
-              },
             ),
             title: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -255,24 +253,22 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
                   padding: const EdgeInsets.only(right: 8.0),
                   child: Directionality(
                     textDirection: TextDirection.rtl,
-                    child: InteractiveScale(
+                    child: ElevatedButton.icon(
-                      child: ElevatedButton.icon(
+                      onPressed: _simulateBarcodeScan,
-                        onPressed: _simulateBarcodeScan,
+                      style: ElevatedButton.styleFrom(
-                        style: ElevatedButton.styleFrom(
+                        minimumSize: const Size(0, 32),
-                          minimumSize: const Size(0, 32),
+                        backgroundColor: theme.colorScheme.primary,
-                          backgroundColor: theme.colorScheme.primary,
+                        foregroundColor: Colors.white,
-                          foregroundColor: Colors.white,
+                        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-                          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                        shape: RoundedRectangleBorder(
-                          shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(12),
-                            borderRadius: BorderRadius.circular(12),
-                          ),
-                        ),
-                        icon: const Icon(Icons.qr_code_scanner, size: 16),
-                        label: const Text(
-                          'Scan Item',
-                          style: TextStyle(fontSize: 10, fontWeight: FontWeight.bold),
                         ),
                       ),
+                      icon: const Icon(Icons.qr_code_scanner, size: 16),
+                      label: const Text(
+                        'Scan Item',
+                        style: TextStyle(fontSize: 10, fontWeight: FontWeight.bold),
+                      ),
                     ),
                   ),
                 ),
@@ -416,103 +412,95 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
                 final isLowStock = widget.inventoryAlerts && remainingStock <= 3;
                 final isOutOfStock = widget.inventoryAlerts && remainingStock <= 0;
 
-                return SlideFadeEntrance(
+                return InkWell(
-                  delay: Duration(milliseconds: index * 40),
+                  onTap: isOutOfStock ? null : () => _handleAddItem(prod),
-                  duration: const Duration(milliseconds: 300),
+                  borderRadius: BorderRadius.circular(16),
-                  child: InteractiveScale(
+                  child: Container(
-                    tapScale: isOutOfStock ? 1.0 : 0.95,
+                    padding: const EdgeInsets.all(10),
-                    hoverScale: isOutOfStock ? 1.0 : 1.03,
+                    decoration: BoxDecoration(
-                    child: InkWell(
+                      color: countInCart > 0
-                      onTap: isOutOfStock ? null : () => _handleAddItem(prod),
+                          ? const Color(0xFF1E1B4B) // Deep indigo accent
+                          : const Color(0xFF1E293B).withOpacity(0.8),
                       borderRadius: BorderRadius.circular(16),
-                      child: Container(
+                      border: Border.all(
-                        padding: const EdgeInsets.all(10),
+                        color: countInCart > 0 ? theme.colorScheme.primary : const Color(0xFF334155),
-                        decoration: BoxDecoration(
+                        width: countInCart > 0 ? 1.5 : 1.0,
-                          color: countInCart > 0
+                      ),
-                              ? const Color(0xFF1E1B4B) // Deep indigo accent
+                    ),
-                              : const Color(0xFF1E293B).withOpacity(0.8),
+                    child: Column(
-                          borderRadius: BorderRadius.circular(16),
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                          border: Border.all(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            color: countInCart > 0 ? theme.colorScheme.primary : const Color(0xFF334155),
+                      children: [
-                            width: countInCart > 0 ? 1.5 : 1.0,
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                prod.name,
+                                maxLines: 2,
+                                overflow: TextOverflow.ellipsis,
+                                style: const TextStyle(
+                                  color: Colors.white,
+                                  fontWeight: FontWeight.bold,
+                                  fontSize: 11,
+                                ),
+                              ),
+                              const SizedBox(height: 4),
+                              Text(
+                                '₹${prod.price.toStringAsFixed(0)}',
+                                style: TextStyle(
+                                  color: theme.colorScheme.primary,
+                                  fontWeight: FontWeight.w800,
+                                  fontSize: 13,
+                                ),
+                              ),
+                            ],
                           ),
                         ),
-                        child: Column(
+                        Row(
-                          crossAxisAlignment: CrossAxisAlignment.start,
                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
                           children: [
-                            Expanded(
+                            if (widget.inventoryAlerts)
-                              child: Column(
+                              Container(
-                                crossAxisAlignment: CrossAxisAlignment.start,
+                                padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-                                children: [
+                                decoration: BoxDecoration(
-                                  Text(
+                                  color: isLowStock
-                                    prod.name,
+                                      ? Colors.red.withOpacity(0.15)
-                                    maxLines: 2,
+                                      : const Color(0xFF334155),
-                                    overflow: TextOverflow.ellipsis,
+                                  borderRadius: BorderRadius.circular(6),
-                                    style: const TextStyle(
+                                ),
-                                      color: Colors.white,
+                                child: Text(
-                                      fontWeight: FontWeight.bold,
+                                  isOutOfStock ? 'Out of stock' : '$remainingStock Stock',
-                                      fontSize: 11,
+                                  style: TextStyle(
-                                    ),
+                                    color: isLowStock ? Colors.redAccent : Colors.grey,
+                                    fontSize: 8,
+                                    fontWeight: FontWeight.bold,
                                   ),
-                                  const SizedBox(height: 4),
+                                ),
-                                  Text(
+                              )
-                                    '₹${prod.price.toStringAsFixed(0)}',
+                            else
-                                    style: TextStyle(
+                              const SizedBox(),
-                                      color: theme.colorScheme.primary,
+                            if (countInCart > 0)
-                                      fontWeight: FontWeight.w800,
+                              Container(
-                                      fontSize: 13,
+                                width: 20,
-                                    ),
+                                height: 20,
+                                decoration: BoxDecoration(
+                                  color: theme.colorScheme.primary,
+                                  shape: BoxShape.circle,
+                                ),
+                                alignment: Alignment.center,
+                                child: Text(
+                                  '$countInCart',
+                                  style: const TextStyle(
+                                    color: Colors.white,
+                                    fontWeight: FontWeight.bold,
+                                    fontSize: 10,
                                   ),
-                                ],
+                                ),
-                              ),
+                              )
-                            ),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                if (widget.inventoryAlerts)
-                                  Container(
-                                    padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-                                    decoration: BoxDecoration(
-                                      color: isLowStock
-                                          ? Colors.red.withOpacity(0.15)
-                                          : const Color(0xFF334155),
-                                      borderRadius: BorderRadius.circular(6),
-                                    ),
-                                    child: Text(
-                                      isOutOfStock ? 'Out of stock' : '$remainingStock Stock',
-                                      style: TextStyle(
-                                        color: isLowStock ? Colors.redAccent : Colors.grey,
-                                        fontSize: 8,
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
-                                  )
-                                else
-                                  const SizedBox(),
-                                if (countInCart > 0)
-                                  Container(
-                                    width: 20,
-                                    height: 20,
-                                    decoration: BoxDecoration(
-                                      color: theme.colorScheme.primary,
-                                      shape: BoxShape.circle,
-                                    ),
-                                    alignment: Alignment.center,
-                                    child: Text(
-                                      '$countInCart',
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontWeight: FontWeight.bold,
-                                        fontSize: 10,
-                                      ),
-                                    ),
-                                  )
-                              ],
-                            )
                           ],
-                        ),
+                        )
-                      ),
+                      ],
                     ),
                   ),
                 );
@@ -672,27 +660,20 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
             const Divider(color: Color(0xFF334155), height: 16),
             _buildComputationCalculations(theme),
             const SizedBox(height: 10),
-            InteractiveScale(
+            ElevatedButton(
-              hoverScale: _billingList.isNotEmpty ? 1.03 : 1.0,
+              onPressed: _billingList.isEmpty ? null : _handleReviewAndGenerate,
-              tapScale: _billingList.isNotEmpty ? 0.96 : 1.0,
+              style: ElevatedButton.styleFrom(
-              child: ElevatedButton(
+                backgroundColor: theme.colorScheme.primary,
-                onPressed: _billingList.isEmpty ? null : _handleReviewAndGenerate,
+                disabledBackgroundColor: const Color(0xFF1E293B),
-                style: ElevatedButton.styleFrom(
+                minimumSize: const Size.fromHeight(48),
-                  backgroundColor: theme.colorScheme.primary,
+              ),
-                  disabledBackgroundColor: const Color(0xFF1E293B),
+              child: const Row(
-                  minimumSize: const Size.fromHeight(48),
+                mainAxisAlignment: MainAxisAlignment.center,
-                  shape: RoundedRectangleBorder(
+                children: [
-                    borderRadius: BorderRadius.circular(16),
+                  Icon(Icons.receipt, size: 16),
-                  ),
+                  SizedBox(width: 8),
-                ),
+                  Text('Generate Invoice'),
-                child: const Row(
+                ],
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Icon(Icons.receipt, size: 16),
-                    SizedBox(width: 8),
-                    Text('Generate Invoice'),
-                  ],
-                ),
               ),
             )
           ]
@@ -775,26 +756,19 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
                   )
                 ],
               ),
-              InteractiveScale(
+              ElevatedButton(
-                hoverScale: _billingList.isNotEmpty ? 1.03 : 1.0,
+                onPressed: _billingList.isEmpty ? null : _handleReviewAndGenerate,
-                tapScale: _billingList.isNotEmpty ? 0.96 : 1.0,
+                style: ElevatedButton.styleFrom(
-                child: ElevatedButton(
+                  padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
-                  onPressed: _billingList.isEmpty ? null : _handleReviewAndGenerate,
+                  minimumSize: const Size(180, 44),
-                  style: ElevatedButton.styleFrom(
+                ),
-                    padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
+                child: const Row(
-                    minimumSize: const Size(180, 44),
+                  mainAxisSize: MainAxisSize.min,
-                    shape: RoundedRectangleBorder(
+                  children: [
-                      borderRadius: BorderRadius.circular(16),
+                    Icon(Icons.print, size: 16),
-                    ),
+                    SizedBox(width: 8),
-                  ),
+                    Text('Review & Invoice', style: TextStyle(fontSize: 12)),
-                  child: const Row(
+                  ],
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Icon(Icons.print, size: 16),
-                      SizedBox(width: 8),
-                      Text('Review & Invoice', style: TextStyle(fontSize: 12)),
-                    ],
-                  ),
                 ),
               )
             ],
@@ -968,41 +942,32 @@ class _BillingDashboardScreenState extends State<BillingDashboardScreen> {
                   ),
                 ),
                 const SizedBox(height: 16),
-                InteractiveScale(
+                ElevatedButton.icon(
-                  child: ElevatedButton.icon(
+                  onPressed: () {
-                    onPressed: () {
+                    ScaffoldMessenger.of(context).showSnackBar(
-                      AppFeedback.click();
+                      SnackBar(
-                      showTopAlert(
+                        content: Text('🧾 Thermal Printed: $_invoiceNumber successfully!'),
-                        context,
+                        backgroundColor: const Color(0xFF10B981),
-                        'Thermal Printed: $_invoiceNumber successfully!',
+                        behavior: SnackBarBehavior.floating,
-                        icon: Icons.print,
-                      );
-                    },
-                    icon: const Icon(Icons.print, size: 16),
-                    label: const Text('Simulate Print Receipt', style: TextStyle(fontSize: 12)),
-                    style: ElevatedButton.styleFrom(
-                      backgroundColor: Colors.black,
-                      foregroundColor: Colors.white,
-                      minimumSize: const Size.fromHeight(42),
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(16),
                       ),
-                    ),
+                    );
+                  },
+                  icon: const Icon(Icons.print, size: 16),
+                  label: const Text('Simulate Print Receipt', style: TextStyle(fontSize: 12)),
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: Colors.black,
+                    foregroundColor: Colors.white,
+                    minimumSize: const Size.fromHeight(42),
                   ),
                 ),
                 const SizedBox(height: 8),
-                InteractiveScale(
+                ElevatedButton(
-                  child: ElevatedButton(
+                  onPressed: _closeReceiptAndReset,
-                    onPressed: _closeReceiptAndReset,
+                  style: ElevatedButton.styleFrom(
-                    style: ElevatedButton.styleFrom(
+                    backgroundColor: theme.colorScheme.primary,
-                      backgroundColor: theme.colorScheme.primary,
+                    minimumSize: const Size.fromHeight(42),
-                      minimumSize: const Size.fromHeight(42),
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(16),
-                      ),
-                    ),
-                    child: const Text('New Ledger Sale', style: TextStyle(fontSize: 12)),
                   ),
+                  child: const Text('New Ledger Sale', style: TextStyle(fontSize: 12)),
                 ),
               ],
             ),

flutter_app/lib/screens/customize_setup_screen.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import '../theme.dart';
-import '../route_transitions.dart';
-import '../feedback_helper.dart';
 import 'setup_complete_screen.dart';
 
 class CustomizeSetupScreen extends StatefulWidget {
@@ -34,10 +32,7 @@ class _CustomizeSetupScreenState extends State<CustomizeSetupScreen> {
       appBar: AppBar(
         leading: IconButton(
           icon: const Icon(Icons.arrow_back, color: Color(0xFFBA1A20)),
-          onPressed: () {
+          onPressed: () => Navigator.pop(context),
-            AppFeedback.click();
-            Navigator.pop(context);
-          },
         ),
         title: Row(
           children: const [
@@ -56,11 +51,10 @@ class _CustomizeSetupScreenState extends State<CustomizeSetupScreen> {
         actions: [
           TextButton(
             onPressed: () {
-              AppFeedback.click();
               Navigator.push(
                 context,
-                FadeSlidePageRoute(
+                MaterialPageRoute(
-                  child: SetupCompleteScreen(
+                  builder: (context) => SetupCompleteScreen(
                     businessName: widget.businessName,
                     businessType: widget.businessType,
                     gstin: widget.gstin,
@@ -124,66 +118,49 @@ class _CustomizeSetupScreenState extends State<CustomizeSetupScreen> {
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          SlideFadeEntrance(
+                          Text(
-                            delay: Duration.zero,
+                            'Customize Your Setup',
-                            child: Column(
+                            style: theme.textTheme.headlineLarge?.copyWith(
-                              crossAxisAlignment: CrossAxisAlignment.start,
+                              fontWeight: FontWeight.bold,
-                              children: [
-                                Text(
-                                  'Customize Your Setup',
-                                  style: theme.textTheme.headlineLarge?.copyWith(
-                                    fontWeight: FontWeight.bold,
-                                  ),
-                                ),
-                                const SizedBox(height: 16),
-                                Text(
-                                  'Turn on the features you need for your shop. You can always change these later in settings.',
-                                  style: theme.textTheme.bodyMedium,
-                                ),
-                              ],
                             ),
                           ),
-                          const SizedBox(height: 20),
+                          const SizedBox(height: 16),
+                          Text(
+                            'Turn on the features you need for your shop. You can always change these later in settings.',
+                            style: theme.textTheme.bodyMedium,
+                          ),
+                          const SizedBox(height: 16),
 
                           // Toggle 1: Barcode
-                          SlideFadeEntrance(
+                          _buildToggleCard(
-                            delay: const Duration(milliseconds: 100),
+                            Icons.qr_code_scanner,
-                            child: _buildToggleCard(
+                            'Barcode Scanner',
-                              Icons.qr_code_scanner,
+                            'Do you use a Barcode Scanner?',
-                              'Barcode Scanner',
+                            _barcode,
-                              'Do you use a Barcode Scanner?',
+                            (val) => setState(() => _barcode = val),
-                              _barcode,
+                            theme,
-                              (val) => setState(() => _barcode = val),
-                              theme,
-                            ),
                           ),
                           const SizedBox(height: 12),
 
                           // Toggle 2: KOT
-                          SlideFadeEntrance(
+                          _buildToggleCard(
-                            delay: const Duration(milliseconds: 180),
+                            Icons.receipt_long,
-                            child: _buildToggleCard(
+                            'KOT Management',
-                              Icons.receipt_long,
+                            'Do you need Kitchen Order Ticket management?',
-                              'KOT Management',
+                            _kot,
-                              'Do you need Kitchen Order Ticket management?',
+                            (val) => setState(() => _kot = val),
-                              _kot,
+                            theme,
-                              (val) => setState(() => _kot = val),
-                              theme,
-                            ),
                           ),
                           const SizedBox(height: 12),
 
                           // Toggle 3: Inventory stock tracking
-                          SlideFadeEntrance(
+                          _buildToggleCard(
-                            delay: const Duration(milliseconds: 260),
+                            Icons.inventory_2,
-                            child: _buildToggleCard(
+                            'Inventory Alerts',
-                              Icons.inventory_2,
+                            'Get notified when stock is running low.',
-                              'Inventory Alerts',
+                            _inventory,
-                              'Get notified when stock is running low.',
+                            (val) => setState(() => _inventory = val),
-                              _inventory,
+                            theme,
-                              (val) => setState(() => _inventory = val),
-                              theme,
-                            ),
                           ),
                         ],
                       ),
@@ -192,37 +169,28 @@ class _CustomizeSetupScreenState extends State<CustomizeSetupScreen> {
                 ),
 
                 // Pinned action keys
-                SlideFadeEntrance(
+                Padding(
-                  delay: const Duration(milliseconds: 340),
+                  padding: EdgeInsets.all(padding),
-                  child: Padding(
+                  child: ElevatedButton(
-                    padding: EdgeInsets.all(padding),
+                    onPressed: () {
-                    child: InteractiveScale(
+                      Navigator.push(
-                      child: ElevatedButton(
+                        context,
-                        onPressed: () {
+                        MaterialPageRoute(
-                          AppFeedback.click();
+                          builder: (context) => SetupCompleteScreen(
-                          Navigator.push(
+                            businessName: widget.businessName,
-                            context,
+                            businessType: widget.businessType,
-                            FadeSlidePageRoute(
+                            gstin: widget.gstin,
-                              child: SetupCompleteScreen(
+                            barcodeScanner: _barcode,
-                                businessName: widget.businessName,
+                            kotManagement: _kot,
-                                businessType: widget.businessType,
+                            inventoryAlerts: _inventory,
-                                gstin: widget.gstin,
-                                barcodeScanner: _barcode,
-                                kotManagement: _kot,
-                                inventoryAlerts: _inventory,
-                              ),
-                            ),
-                          );
-                        },
-                        style: ElevatedButton.styleFrom(
-                          minimumSize: const Size.fromHeight(54),
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(16),
                           ),
                         ),
-                        child: const Text('Save & Continue'),
+                      );
-                      ),
+                    },
+                    style: ElevatedButton.styleFrom(
+                      minimumSize: const Size.fromHeight(54),
                     ),
+                    child: const Text('Save & Continue'),
                   ),
                 )
               ],
@@ -241,72 +209,64 @@ class _CustomizeSetupScreenState extends State<CustomizeSetupScreen> {
     ValueChanged<bool> onChanged,
     ThemeData theme,
   ) {
-    void wrappedOnChanged(bool val) {
+    return Container(
-      AppFeedback.click();
+      padding: const EdgeInsets.all(16),
-      onChanged(val);
+      decoration: BoxDecoration(
-    }
+        color: Colors.white,
-
+        borderRadius: BorderRadius.circular(16),
-    return InteractiveScale(
+        border: Border.all(color: Colors.grey[200]!),
-      onTap: () => wrappedOnChanged(!value),
+        boxShadow: [
-      child: Container(
+          BoxShadow(
-        padding: const EdgeInsets.all(16),
+            color: Colors.black.withOpacity(0.02),
-        decoration: BoxDecoration(
+            blurRadius: 10,
-          color: Colors.white,
+            offset: const Offset(0, 4),
-          borderRadius: BorderRadius.circular(16),
+          )
-          border: Border.all(color: Colors.grey[200]!),
+        ],
-          boxShadow: [
+      ),
-            BoxShadow(
+      child: Row(
-              color: Colors.black.withOpacity(0.02),
+        crossAxisAlignment: CrossAxisAlignment.center,
-              blurRadius: 10,
+        children: [
-              offset: const Offset(0, 4),
+          Container(
-            )
+            width: 44,
-          ],
+            height: 44,
-        ),
+            decoration: BoxDecoration(
-        child: Row(
+              color: Colors.grey[100],
-          crossAxisAlignment: CrossAxisAlignment.center,
+              shape: BoxShape.circle,
-          children: [
-            Container(
-              width: 44,
-              height: 44,
-              decoration: BoxDecoration(
-                color: Colors.grey[100],
-                shape: BoxShape.circle,
-              ),
-              child: Icon(icon, color: Colors.grey[600], size: 22),
             ),
-            const SizedBox(width: 14),
+            child: Icon(icon, color: Colors.grey[600], size: 22),
-            Expanded(
+          ),
-              child: Column(
+          const SizedBox(width: 14),
-                crossAxisAlignment: CrossAxisAlignment.start,
+          Expanded(
-                mainAxisSize: MainAxisSize.min,
+            child: Column(
-                children: [
+              crossAxisAlignment: CrossAxisAlignment.start,
-                  Text(
+              mainAxisSize: MainAxisSize.min,
-                    title,
+              children: [
-                    style: const TextStyle(
+                Text(
-                      fontSize: 15,
+                  title,
-                      fontWeight: FontWeight.bold,
+                  style: const TextStyle(
-                      color: Colors.black87,
+                    fontSize: 15,
-                    ),
+                    fontWeight: FontWeight.bold,
+                    color: Colors.black87,
                   ),
-                  const SizedBox(height: 4),
+                ),
-                  Text(
+                const SizedBox(height: 4),
-                    subtitle,
+                Text(
-                    style: TextStyle(
+                  subtitle,
-                      fontSize: 11,
+                  style: TextStyle(
-                      color: Colors.grey[500],
+                    fontSize: 11,
-                    ),
+                    color: Colors.grey[500],
-                  )
+                  ),
-                ],
+                )
-              ),
+              ],
             ),
-            Switch(
+          ),
-              value: value,
+          Switch(
-              onChanged: wrappedOnChanged,
+            value: value,
-              activeColor: Colors.white,
+            onChanged: onChanged,
-              activeTrackColor: theme.colorScheme.primary,
+            activeColor: Colors.white,
-            ),
+            activeTrackColor: theme.colorScheme.primary,
-          ],
+          ),
-        ),
+        ],
       ),
     );
   }

flutter_app/lib/screens/otp_verification_screen.dart

@@ -1,8 +1,6 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import '../theme.dart';
-import '../route_transitions.dart';
-import '../feedback_helper.dart';
 import 'business_setup_screen.dart';
 
 class OtpVerificationScreen extends StatefulWidget {
@@ -51,21 +49,6 @@ class _OtpVerificationScreenState extends State<OtpVerificationScreen> {
     super.dispose();
   }
 
-  void _verifyOtp() {
-    final code = _controllers.map((c) => c.text.trim()).join();
-    if (code.length < 6) {
-      AppFeedback.error();
-      showTopAlert(context, 'Please enter a valid 6-digit OTP code.', isError: true);
-      return;
-    }
-    AppFeedback.success();
-    showTopAlert(context, 'OTP Verified Successfully!');
-    Navigator.pushReplacement(
-      context,
-      FadeSlidePageRoute(child: const BusinessSetupScreen()),
-    );
-  }
-
   String _getFormattedTime() {
     return '00:${_timeLeft.toString().padLeft(2, '0')}';
   }
@@ -83,10 +66,7 @@ class _OtpVerificationScreenState extends State<OtpVerificationScreen> {
       appBar: AppBar(
         leading: IconButton(
           icon: const Icon(Icons.arrow_back, color: Color(0xFFBA1A20)),
-          onPressed: () {
+          onPressed: () => Navigator.pop(context),
-            AppFeedback.click();
-            Navigator.pop(context);
-          },
         ),
         title: Text(
           'PozoApp',
@@ -142,223 +122,184 @@ class _OtpVerificationScreenState extends State<OtpVerificationScreen> {
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.center,
                         children: [
-                          // Alert envelope pulse symbol with SlideFadeEntrance
+                          // Alert envelope pulse symbol
-                          SlideFadeEntrance(
+                          Center(
-                            delay: Duration.zero,
-                            child: Center(
-                              child: Container(
-                                width: 96,
-                                height: 96,
-                                decoration: BoxDecoration(
-                                  color: theme.colorScheme.surfaceContainerHigh,
-                                  shape: BoxShape.circle,
-                                ),
-                                child: Center(
-                                  child: Container(
-                                    width: 72,
-                                    height: 72,
-                                    decoration: BoxDecoration(
-                                      color: Colors.white,
-                                      borderRadius: BorderRadius.circular(16),
-                                      boxShadow: [
-                                        BoxShadow(
-                                          color: Colors.black.withOpacity(0.06),
-                                          blurRadius: 10,
-                                        )
-                                      ],
-                                    ),
-                                    child: Icon(
-                                      Icons.sms,
-                                      color: theme.colorScheme.primary,
-                                      size: 38,
-                                    ),
-                                  ),
-                                ),
-                              ),
-                            ),
-                          ),
-                          const SizedBox(height: 16),
-                          SlideFadeEntrance(
-                            delay: const Duration(milliseconds: 100),
-                            child: Text(
-                              'Verifying your number',
-                              textAlign: TextAlign.center,
-                              style: theme.textTheme.headlineMedium?.copyWith(
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          ),
-                          const SizedBox(height: 16),
-                          SlideFadeEntrance(
-                            delay: const Duration(milliseconds: 150),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Text(
-                                  "Sent code to $displayMobile",
-                                  style: theme.textTheme.bodyMedium,
-                                ),
-                                const SizedBox(width: 8),
-                                InteractiveScale(
-                                  onTap: () {
-                                    AppFeedback.click();
-                                    Navigator.pop(context);
-                                  },
-                                  child: Text(
-                                    'Edit',
-                                    style: TextStyle(
-                                      color: theme.colorScheme.primary,
-                                      fontWeight: FontWeight.bold,
-                                      fontSize: 14,
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-
-                          const SizedBox(height: 20),
-                          
-                          // 6 Custom Inputs Fields with SlideFadeEntrance
-                          SlideFadeEntrance(
-                            delay: const Duration(milliseconds: 200),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: List.generate(11, (index) {
-                                if (index.isOdd) {
-                                  return const SizedBox(width: 8);
-                                }
-                                final fieldIndex = index ~/ 2;
-                                return SizedBox(
-                                  width: 44,
-                                  child: TextField(
-                                    controller: _controllers[fieldIndex],
-                                    focusNode: _focusNodes[fieldIndex],
-                                    keyboardType: TextInputType.number,
-                                    textAlign: TextAlign.center,
-                                    maxLength: 1,
-                                    style: const TextStyle(
-                                      fontSize: 20,
-                                      fontWeight: FontWeight.bold,
-                                    ),
-                                    decoration: InputDecoration(
-                                      counterText: '',
-                                      contentPadding: const EdgeInsets.symmetric(vertical: 12),
-                                      enabledBorder: OutlineInputBorder(
-                                        borderRadius: BorderRadius.circular(12),
-                                        borderSide: BorderSide(color: theme.colorScheme.outlineVariant),
-                                      ),
-                                      focusedBorder: OutlineInputBorder(
-                                        borderRadius: BorderRadius.circular(12),
-                                        borderSide: BorderSide(color: theme.colorScheme.primary, width: 2),
-                                      ),
-                                    ),
-                                    onChanged: (value) {
-                                      AppFeedback.subtleHaptic();
-                                      if (value.isNotEmpty) {
-                                        if (fieldIndex < 5) {
-                                          _focusNodes[fieldIndex + 1].requestFocus();
-                                        } else {
-                                          _verifyOtp();
-                                        }
-                                      } else if (value.isEmpty && fieldIndex > 0) {
-                                        _focusNodes[fieldIndex - 1].requestFocus();
-                                      }
-                                    },
-                                  ),
-                                );
-                              }),
-                            ),
-                          ),
-
-                          const SizedBox(height: 24),
-                          
-                          // Auto detect loader card with SlideFadeEntrance
-                          SlideFadeEntrance(
-                            delay: const Duration(milliseconds: 250),
                             child: Container(
-                              padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+                              width: 96,
+                              height: 96,
                               decoration: BoxDecoration(
-                                color: theme.colorScheme.surfaceContainerLow,
+                                color: theme.colorScheme.surfaceContainerHigh,
-                                borderRadius: BorderRadius.circular(16),
+                                shape: BoxShape.circle,
                               ),
-                              child: Row(
+                              child: Center(
-                                mainAxisAlignment: MainAxisAlignment.center,
+                                child: Container(
-                                children: [
+                                  width: 72,
-                                  SizedBox(
+                                  height: 72,
-                                    width: 14,
+                                  decoration: BoxDecoration(
-                                    height: 14,
+                                    color: Colors.white,
-                                    child: CircularProgressIndicator(
+                                    borderRadius: BorderRadius.circular(16),
-                                      strokeWidth: 2,
+                                    boxShadow: [
-                                      valueColor: AlwaysStoppedAnimation(theme.colorScheme.primary),
+                                      BoxShadow(
-                                    ),
+                                        color: Colors.black.withOpacity(0.06),
+                                        blurRadius: 10,
+                                      )
+                                    ],
                                   ),
-                                  const SizedBox(width: 12),
+                                  child: Icon(
-                                  Text(
+                                    Icons.sms,
-                                    'Auto-detecting OTP...',
+                                    color: theme.colorScheme.primary,
-                                    style: theme.textTheme.bodySmall?.copyWith(
+                                    size: 38,
-                                      fontWeight: FontWeight.bold,
-                                    ),
                                   ),
-                                ],
+                                ),
                               ),
                             ),
                           ),
+                          const SizedBox(height: 16),
+                          Text(
+                            'Verifying your number',
+                            textAlign: TextAlign.center,
+                            style: theme.textTheme.headlineMedium?.copyWith(
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                          const SizedBox(height: 16),
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            crossAxisAlignment: CrossAxisAlignment.center,
+                            children: [
+                              Text(
+                                "Sent code to $displayMobile",
+                                style: theme.textTheme.bodyMedium,
+                              ),
+                              const SizedBox(width: 8),
+                              GestureDetector(
+                                onTap: () => Navigator.pop(context),
+                                child: Text(
+                                  'Edit',
+                                  style: TextStyle(
+                                    color: theme.colorScheme.primary,
+                                    fontWeight: FontWeight.bold,
+                                    fontSize: 14,
+                                  ),
+                                ),
+                              ),
+                            ],
+                          ),
 
-                          const SizedBox(height: 24),
+                          const SizedBox(height: 16),
                           
-                          // Resending timer action row
+                          // 6 Custom Inputs Fields
-                          SlideFadeEntrance(
+                          Row(
-                            delay: const Duration(milliseconds: 300),
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: List.generate(11, (index) {
+                              if (index.isOdd) {
+                                return const SizedBox(width: 8);
+                              }
+                              final fieldIndex = index ~/ 2;
+                              return SizedBox(
+                                width: 44,
+                                child: TextField(
+                                  controller: _controllers[fieldIndex],
+                                  focusNode: _focusNodes[fieldIndex],
+                                  keyboardType: TextInputType.number,
+                                  textAlign: TextAlign.center,
+                                  maxLength: 1,
+                                  style: const TextStyle(
+                                    fontSize: 20,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                  decoration: InputDecoration(
+                                    counterText: '',
+                                    contentPadding: const EdgeInsets.symmetric(vertical: 12),
+                                    enabledBorder: OutlineInputBorder(
+                                      borderRadius: BorderRadius.circular(8),
+                                      borderSide: BorderSide(color: theme.colorScheme.outlineVariant),
+                                    ),
+                                    focusedBorder: OutlineInputBorder(
+                                      borderRadius: BorderRadius.circular(8),
+                                      borderSide: BorderSide(color: theme.colorScheme.primary, width: 2),
+                                    ),
+                                  ),
+                                  onChanged: (value) {
+                                    if (value.isNotEmpty && fieldIndex < 5) {
+                                      _focusNodes[fieldIndex + 1].requestFocus();
+                                    }
+                                  },
+                                ),
+                              );
+                            }),
+                          ),
+
+                          const SizedBox(height: 16),
+                          
+                          // Auto detect loader
+                          Container(
+                            padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+                            decoration: BoxDecoration(
+                              color: theme.colorScheme.surfaceContainerLow,
+                              borderRadius: BorderRadius.circular(12),
+                            ),
                             child: Row(
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: [
-                                const Icon(Icons.schedule, size: 16, color: Colors.grey),
+                                SizedBox(
-                                const SizedBox(width: 6),
+                                  width: 14,
+                                  height: 14,
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 2,
+                                    valueColor: AlwaysStoppedAnimation(theme.colorScheme.primary),
+                                  ),
+                                ),
+                                const SizedBox(width: 12),
                                 Text(
-                                  _timeLeft > 0
+                                  'Auto-detecting OTP...',
-                                      ? 'Resend code in ${_getFormattedTime()}'
+                                  style: theme.textTheme.bodySmall?.copyWith(
-                                      : 'Resend Code via SMS',
+                                    fontWeight: FontWeight.bold,
-                                  style: theme.textTheme.bodyMedium,
+                                  ),
                                 ),
                               ],
                             ),
                           ),
+
                           const SizedBox(height: 16),
                           
-                          // WhatsApp custom CTA button with InteractiveScale
+                          // Resending timer action column
-                          SlideFadeEntrance(
+                          Row(
-                            delay: const Duration(milliseconds: 350),
+                            mainAxisAlignment: MainAxisAlignment.center,
-                            child: InteractiveScale(
+                            children: [
-                              child: OutlinedButton.icon(
+                              const Icon(Icons.schedule, size: 16, color: Colors.grey),
-                                onPressed: () {
+                              const SizedBox(width: 6),
-                                  AppFeedback.click();
+                              Text(
-                                  showTopAlert(
+                                _timeLeft > 0
-                                    context,
+                                    ? 'Resend code in ${_getFormattedTime()}'
-                                    'WhatsApp verification request sent!',
+                                    : 'Resend Code via SMS',
-                                    icon: Icons.chat_bubble_outline,
+                                style: theme.textTheme.bodyMedium,
-                                  );
+                              ),
-                                },
+                            ],
-                                icon: const Icon(Icons.forum, color: Colors.green, size: 18),
+                          ),
-                                label: const Text(
+                          const SizedBox(height: 16),
+                          
+                          // WhatsApp custom CTA button
+                          ElevatedButton(
+                            onPressed: () {},
+                            style: ElevatedButton.styleFrom(
+                              backgroundColor: Colors.white,
+                              foregroundColor: Colors.black87,
+                              side: const BorderSide(color: Color(0xFFE2E2E2)),
+                              elevation: 1,
+                              minimumSize: const Size(200, 48),
+                            ),
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              children: const [
+                                Text(
                                   'Resend via WhatsApp',
                                   style: TextStyle(
                                     fontSize: 13,
                                     fontWeight: FontWeight.bold,
-                                    color: Colors.black87,
                                   ),
                                 ),
-                                style: OutlinedButton.styleFrom(
+                              ],
-                                  backgroundColor: Colors.white,
-                                  side: const BorderSide(color: Color(0xFFE2E2E2)),
-                                  elevation: 1,
-                                  minimumSize: const Size(220, 48),
-                                  shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.circular(12),
-                                  ),
-                                ),
-                              ),
                             ),
                           )
                         ],
@@ -384,35 +325,28 @@ class _OtpVerificationScreenState extends State<OtpVerificationScreen> {
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: [
-                        _buildFooterAction(Icons.help_outline, 'Help', () {
+                        _buildFooterAction(Icons.help_outline, 'Help'),
-                          showTopAlert(
+                        _buildFooterAction(Icons.save, 'Save Draft'),
-                            context,
+                        TextButton.icon(
-                            'Support agent contacted. We will call you shortly.',
+                          onPressed: () {
-                            icon: Icons.support_agent_outlined,
+                            Navigator.push(
-                          );
+                              context,
-                        }),
+                              MaterialPageRoute(
-                        _buildFooterAction(Icons.save, 'Save Draft', () {
+                                builder: (context) => const BusinessSetupScreen(),
-                          showTopAlert(
-                            context,
-                            'Onboarding draft saved successfully!',
-                            icon: Icons.save_outlined,
-                          );
-                        }),
-                        InteractiveScale(
-                          child: TextButton.icon(
-                            onPressed: _verifyOtp,
-                            icon: const Text(
-                              'Verify Manually',
-                              style: TextStyle(fontWeight: FontWeight.bold),
-                            ),
-                            label: const Icon(Icons.arrow_forward, size: 16),
-                            style: TextButton.styleFrom(
-                              foregroundColor: Colors.white,
-                              backgroundColor: theme.colorScheme.primary,
-                              padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
-                              shape: RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(16),
                               ),
+                            );
+                          },
+                          icon: const Text(
+                            'Verify Manually',
+                            style: TextStyle(fontWeight: FontWeight.bold),
+                          ),
+                          label: const Icon(Icons.arrow_forward, size: 16),
+                          style: TextButton.styleFrom(
+                            foregroundColor: Colors.white,
+                            backgroundColor: theme.colorScheme.primary,
+                            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(8),
                             ),
                           ),
                         )
@@ -428,27 +362,21 @@ class _OtpVerificationScreenState extends State<OtpVerificationScreen> {
     );
   }
 
-  Widget _buildFooterAction(IconData icon, String label, VoidCallback onTap) {
+  Widget _buildFooterAction(IconData icon, String label) {
-    return InteractiveScale(
+    return Column(
-      onTap: () {
+      mainAxisAlignment: MainAxisAlignment.center,
-        AppFeedback.click();
+      children: [
-        onTap();
+        Icon(icon, color: Colors.grey[600], size: 22),
-      },
+        const SizedBox(height: 4),
-      child: Column(
+        Text(
-        mainAxisAlignment: MainAxisAlignment.center,
+          label,
-        children: [
+          style: TextStyle(
-          Icon(icon, color: Colors.grey[600], size: 22),
+            fontSize: 10,
-          const SizedBox(height: 4),
+            fontWeight: FontWeight.bold,
-          Text(
+            color: Colors.grey[600],
-            label,
+          ),
-            style: TextStyle(
+        )
-              fontSize: 10,
+      ],
-              fontWeight: FontWeight.bold,
-              color: Colors.grey[600],
-            ),
-          )
-        ],
-      ),
     );
   }
 }

flutter_app/lib/screens/setup_complete_screen.dart

@@ -1,10 +1,8 @@
 import 'package:flutter/material.dart';
 import '../theme.dart';
-import '../route_transitions.dart';
-import '../feedback_helper.dart';
 import 'billing_dashboard_screen.dart';
 
-class SetupCompleteScreen extends StatefulWidget {
+class SetupCompleteScreen extends StatelessWidget {
   final String businessName;
   final String businessType;
   final String gstin;
@@ -22,73 +20,6 @@ class SetupCompleteScreen extends StatefulWidget {
     this.inventoryAlerts = true,
   });
 
-  @override
-  State<SetupCompleteScreen> createState() => _SetupCompleteScreenState();
-}
-
-class _SetupCompleteScreenState extends State<SetupCompleteScreen> with SingleTickerProviderStateMixin {
-  late AnimationController _controller;
-  late Animation<double> _checkScaleAnimation;
-  late Animation<double> _cardSlideAnimation;
-  late Animation<double> _cardOpacityAnimation;
-  late Animation<double> _btnSlideAnimation;
-  late Animation<double> _btnOpacityAnimation;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 1400),
-    );
-
-    _checkScaleAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(0.0, 0.45, curve: Curves.elasticOut),
-      ),
-    );
-
-    _cardSlideAnimation = Tween<double>(begin: 32.0, end: 0.0).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(0.25, 0.75, curve: Curves.easeOutCubic),
-      ),
-    );
-
-    _cardOpacityAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(0.25, 0.65, curve: Curves.easeIn),
-      ),
-    );
-
-    _btnSlideAnimation = Tween<double>(begin: 24.0, end: 0.0).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(0.55, 1.0, curve: Curves.easeOutCubic),
-      ),
-    );
-
-    _btnOpacityAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(0.55, 0.85, curve: Curves.easeIn),
-      ),
-    );
-
-    _controller.forward();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      AppFeedback.success();
-    });
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
   String _getCategoryDisplayName(String id) {
     final cleanId = id.replaceAll('category/', '').trim().toLowerCase();
     switch (cleanId) {
@@ -109,7 +40,7 @@ class _SetupCompleteScreenState extends State<SetupCompleteScreen> with SingleTi
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final categoryText = _getCategoryDisplayName(widget.businessType);
+    final categoryText = _getCategoryDisplayName(businessType);
     final gap = context.responsiveGap;
 
     return Scaffold(
@@ -150,289 +81,262 @@ class _SetupCompleteScreenState extends State<SetupCompleteScreen> with SingleTi
                   children: [
                     const SizedBox(height: 24),
 
-                    // Circular Green Check badge with Elastic Entrance Animation
+                  // Circular Green Check badge
-                    ScaleTransition(
+                  Container(
-                      scale: _checkScaleAnimation,
+                    width: 96,
+                    height: 96,
+                    decoration: const BoxDecoration(
+                      color: Colors.white,
+                      shape: BoxShape.circle,
+                      boxShadow: [
+                        BoxShadow(
+                          color: Colors.black12,
+                          blurRadius: 16,
+                          offset: Offset(0, 8),
+                        )
+                      ],
+                    ),
+                    child: Center(
                       child: Container(
-                        width: 96,
+                        width: 72,
-                        height: 96,
+                        height: 72,
                         decoration: const BoxDecoration(
-                          color: Colors.white,
+                          color: Colors.green,
                           shape: BoxShape.circle,
-                          boxShadow: [
-                            BoxShadow(
-                              color: Colors.black12,
-                              blurRadius: 16,
-                              offset: Offset(0, 8),
-                            )
-                          ],
                         ),
-                        child: Center(
+                        child: const Icon(
-                          child: Container(
+                          Icons.check,
-                            width: 72,
-                            height: 72,
-                            decoration: const BoxDecoration(
-                              color: Colors.green,
-                              shape: BoxShape.circle,
-                            ),
-                            child: const Icon(
-                              Icons.check,
-                              color: Colors.white,
-                              size: 40,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-
-                    SizedBox(height: gap),
-                    Text(
-                      'Setup Complete! 🎉',
-                      textAlign: TextAlign.center,
-                      style: theme.textTheme.headlineLarge?.copyWith(
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const SizedBox(height: 8),
-                    Text(
-                      'Your billing dashboard is ready for action.',
-                      textAlign: TextAlign.center,
-                      style: theme.textTheme.bodyMedium,
-                    ),
-
-                    SizedBox(height: gap * 1.5),
-
-                    // Glassmorphism summary Card with Fade + Slide Transition
-                    AnimatedBuilder(
-                      animation: _controller,
-                      builder: (context, child) {
-                        return Transform.translate(
-                          offset: Offset(0.0, _cardSlideAnimation.value),
-                          child: Opacity(
-                            opacity: _cardOpacityAnimation.value,
-                            child: child,
-                          ),
-                        );
-                      },
-                      child: Container(
-                        width: double.infinity,
-                        padding: const EdgeInsets.all(20),
-                        decoration: BoxDecoration(
                           color: Colors.white,
-                          borderRadius: BorderRadius.circular(20),
+                          size: 40,
-                          border: Border.all(color: Colors.grey[200]!),
-                          boxShadow: [
-                            BoxShadow(
-                              color: Colors.black.withOpacity(0.04),
-                              blurRadius: 20,
-                              offset: const Offset(0, 8),
-                            )
-                          ],
                         ),
-                        child: Column(
+                      ),
+                    ),
+                  ),
+
+                  SizedBox(height: gap),
+                  Text(
+                    'Setup Complete! 🎉',
+                    textAlign: TextAlign.center,
+                    style: theme.textTheme.headlineLarge?.copyWith(
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    'Your billing dashboard is ready for action.',
+                    textAlign: TextAlign.center,
+                    style: theme.textTheme.bodyMedium,
+                  ),
+
+                  SizedBox(height: gap * 1.5),
+
+                  // Glassmorphism summary Card
+                  Container(
+                    width: double.infinity,
+                    padding: const EdgeInsets.all(20),
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(20),
+                      border: Border.all(color: Colors.grey[200]!),
+                      boxShadow: [
+                        BoxShadow(
+                          color: Colors.black.withOpacity(0.04),
+                          blurRadius: 20,
+                          offset: const Offset(0, 8),
+                        )
+                      ],
+                    ),
+                    child: Column(
+                      children: [
+                        // Row 1: Store name
+                        Row(
                           children: [
-                            // Row 1: Store name
+                            Container(
-                            Row(
+                              width: 44,
-                              children: [
+                              height: 44,
-                                Container(
+                              decoration: BoxDecoration(
-                                  width: 44,
+                                color: Colors.grey[100],
-                                  height: 44,
+                                shape: BoxShape.circle,
-                                  decoration: BoxDecoration(
+                              ),
-                                    color: Colors.grey[100],
+                              child: const Icon(Icons.storefront, color: Colors.black87),
-                                    shape: BoxShape.circle,
-                                  ),
-                                  child: const Icon(Icons.storefront, color: Colors.black87),
-                                ),
-                                const SizedBox(width: 14),
-                                Expanded(
-                                  child: Column(
-                                    crossAxisAlignment: CrossAxisAlignment.start,
-                                    children: [
-                                      const Text(
-                                        'BUSINESS NAME',
-                                        style: TextStyle(
-                                          fontSize: 10,
-                                          fontWeight: FontWeight.bold,
-                                          color: Colors.grey,
-                                          letterSpacing: 1.0,
-                                        ),
-                                      ),
-                                      const SizedBox(height: 4),
-                                      Text(
-                                        widget.businessName,
-                                        style: const TextStyle(
-                                          fontSize: 16,
-                                          fontWeight: FontWeight.bold,
-                                          color: Colors.black87,
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                )
-                              ],
                             ),
-
+                            const SizedBox(width: 14),
-                            // Divider line
+                            Expanded(
-                            Padding(
+                              child: Column(
-                              padding: const EdgeInsets.symmetric(vertical: 16.0),
+                                crossAxisAlignment: CrossAxisAlignment.start,
-                              child: Divider(color: Colors.grey[200]),
+                                children: [
-                            ),
+                                  const Text(
-
+                                    'BUSINESS NAME',
-                            // Row 2: Category type
+                                    style: TextStyle(
-                            Row(
+                                      fontSize: 10,
-                              children: [
+                                      fontWeight: FontWeight.bold,
-                                Container(
+                                      color: Colors.grey,
-                                  width: 44,
+                                      letterSpacing: 1.0,
-                                  height: 44,
+                                    ),
-                                  decoration: BoxDecoration(
-                                    color: Colors.grey[100],
-                                    shape: BoxShape.circle,
                                   ),
-                                  child: const Icon(Icons.category, color: Colors.black87),
+                                  const SizedBox(height: 4),
-                                ),
+                                  Text(
-                                const SizedBox(width: 14),
+                                    businessName,
-                                Expanded(
+                                    style: const TextStyle(
-                                  child: Column(
+                                      fontSize: 16,
-                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                      fontWeight: FontWeight.bold,
-                                    children: [
+                                      color: Colors.black87,
-                                      const Text(
+                                    ),
-                                        'BUSINESS TYPE',
-                                        style: TextStyle(
-                                          fontSize: 10,
-                                          fontWeight: FontWeight.bold,
-                                          color: Colors.grey,
-                                          letterSpacing: 1.0,
-                                        ),
-                                      ),
-                                      const SizedBox(height: 4),
-                                      Text(
-                                        categoryText,
-                                        style: const TextStyle(
-                                          fontSize: 14,
-                                          fontWeight: FontWeight.bold,
-                                          color: Colors.black87,
-                                        ),
-                                      ),
-                                    ],
                                   ),
-                                )
+                                ],
-                              ],
+                              ),
-                            ),
-                            Padding(
-                              padding: const EdgeInsets.symmetric(vertical: 16.0),
-                              child: Divider(color: Colors.grey[200]),
-                            ),
-                            Row(
-                              children: [
-                                Container(
-                                  width: 44,
-                                  height: 44,
-                                  decoration: BoxDecoration(
-                                    color: Colors.grey[100],
-                                    shape: BoxShape.circle,
-                                  ),
-                                  child: const Icon(Icons.settings, color: Colors.black87),
-                                ),
-                                const SizedBox(width: 14),
-                                Expanded(
-                                  child: Column(
-                                    crossAxisAlignment: CrossAxisAlignment.start,
-                                    children: [
-                                      const Text(
-                                        'ACTIVE CONFIGURATIONS',
-                                        style: TextStyle(
-                                          fontSize: 10,
-                                          fontWeight: FontWeight.bold,
-                                          color: Colors.grey,
-                                          letterSpacing: 1.0,
-                                        ),
-                                      ),
-                                      const SizedBox(height: 4),
-                                      Text(
-                                        [
-                                          if (widget.barcodeScanner) 'Barcode Enabled',
-                                          if (widget.kotManagement) 'KOT/Kitchen Order',
-                                          if (widget.inventoryAlerts) 'Low Stock Warnings',
-                                          if (!widget.barcodeScanner && !widget.kotManagement && !widget.inventoryAlerts) 'Standard Register',
-                                        ].join(', '),
-                                        style: const TextStyle(
-                                          fontSize: 14,
-                                          fontWeight: FontWeight.bold,
-                                          color: Colors.black87,
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                )
-                              ],
                             )
                           ],
                         ),
-                      ),
-                    ),
 
-                    const SizedBox(height: 24),
+                        // Divider line
+                        Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 16.0),
+                          child: Divider(color: Colors.grey[200]),
+                        ),
 
-                    // Primary Launcher CTA with Slide + Fade + Hover/Tap Scale micro-animations
+                        // Row 2: Category type
-                    AnimatedBuilder(
+                        Row(
-                      animation: _controller,
+                          children: [
-                      builder: (context, child) {
+                            Container(
-                        return Transform.translate(
+                              width: 44,
-                          offset: Offset(0.0, _btnSlideAnimation.value),
+                              height: 44,
-                          child: Opacity(
+                              decoration: BoxDecoration(
-                            opacity: _btnOpacityAnimation.value,
+                                color: Colors.grey[100],
-                            child: child,
+                                shape: BoxShape.circle,
-                          ),
-                        );
-                      },
-                      child: InteractiveScale(
-                        child: ElevatedButton(
-                          onPressed: () {
-                            AppFeedback.click();
-                            showTopAlert(
-                              context,
-                              'Launching Register Dashboard... Enjoy billing!',
-                              icon: Icons.rocket_launch_outlined,
-                            );
-                            Navigator.push(
-                              context,
-                              FadeSlidePageRoute(
-                                child: BillingDashboardScreen(
-                                  businessName: widget.businessName,
-                                  businessType: widget.businessType,
-                                  gstin: widget.gstin,
-                                  barcodeScanner: widget.barcodeScanner,
-                                  kotManagement: widget.kotManagement,
-                                  inventoryAlerts: widget.inventoryAlerts,
-                                ),
                               ),
-                            );
+                              child: const Icon(Icons.category, color: Colors.black87),
-                          },
-                          style: ElevatedButton.styleFrom(
-                            minimumSize: const Size.fromHeight(56),
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(16),
                             ),
-                          ),
+                            const SizedBox(width: 14),
-                          child: Row(
+                            Expanded(
-                            mainAxisAlignment: MainAxisAlignment.center,
+                              child: Column(
-                            children: const [
+                                crossAxisAlignment: CrossAxisAlignment.start,
-                              Icon(Icons.receipt, size: 20),
+                                children: [
-                              SizedBox(width: 8),
+                                  const Text(
-                              Text('Create Your First Bill'),
+                                    'BUSINESS TYPE',
-                            ],
+                                    style: TextStyle(
+                                      fontSize: 10,
+                                      fontWeight: FontWeight.bold,
+                                      color: Colors.grey,
+                                      letterSpacing: 1.0,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 4),
+                                  Text(
+                                    categoryText,
+                                    style: const TextStyle(
+                                      fontSize: 14,
+                                      fontWeight: FontWeight.bold,
+                                      color: Colors.black87,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            )
+                          ],
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 16.0),
+                          child: Divider(color: Colors.grey[200]),
+                        ),
+                        Row(
+                          children: [
+                            Container(
+                              width: 44,
+                              height: 44,
+                              decoration: BoxDecoration(
+                                color: Colors.grey[100],
+                                shape: BoxShape.circle,
+                              ),
+                              child: const Icon(Icons.settings, color: Colors.black87),
+                            ),
+                            const SizedBox(width: 14),
+                            Expanded(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  const Text(
+                                    'ACTIVE CONFIGURATIONS',
+                                    style: TextStyle(
+                                      fontSize: 10,
+                                      fontWeight: FontWeight.bold,
+                                      color: Colors.grey,
+                                      letterSpacing: 1.0,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 4),
+                                  Text(
+                                    [
+                                      if (barcodeScanner) 'Barcode Enabled',
+                                      if (kotManagement) 'KOT/Kitchen Order',
+                                      if (inventoryAlerts) 'Low Stock Warnings',
+                                      if (!barcodeScanner && !kotManagement && !inventoryAlerts) 'Standard Register',
+                                    ].join(', '),
+                                    style: const TextStyle(
+                                      fontSize: 14,
+                                      fontWeight: FontWeight.bold,
+                                      color: Colors.black87,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            )
+                          ],
+                        )
+                      ],
+                    ),
+                  ),
+
+                  const SizedBox(height: 24),
+
+                  // Primary Launcher CTA
+                  ElevatedButton(
+                    onPressed: () {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        const SnackBar(
+                          content: Text('⚡ Launching Register Dashboard... Enjoy billing!'),
+                          behavior: SnackBarBehavior.floating,
+                          backgroundColor: Colors.green,
+                          duration: Duration(milliseconds: 1500),
+                        ),
+                      );
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (context) => BillingDashboardScreen(
+                            businessName: businessName,
+                            businessType: businessType,
+                            gstin: gstin,
+                            barcodeScanner: barcodeScanner,
+                            kotManagement: kotManagement,
+                            inventoryAlerts: inventoryAlerts,
                           ),
                         ),
+                      );
+                    },
+                    style: ElevatedButton.styleFrom(
+                      minimumSize: const Size.fromHeight(56),
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(8),
                       ),
                     ),
-                    const SizedBox(height: 24),
+                    child: Row(
-                  ],
+                      mainAxisAlignment: MainAxisAlignment.center,
-                ),
+                      children: const [
+                        Icon(Icons.receipt, size: 20),
+                        SizedBox(width: 8),
+                        Text('Create Your First Bill'),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(height: 24),
+                ],
               ),
             ),
           ),
         ),
       ),
-    );
+    ),
-  }
+  );
+}
 }

flutter_app/lib/theme.dart

@@ -122,7 +122,7 @@ class PozoTheme {
           minimumSize: const Size.fromHeight(54),
           elevation: 2,
           shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(16),
+            borderRadius: BorderRadius.circular(8),
           ),
           textStyle: GoogleFonts.plusJakartaSans(
             fontSize: 16,

flutter_app/pubspec.lock

@@ -1,22 +1,6 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.9"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.7.0"
   async:
     dependency: transitive
     description:
@@ -25,62 +9,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.13.0"
-  audioplayers:
-    dependency: "direct main"
-    description:
-      name: audioplayers
-      sha256: c05c6147124cd63e725e861335a8b4d57300b80e6e92cea7c145c739223bbaef
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.2.1"
-  audioplayers_android:
-    dependency: transitive
-    description:
-      name: audioplayers_android
-      sha256: b00e1a0e11365d88576320ec2d8c192bc21f1afb6c0e5995d1c57ae63156acb5
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.3"
-  audioplayers_darwin:
-    dependency: transitive
-    description:
-      name: audioplayers_darwin
-      sha256: "3034e99a6df8d101da0f5082dcca0a2a99db62ab1d4ddb3277bed3f6f81afe08"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.2"
-  audioplayers_linux:
-    dependency: transitive
-    description:
-      name: audioplayers_linux
-      sha256: "60787e73fefc4d2e0b9c02c69885402177e818e4e27ef087074cf27c02246c9e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  audioplayers_platform_interface:
-    dependency: transitive
-    description:
-      name: audioplayers_platform_interface
-      sha256: "365c547f1bb9e77d94dd1687903a668d8f7ac3409e48e6e6a3668a1ac2982adb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.0"
-  audioplayers_web:
-    dependency: transitive
-    description:
-      name: audioplayers_web
-      sha256: "22cd0173e54d92bd9b2c80b1204eb1eb159ece87475ab58c9788a70ec43c2a62"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.0"
-  audioplayers_windows:
-    dependency: transitive
-    description:
-      name: audioplayers_windows
-      sha256: "9536812c9103563644ada2ef45ae523806b0745f7a78e89d1b5fb1951de90e1a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -97,22 +25,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
-  checked_yaml:
-    dependency: transitive
-    description:
-      name: checked_yaml
-      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.4"
-  cli_util:
-    dependency: transitive
-    description:
-      name: cli_util
-      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -129,14 +41,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
-  cross_file:
-    dependency: transitive
-    description:
-      name: cross_file
-      sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.5+2"
   crypto:
     dependency: transitive
     description:
@@ -153,30 +57,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
-  dbus:
-    dependency: transitive
-    description:
-      name: dbus
-      sha256: "0ce9b0a839e6dee59a37a623d2fc26a35bbbe6404213e419b0d6411023d62645"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.14"
-  device_info_plus:
-    dependency: transitive
-    description:
-      name: device_info_plus
-      sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.5.0"
-  device_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: device_info_plus_platform_interface
-      sha256: e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.3"
   fake_async:
     dependency: transitive
     description:
@@ -193,83 +73,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  file_selector_linux:
-    dependency: transitive
-    description:
-      name: file_selector_linux
-      sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.4"
-  file_selector_macos:
-    dependency: transitive
-    description:
-      name: file_selector_macos
-      sha256: "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.4+4"
-  file_selector_platform_interface:
-    dependency: transitive
-    description:
-      name: file_selector_platform_interface
-      sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.7.0"
-  file_selector_windows:
-    dependency: transitive
-    description:
-      name: file_selector_windows
-      sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.3+5"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_contacts:
-    dependency: "direct main"
-    description:
-      name: flutter_contacts
-      sha256: "388d32cd33f16640ee169570128c933b45f3259bddbfae7a100bb49e5ffea9ae"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.9+2"
-  flutter_haptic_feedback:
-    dependency: "direct main"
-    description:
-      name: flutter_haptic_feedback
-      sha256: e6a1ac6b5119c9b0964e4de2eaa6bfb66facedc6e33bfe2a902da3f6f9666499
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  flutter_launcher_icons:
-    dependency: "direct dev"
-    description:
-      name: flutter_launcher_icons
-      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.13.1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -278,120 +86,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.2"
-  flutter_plugin_android_lifecycle:
-    dependency: transitive
-    description:
-      name: flutter_plugin_android_lifecycle
-      sha256: c2fe1001710127dfa7da89977a08d591398370d099aacdaa6d44da7eb14b8476
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.31"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  geoclue:
-    dependency: transitive
-    description:
-      name: geoclue
-      sha256: c2a998c77474fc57aa00c6baa2928e58f4b267649057a1c76738656e9dbd2a7f
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.1"
-  geocoding:
-    dependency: "direct main"
-    description:
-      name: geocoding
-      sha256: "606be036287842d779d7ec4e2f6c9435fc29bbbd3c6da6589710f981d8852895"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
-  geocoding_android:
-    dependency: transitive
-    description:
-      name: geocoding_android
-      sha256: ba810da90d6633cbb82bbab630e5b4a3b7d23503263c00ae7f1ef0316dcae5b9
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.1"
-  geocoding_ios:
-    dependency: transitive
-    description:
-      name: geocoding_ios
-      sha256: "18ab1c8369e2b0dcb3a8ccc907319334f35ee8cf4cfef4d9c8e23b13c65cb825"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  geocoding_platform_interface:
-    dependency: transitive
-    description:
-      name: geocoding_platform_interface
-      sha256: "8c2c8226e5c276594c2e18bfe88b19110ed770aeb7c1ab50ede570be8b92229b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.0"
-  geolocator:
-    dependency: "direct main"
-    description:
-      name: geolocator
-      sha256: "79939537046c9025be47ec645f35c8090ecadb6fe98eba146a0d25e8c1357516"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.0.2"
-  geolocator_android:
-    dependency: transitive
-    description:
-      name: geolocator_android
-      sha256: "179c3cb66dfa674fc9ccbf2be872a02658724d1c067634e2c427cf6df7df901a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.2"
-  geolocator_apple:
-    dependency: transitive
-    description:
-      name: geolocator_apple
-      sha256: dbdd8789d5aaf14cf69f74d4925ad1336b4433a6efdf2fce91e8955dc921bf22
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.13"
-  geolocator_linux:
-    dependency: transitive
-    description:
-      name: geolocator_linux
-      sha256: d64112a205931926f4363bb6bd48f14cb38e7326833041d170615586cd143797
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.4"
-  geolocator_platform_interface:
-    dependency: transitive
-    description:
-      name: geolocator_platform_interface
-      sha256: dde05dae7d584db6e82feb87dd9fb0b4b4c83ed68065667b4bef637be38e13a7
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.7"
-  geolocator_web:
-    dependency: transitive
-    description:
-      name: geolocator_web
-      sha256: b1ae9bdfd90f861fde8fd4f209c37b953d65e92823cb73c7dee1fa021b06f172
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.3"
-  geolocator_windows:
-    dependency: transitive
-    description:
-      name: geolocator_windows
-      sha256: "175435404d20278ffd220de83c2ca293b73db95eafbdc8131fe8609be1421eb6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.5"
   google_fonts:
     dependency: "direct main"
     description:
@@ -400,14 +99,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.1.0"
-  gsettings:
-    dependency: transitive
-    description:
-      name: gsettings
-      sha256: "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.8"
   http:
     dependency: transitive
     description:
@@ -424,94 +115,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      sha256: f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.8.0"
-  image_picker:
-    dependency: "direct main"
-    description:
-      name: image_picker
-      sha256: "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  image_picker_android:
-    dependency: transitive
-    description:
-      name: image_picker_android
-      sha256: "28f3987ca0ec702d346eae1d90eda59603a2101b52f1e234ded62cff1d5cfa6e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.8.13+1"
-  image_picker_for_web:
-    dependency: transitive
-    description:
-      name: image_picker_for_web
-      sha256: "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
-  image_picker_ios:
-    dependency: transitive
-    description:
-      name: image_picker_ios
-      sha256: eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.8.13"
-  image_picker_linux:
-    dependency: transitive
-    description:
-      name: image_picker_linux
-      sha256: "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2"
-  image_picker_macos:
-    dependency: transitive
-    description:
-      name: image_picker_macos
-      sha256: d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2"
-  image_picker_platform_interface:
-    dependency: transitive
-    description:
-      name: image_picker_platform_interface
-      sha256: "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.1"
-  image_picker_windows:
-    dependency: transitive
-    description:
-      name: image_picker_windows
-      sha256: d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
-  json_annotation:
-    dependency: transitive
-    description:
-      name: json_annotation
-      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -568,38 +171,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.16.0"
-  mime:
-    dependency: transitive
-    description:
-      name: mime
-      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  mobile_number:
-    dependency: "direct main"
-    description:
-      name: mobile_number
-      sha256: "8dc5b7a19193f7a41fa07aa933c8db8085033e6201b20323f20e4d283ea2a9a8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  package_info_plus:
-    dependency: transitive
-    description:
-      name: package_info_plus
-      sha256: "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.0.1"
-  package_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: package_info_plus_platform_interface
-      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.1"
   path:
     dependency: transitive
     description:
@@ -656,62 +227,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
-  permission_handler:
-    dependency: "direct main"
-    description:
-      name: permission_handler
-      sha256: fe54465bcc62a4564c6e4db337bbaded6c0c0fa6e10487414436d163114784f6
-      url: "https://pub.dev"
-    source: hosted
-    version: "12.0.3"
-  permission_handler_android:
-    dependency: transitive
-    description:
-      name: permission_handler_android
-      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "13.0.1"
-  permission_handler_apple:
-    dependency: transitive
-    description:
-      name: permission_handler_apple
-      sha256: e20daf680eef1ca62ffe8c8c526b778cc386d50137c77ac71c8ec9c88c13fb9d
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.4.9"
-  permission_handler_html:
-    dependency: transitive
-    description:
-      name: permission_handler_html
-      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3+5"
-  permission_handler_platform_interface:
-    dependency: transitive
-    description:
-      name: permission_handler_platform_interface
-      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.0"
-  permission_handler_windows:
-    dependency: transitive
-    description:
-      name: permission_handler_windows
-      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.2"
   platform:
     dependency: transitive
     description:
@@ -728,14 +243,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
-  posix:
-    dependency: transitive
-    description:
-      name: posix
-      sha256: "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.5.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -773,14 +280,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
-  synchronized:
-    dependency: transitive
-    description:
-      name: synchronized
-      sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.0"
   term_glyph:
     dependency: transitive
     description:
@@ -805,78 +304,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
-  url_launcher:
-    dependency: "direct main"
-    description:
-      name: url_launcher
-      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.3.2"
-  url_launcher_android:
-    dependency: transitive
-    description:
-      name: url_launcher_android
-      sha256: "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.3.20"
-  url_launcher_ios:
-    dependency: transitive
-    description:
-      name: url_launcher_ios
-      sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.3.4"
-  url_launcher_linux:
-    dependency: transitive
-    description:
-      name: url_launcher_linux
-      sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.2"
-  url_launcher_macos:
-    dependency: transitive
-    description:
-      name: url_launcher_macos
-      sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.3"
-  url_launcher_platform_interface:
-    dependency: transitive
-    description:
-      name: url_launcher_platform_interface
-      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.2"
-  url_launcher_web:
-    dependency: transitive
-    description:
-      name: url_launcher_web
-      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  url_launcher_windows:
-    dependency: transitive
-    description:
-      name: url_launcher_windows
-      sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.5"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.5.3"
   vector_math:
     dependency: transitive
     description:
@@ -885,22 +312,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  vibration:
-    dependency: "direct main"
-    description:
-      name: vibration
-      sha256: "9bb06614c69260f8bd11c80fe01ed7988905cf00e3417d656c2647e41f261d87"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.8"
-  vibration_platform_interface:
-    dependency: transitive
-    description:
-      name: vibration_platform_interface
-      sha256: "258c273268f8aa40c88d29741137c536874a738779b92ddb8aa32ed093721ec5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2"
   vm_service:
     dependency: transitive
     description:
@@ -917,22 +328,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.15.0"
-  win32_registry:
-    dependency: transitive
-    description:
-      name: win32_registry
-      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -941,22 +336,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.6.1"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
 sdks:
-  dart: ">=3.8.0 <4.0.0"
+  dart: ">=3.7.0 <4.0.0"
-  flutter: ">=3.32.0"
+  flutter: ">=3.29.0"

flutter_app/pubspec.yaml

@@ -10,33 +10,11 @@ dependencies:
     sdk: flutter
   cupertino_icons: ^1.0.5
   google_fonts: ^5.1.0
-  image_picker: ^1.2.1
-  permission_handler: ^12.0.3
-  flutter_contacts: ^1.1.9
-  geolocator: ^14.0.2
-  geocoding: ^4.0.0
-  url_launcher: ^6.3.2
-  mobile_number: ^3.0.0
-  vibration: ^3.1.8
-  audioplayers: ^5.2.1
-  flutter_haptic_feedback: ^1.0.1
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^3.0.0
-  flutter_launcher_icons: ^0.13.1
-
-flutter_launcher_icons:
-  android: "launcher_icon"
-  ios: true
-  image_path: "assets/logo/pozo_logo_padded.png"
-  remove_alpha_ios: true
-  adaptive_icon_background: "#d2242e"
-  adaptive_icon_foreground: "assets/logo/pozo_logo_foreground.png"
 
 flutter:
   uses-material-design: true
-  assets:
-    - assets/logo/
-    - assets/sounds/