feat: update theme toggle implementation to require BuildContext for AdaptiveTheme support

Author: gopi2401

IMPLEMENTATION_GUIDE.md

@@ -36,7 +36,8 @@ Improved the existing `adaptive_theme` implementation with smooth transitions an
 ```dart
 // Toggle theme
 final themeService = ThemeService.to;
-await themeService.toggleTheme();
+// supply a BuildContext so AdaptiveTheme can be toggled as well
+await themeService.toggleTheme(context);
 
 // Check current theme
 bool isDark = ThemeService.to.isDarkMode.value;

QUICK_REFERENCE.md

@@ -12,8 +12,8 @@
 // Get the service
 final themeService = ThemeService.to;
 
-// Toggle theme
-await themeService.toggleTheme();
+// Toggle theme (requires a BuildContext when using AdaptiveTheme)
+await themeService.toggleTheme(context);
 
 // Check current theme
 if (themeService.isDarkMode.value) {

README_NEW_FEATURES.md

@@ -187,7 +187,9 @@ RecoveryScreen
 
 ### Theme Toggle
 ```dart
-ThemeService.to.toggleTheme();
+// pass a BuildContext so that the underlying AdaptiveTheme
+// instance can be updated as well as the stored flag.
+ThemeService.to.toggleTheme(context);
 ```
 
 ### Show Progress

android/app/src/main/kotlin/com/example/insta/MainActivity.kt

@@ -26,6 +26,20 @@ class MainActivity : FlutterActivity() {
         }
     }
 
+    // If the app is already running and a new share intent arrives,
+    // forward it to the same handler so Dart receives the shared text.
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        val action = intent.action
+        val type = intent.type
+        if (Intent.ACTION_SEND == action && type != null) {
+            if ("text/plain" == type) {
+                handleSendText(intent)
+            }
+        }
+    }
+
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
 

lib/main.dart

@@ -168,6 +168,43 @@ class MyHomePageState extends State<MyHomePage> {
     appUpdate();
   }
 
+  /// Centralises download-button logic so the build method stays clean.
+  Future<void> _onDownloadPressed() async {
+    setState(() {
+      downloading = true;
+      errorMessage = null;
+    });
+
+    try {
+      final url = reelController.text.trim();
+      if (url.isEmpty) {
+        setState(() {
+          errorMessage = 'URL cannot be empty';
+        });
+        showToast();
+      } else {
+        final uri = Uri.tryParse(url);
+        if (uri == null || !uri.hasAbsolutePath) {
+          setState(() {
+            errorMessage = 'Please enter a valid URL';
+          });
+          showToast();
+        } else {
+          downloadController = Get.put(DistribUrl());
+          contexts = context;
+          await downloadController.handleUrl(url);
+          reelController.clear();
+        }
+      }
+    } catch (e, stackTrace) {
+      catchInfo(e, stackTrace);
+    } finally {
+      setState(() {
+        downloading = false;
+      });
+    }
+  }
+
   appUpdate() async {
     var appVersion = await getAppVersion();
     var newVersion = await checkUpdate();
@@ -242,81 +279,65 @@ class MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(leading: const DrawerButton()),
-      body: Center(
+      appBar: AppBar(
+        leading: const DrawerButton(),
+        title: const Text('Instagram Downloader'),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: <Widget>[
-            downloading ? const CupertinoActivityIndicator() : Container(),
-            Padding(
-              padding: const EdgeInsets.all(20.0),
-              child: TextField(
-                controller: reelController,
-                decoration: const InputDecoration(hintText: "Url"),
-              ),
+            const SizedBox(height: 8),
+            Text(
+              'Paste an Instagram URL below and tap download',
+              style: Theme.of(context).textTheme.titleMedium,
+              textAlign: TextAlign.center,
             ),
-            if (errorMessage != null)
-              Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: Text(
-                  errorMessage!,
-                  style: const TextStyle(color: Colors.red),
+            const SizedBox(height: 16),
+            TextField(
+              controller: reelController,
+              decoration: InputDecoration(
+                labelText: 'Instagram URL',
+                border: const OutlineInputBorder(),
+                hintText: 'https://www.instagram.com/p/xyz',
+                errorText: errorMessage,
+                suffixIcon: IconButton(
+                  icon: const Icon(Icons.clear),
+                  onPressed: () => reelController.clear(),
                 ),
               ),
-            ElevatedButton(
-              child: downloading
-                  ? const CircularProgressIndicator(color: Colors.white)
-                  : const Text('Download'),
-              onPressed: () async {
-                if (!downloading) {
-                  try {
-                    setState(() {
-                      downloading = true;
-                      errorMessage = null;
-                    });
-                    var url = reelController.text.trim();
-                    if (url.isNotEmpty) {
-                      final Uri uri = Uri.parse(url);
-                      if (uri.hasAbsolutePath) {
-                        downloadController = Get.put(DistribUrl());
-                        contexts = context;
-                        await downloadController.handleUrl(url);
-                        reelController.clear();
-                        setState(() {
-                          downloading = false;
-                        });
-                      } else {
-                        setState(() {
-                          downloading = false;
-                          errorMessage = "Please enter valid url";
-                        });
-                        showToast();
-                      }
-                    } else {
-                      setState(() {
-                        downloading = false;
-                        errorMessage = "url not found!. please enter url";
-                      });
-                      showToast();
-                    }
-                  } catch (e, stackTrace) {
-                    setState(() {
-                      downloading = false;
-                    });
-                    catchInfo(e, stackTrace);
-                  }
-                }
-              },
             ),
-            TextButton(
+            const SizedBox(height: 20),
+            ElevatedButton.icon(
+              icon: downloading
+                  ? const SizedBox(
+                      width: 18,
+                      height: 18,
+                      child: CircularProgressIndicator(
+                        color: Colors.white,
+                        strokeWidth: 2,
+                      ),
+                    )
+                  : const Icon(Icons.download),
+              label: Text(downloading ? 'Downloading...' : 'Download'),
+              style: ElevatedButton.styleFrom(
+                padding: const EdgeInsets.symmetric(vertical: 14),
+              ),
+              onPressed: downloading ? null : _onDownloadPressed,
+            ),
+            const SizedBox(height: 12),
+            TextButton.icon(
+              icon: const Icon(Icons.login),
+              label: const Text('Login to Instagram'),
               onPressed: () {
                 Navigator.push(
                   context,
                   MaterialPageRoute(builder: (context) => const InstaLogin()),
                 );
               },
-              child: const Text('Login'),
             ),
+            const Spacer(),
             const Additional(),
           ],
         ),
@@ -436,7 +457,9 @@ class DrawerWidget extends StatelessWidget {
                     ),
                   ),
                   onTap: () {
-                    themeService.toggleTheme();
+                    // keep service state in sync and let AdaptiveTheme
+                    // actually switch the UI
+                    themeService.toggleTheme(context);
                   },
                 ),
               ],

lib/services/distrib_url.dart

@@ -10,43 +10,74 @@ class DistribUrl extends GetxController {
 
   handleUrl(String url) async {
     try {
+      // If the incoming text contains other words (e.g. "Check this out: https://..."),
+      // extract the first http(s) URL found. Fall back to the original string if none.
+      final urlMatch = RegExp(r'https?://[^\s]+').firstMatch(url);
+      final incoming = urlMatch != null ? urlMatch.group(0)!.trim() : url.trim();
+
       // Instagram URL patterns
-      RegExp ins = RegExp(r'instagram.com');
-      bool isInstagram = ins.hasMatch(url);
+      final isInstagram = RegExp(r'instagram\.com|instagr\.am', caseSensitive: false)
+          .hasMatch(incoming);
 
-      // YouTube URL patterns
-      RegExp you = RegExp(r'youtube.com');
-      RegExp youm = RegExp(r'youtu.be');
-      bool isYouTube = you.hasMatch(url);
-      bool isYouTubeShort = youm.hasMatch(url);
+        // YouTube URL patterns (check the extracted incoming text)
+        final isYouTube = RegExp(r'youtube\.com|youtube\.googleapis|youtu\.be|youtube',
+            caseSensitive: false)
+          .hasMatch(incoming);
+        final isYouTubeShort = RegExp(r'youtu\.be|/shorts/', caseSensitive: false)
+          .hasMatch(incoming);
 
       if (isInstagram) {
         instaController = Get.put(InstaDownloadController());
-        var segments = url.split("/");
-        if (segments.length > 3) {
-          var option = segments[3];
-          if (option == 'p' || option == 'reel') {
-            await instaController.downloadReal(url, null);
-            instaController.onClose();
-          } else if (option == 'stories' && segments.length > 5) {
-            if (segments[4] == 'highlights') {
-              await instaController.highlight(segments[5]);
+        final uri = Uri.tryParse(incoming);
+        if (uri != null) {
+          final segments = uri.pathSegments;
+
+          // Find which Instagram resource this URL points to
+          if (segments.isNotEmpty) {
+            // common: /p/{shortcode}/ or /reel/{shortcode}/
+            final first = segments[0].toLowerCase();
+            if (first == 'p' || first == 'reel') {
+              await instaController.downloadReal(incoming, null);
               instaController.onClose();
+            } else if (first == 'stories' && segments.length >= 3) {
+              // /stories/{username}/{storyId}
+              final userId = segments[1];
+              final storyId = segments[2];
+              final idMatch = RegExp(r'^(\d+)').firstMatch(storyId);
+              if (idMatch != null) {
+                await instaController.stories(userId, idMatch.group(0)!);
+                instaController.onClose();
+              }
+            } else if (segments.contains('highlights')) {
+              // /stories/highlights/{highlightId} or /{username}/highlights/{id}
+              final idx = segments.indexOf('highlights');
+              if (idx + 1 < segments.length) {
+                final highlightId = segments[idx + 1];
+                await instaController.highlight(highlightId);
+                instaController.onClose();
+              }
             } else {
-              var userId = segments[4];
-              var storyId = segments[5];
-              RegExp regExp = RegExp(r'^(\d+)');
-              var match = regExp.firstMatch(storyId);
-              if (match != null) {
-                await instaController.stories(userId, match.group(0)!);
+              // fallback: try to detect shortcode in the path and attempt download
+              // e.g. instagram.com/{username}/p/{shortcode} or embedded links
+              if (incoming.contains('/p/') || incoming.contains('/reel/')) {
+                await instaController.downloadReal(incoming, null);
                 instaController.onClose();
               }
             }
           }
+        } else {
+          // If parsing failed, attempt naive match for /p/ or /reel/ in the raw text
+          if (incoming.contains('/p/') || incoming.contains('/reel/')) {
+            instaController = Get.put(InstaDownloadController());
+            await instaController.downloadReal(incoming, null);
+            instaController.onClose();
+          }
         }
       } else if (isYouTube || isYouTubeShort) {
         ytController = Get.put(YTDownloadController());
-        ytController.youtube(url);
+        // pass the cleaned/extracted URL (incoming) so short links and embedded
+        // text are handled correctly by the YouTube downloader
+        await ytController.youtube(incoming);
       }
     } catch (e, stackTrace) {
       catchInfo(e, stackTrace);

lib/services/theme_service.dart

@@ -1,5 +1,7 @@
+import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
+import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class ThemeService extends GetxService {
@@ -24,10 +26,25 @@ class ThemeService extends GetxService {
     _isDarkMode.value = savedTheme;
   }
 
-  Future<void> toggleTheme() async {
+  /// Flip the saved boolean and then update both the
+  /// stored preference and the visible theme.  When the app is
+  /// wrapped in `AdaptiveTheme` we also need to drive that
+  /// mechanism; previously we relied on `Get.changeTheme` which
+  /// had no effect because `MaterialApp` was not a
+  /// `GetMaterialApp`.
+  ///
+  /// A [BuildContext] is required so that we can look up the
+  /// `AdaptiveTheme` instance and call its helpers.
+  Future<void> toggleTheme(BuildContext context) async {
     _isDarkMode.toggle();
     await _prefs.setBool('isDarkMode', _isDarkMode.value);
-    Get.changeTheme(_isDarkMode.value ? darkTheme : lightTheme);
+
+    // update AdaptiveTheme so the change is visible and persisted
+    if (_isDarkMode.value) {
+      AdaptiveTheme.of(context).setDark();
+    } else {
+      AdaptiveTheme.of(context).setLight();
+    }
   }
 
   ThemeData get lightTheme {