fix: nfc scan

ezeanyimhenry · Jul 31, 2024 · 12bf0b1 · 12bf0b1
1 parent 86d972c
commit 12bf0b1
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 13 deletions.
diff --git a/lib/notifier/nfc_notifier.dart b/lib/notifier/nfc_notifier.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:nfc_app/notifier/nfc_broadcast_receiver.dart';
+import 'package:nfc_app/presentation/screens/home.dart';
 import 'package:nfc_app/presentation/screens/translate/translate_screen.dart';
 import 'package:nfc_app/presentation/widgets/app_bottom_sheet.dart';
 import 'package:nfc_app/presentation/widgets/circle_progress_indicator.dart';
@@ -54,7 +55,8 @@ class NFCNotifier extends ChangeNotifier {
             if (nfcOperation == NFCOperation.read) {
               await _readFromTag(tag: nfcTag, context: context);
             } else if (nfcOperation == NFCOperation.write) {
-              await _writeToTag(nfcTag: nfcTag, content: content);
+              await _writeToTag(
+                  nfcTag: nfcTag, content: content, context: context);
               _message = "DONE";
             }
 
@@ -144,9 +146,36 @@ class NFCNotifier extends ChangeNotifier {
   Future<void> _writeToTag({
     required NfcTag nfcTag,
     required String content,
+    required BuildContext context,
   }) async {
     NdefMessage message = _createNdefMessage(content: content);
     await Ndef.from(nfcTag)?.write(message);
+    showModalBottomSheet(
+      isDismissible: false,
+      context: context,
+      builder: (context) {
+        return SizedBox(
+          height: MediaQuery.of(context).size.height * 0.4,
+          child: AppBottomsheet(
+            hasPrimaryButton: true,
+            primaryButtonText: "Continue",
+            primaryButtonOnTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => HomeScreen(initialIndex: 0),
+                ),
+              );
+            },
+            message: "",
+            title: "Write Successful!",
+            centerContent: const ProgressIndicatorWithText(
+              progress: 1.0,
+            ),
+          ),
+        );
+      },
+    );
   }
 
   NdefMessage _createNdefMessage({required String content}) {
@@ -157,7 +186,7 @@ class NFCNotifier extends ChangeNotifier {
     _isProcessing = false;
     _message = error.toString();
     notifyListeners();
-    NfcManager.instance.stopSession(); // Ensure session is stopped
+    NfcManager.instance.stopSession();
   }
 }
 

diff --git a/lib/presentation/screens/home.dart b/lib/presentation/screens/home.dart
@@ -9,7 +9,10 @@ import '../../notifier/bottom_nav.dart';
 import 'read-nfc/read_nfc_screen.dart';
 
 class HomeScreen extends StatelessWidget {
-  const HomeScreen({super.key});
+  const HomeScreen({super.key, this.initialIndex = 0});
+
+  final int initialIndex;
+
   final List<Widget> _screens = const [
     ReadNFCScreen(),
     TextRecordScreen(),
@@ -18,13 +21,16 @@ class HomeScreen extends StatelessWidget {
   ];
   @override
   Widget build(BuildContext context) {
-    return Scaffold(body: Consumer<BottomNavigationProvider>(
-      builder: (context, provider, child) {
-        return _screens[provider.currentIndex];
-      },
-    ), bottomNavigationBar:
-        Consumer<BottomNavigationProvider>(builder: (context, provider, child) {
-      return AppBottomNav(selectedindex: provider.currentIndex);
-    }));
+    return ChangeNotifierProvider(
+      create: (context) => BottomNavigationProvider()..setIndex(initialIndex),
+      child: Scaffold(body: Consumer<BottomNavigationProvider>(
+        builder: (context, provider, child) {
+          return _screens[provider.currentIndex];
+        },
+      ), bottomNavigationBar: Consumer<BottomNavigationProvider>(
+          builder: (context, provider, child) {
+        return AppBottomNav(selectedindex: provider.currentIndex);
+      })),
+    );
   }
 }
diff --git a/lib/presentation/screens/read-nfc/read_nfc_screen.dart b/lib/presentation/screens/read-nfc/read_nfc_screen.dart
@@ -23,7 +23,7 @@ class ReadNFCScreen extends StatefulWidget {
 }
 
 class _ReadNFCScreenState extends State<ReadNFCScreen> {
-  bool _nfcEnabled = false;
+  bool _nfcEnabled = true;
   @override
   void initState() {
     super.initState();
@@ -89,6 +89,16 @@ class _ReadNFCScreenState extends State<ReadNFCScreen> {
                     ),
                   ),
                 ),
+                Visibility(
+                  visible: !_nfcEnabled,
+                  child: SizedBox(
+                    width: MediaQuery.sizeOf(context).width * 0.6,
+                    child: InactiveButton(
+                      onTap: () {},
+                      text: 'Scan NFC tag',
+                    ),
+                  ),
+                ),
                 const YGap(),
                 Text(
                   _nfcEnabled

diff --git a/lib/presentation/widgets/circle_progress_indicator.dart b/lib/presentation/widgets/circle_progress_indicator.dart
@@ -15,7 +15,7 @@ class ProgressIndicatorWithText extends StatefulWidget {
 }
 
 class ProgressIndicatorWithTextState extends State<ProgressIndicatorWithText> {
-  double _progress = 0.5;
+  double _progress = 1.0;
 
   void updateProgress(double progress) {
     setState(() {