commit beead5d51ce4c7e071b5b053c1b29182a5b45d6d · bretton.dev/coves-mobile

+61 -36

lib/main.dart

···

       2
       2
        
       import 'package:flutter/material.dart';

     

       3
       3
        
       import 'package:go_router/go_router.dart';

     

       4
       4
        
       import 'package:provider/provider.dart';

     

       5
       5
       -
       import 'package:atproto_oauth_flutter/atproto_oauth_flutter.dart';

     

       6
       5
        
       import 'screens/landing_screen.dart';

     

       7
       6
        
       import 'screens/auth/login_screen.dart';

     

       8
       7
        
       import 'screens/home/feed_screen.dart';

     
···

       29
       28
        
       

     

       30
       29
        
         @override

     

       31
       30
        
         Widget build(BuildContext context) {

     

       31
       31
       +
           final authProvider = Provider.of<AuthProvider>(context, listen: false);

     

       32
       32
       +
       

     

       32
       33
        
           return MaterialApp.router(

     

       33
       34
        
             title: 'Coves',

     

       34
       35
        
             theme: ThemeData(

     
···

       38
       39
        
               ),

     

       39
       40
        
               useMaterial3: true,

     

       40
       41
        
             ),

     

       41
       41
       -
             routerConfig: _router,

     

       42
       42
       +
             routerConfig: _createRouter(authProvider),

     

       42
       43
        
             debugShowCheckedModeBanner: false,

     

       43
       44
        
           );

     

       44
       45
        
         }

     

       45
       46
        
       }

     

       46
       47
        
       

     

       47
       47
       -
       // GoRouter configuration

     

       48
       48
       -
       final _router = GoRouter(

     

       49
       49
       -
         routes: [

     

       50
       50
       -
           GoRoute(

     

       51
       51
       -
             path: '/',

     

       52
       52
       -
             builder: (context, state) => const LandingScreen(),

     

       53
       53
       -
           ),

     

       54
       54
       -
           GoRoute(

     

       55
       55
       -
             path: '/login',

     

       56
       56
       -
             builder: (context, state) => const LoginScreen(),

     

       57
       57
       -
           ),

     

       58
       58
       -
           GoRoute(

     

       59
       59
       -
             path: '/feed',

     

       60
       60
       -
             builder: (context, state) => const FeedScreen(),

     

       61
       61
       -
           ),

     

       62
       62
       -
         ],

     

       63
       63
       -
         // No custom redirect - let errorBuilder handle OAuth callbacks

     

       64
       64
       -
         errorBuilder: (context, state) {

     

       65
       65
       -
           // Check if this is an OAuth callback

     

       66
       66
       -
           if (state.uri.scheme == OAuthConfig.customScheme) {

     

       67
       67
       -
             if (kDebugMode) {

     

       68
       68
       -
               print('⚠️ OAuth callback in errorBuilder - flutter_web_auth_2 should handle it');

     

       69
       69
       -
               print('   URI: ${state.uri}');

     

       48
       48
       +
       // GoRouter configuration factory

     

       49
       49
       +
       GoRouter _createRouter(AuthProvider authProvider) {

     

       50
       50
       +
         return GoRouter(

     

       51
       51
       +
           routes: [

     

       52
       52
       +
             GoRoute(

     

       53
       53
       +
               path: '/',

     

       54
       54
       +
               builder: (context, state) => const LandingScreen(),

     

       55
       55
       +
             ),

     

       56
       56
       +
             GoRoute(

     

       57
       57
       +
               path: '/login',

     

       58
       58
       +
               builder: (context, state) => const LoginScreen(),

     

       59
       59
       +
             ),

     

       60
       60
       +
             GoRoute(

     

       61
       61
       +
               path: '/feed',

     

       62
       62
       +
               builder: (context, state) => const FeedScreen(),

     

       63
       63
       +
             ),

     

       64
       64
       +
           ],

     

       65
       65
       +
           refreshListenable: authProvider,

     

       66
       66
       +
           redirect: (context, state) {

     

       67
       67
       +
             final isAuthenticated = authProvider.isAuthenticated;

     

       68
       68
       +
             final isLoading = authProvider.isLoading;

     

       69
       69
       +
             final currentPath = state.uri.path;

     

       70
       70
       +
       

     

       71
       71
       +
             // Don't redirect while loading initial auth state

     

       72
       72
       +
             if (isLoading) {

     

       73
       73
       +
               return null;

     

       74
       74
       +
             }

     

       75
       75
       +
       

     

       76
       76
       +
             // If authenticated and on landing/login screen, redirect to feed

     

       77
       77
       +
             if (isAuthenticated && (currentPath == '/' || currentPath == '/login')) {

     

       78
       78
       +
               if (kDebugMode) {

     

       79
       79
       +
                 print('🔄 User authenticated, redirecting to /feed');

     

       80
       80
       +
               }

     

       81
       81
       +
               return '/feed';

     

       82
       82
       +
             }

     

       83
       83
       +
       

     

       84
       84
       +
             // Allow anonymous users to access /feed for browsing

     

       85
       85
       +
             // Sign-out redirect is handled explicitly in the sign-out action

     

       86
       86
       +
             return null;

     

       87
       87
       +
           },

     

       88
       88
       +
           errorBuilder: (context, state) {

     

       89
       89
       +
             // Check if this is an OAuth callback

     

       90
       90
       +
             if (state.uri.scheme == OAuthConfig.customScheme) {

     

       91
       91
       +
               if (kDebugMode) {

     

       92
       92
       +
                 print('⚠️ OAuth callback in errorBuilder - flutter_web_auth_2 should handle it');

     

       93
       93
       +
                 print('   URI: ${state.uri}');

     

       94
       94
       +
               }

     

       95
       95
       +
               // Return nothing - just stay on current screen

     

       96
       96
       +
               // flutter_web_auth_2 will process the callback at native level

     

       97
       97
       +
               return const SizedBox.shrink();

     

       70
       98
        
             }

     

       71
       71
       -
             // Return nothing - just stay on current screen

     

       72
       72
       -
             // flutter_web_auth_2 will process the callback at native level

     

       73
       73
       -
             return const SizedBox.shrink();

     

       74
       74
       -
           }

     

       75
       99
        
       

     

       76
       76
       -
           // For other errors, show landing page

     

       77
       77
       -
           if (kDebugMode) {

     

       78
       78
       -
             print('⚠️ Router error: ${state.uri}');

     

       79
       79
       -
           }

     

       80
       80
       -
           return const LandingScreen();

     

       81
       81
       -
         },

     

       82
       82
       -
       );

     

       100
       100
       +
             // For other errors, show landing page

     

       101
       101
       +
             if (kDebugMode) {

     

       102
       102
       +
               print('⚠️ Router error: ${state.uri}');

     

       103
       103
       +
             }

     

       104
       104
       +
             return const LandingScreen();

     

       105
       105
       +
           },

     

       106
       106
       +
         );

     

       107
       107
       +
       }

+85 -29

lib/screens/home/feed_screen.dart

···

       1
       1
        
       import 'package:flutter/material.dart';

     

       2
       2
        
       import 'package:go_router/go_router.dart';

     

       3
       3
       +
       import 'package:provider/provider.dart';

     

       4
       4
       +
       import '../../providers/auth_provider.dart';

     

       3
       5
        
       import '../../widgets/primary_button.dart';

     

       4
       6
        
       

     

       5
       7
        
       class FeedScreen extends StatelessWidget {

     
···

       7
       9
        
       

     

       8
       10
        
         @override

     

       9
       11
        
         Widget build(BuildContext context) {

     

       10
       10
       -
           return PopScope(

     

       11
       11
       -
             canPop: false,

     

       12
       12
       -
             onPopInvokedWithResult: (didPop, result) {

     

       13
       13
       -
               if (!didPop) {

     

       14
       14
       -
                 context.go('/');

     

       15
       15
       -
               }

     

       16
       16
       -
             },

     

       17
       17
       -
             child: Scaffold(

     

       12
       12
       +
           final authProvider = Provider.of<AuthProvider>(context);

     

       13
       13
       +
           final isAuthenticated = authProvider.isAuthenticated;

     

       14
       14
       +
       

     

       15
       15
       +
           return Scaffold(

     

       18
       16
        
             backgroundColor: const Color(0xFF0B0F14),

     

       19
       17
        
             appBar: AppBar(

     

       20
       18
        
               backgroundColor: const Color(0xFF0B0F14),

     

       21
       19
        
               foregroundColor: Colors.white,

     

       22
       22
       -
               title: const Text('Feed'),

     

       23
       23
       -
               leading: IconButton(

     

       24
       24
       -
                 icon: const Icon(Icons.arrow_back),

     

       25
       25
       -
                 onPressed: () => context.go('/'),

     

       26
       26
       -
               ),

     

       20
       20
       +
               title: Text(isAuthenticated ? 'Feed' : 'Explore'),

     

       21
       21
       +
               automaticallyImplyLeading: !isAuthenticated,

     

       22
       22
       +
               leading: !isAuthenticated

     

       23
       23
       +
                   ? IconButton(

     

       24
       24
       +
                       icon: const Icon(Icons.arrow_back),

     

       25
       25
       +
                       onPressed: () => context.go('/'),

     

       26
       26
       +
                     )

     

       27
       27
       +
                   : null,

     

       28
       28
       +
               actions: isAuthenticated

     

       29
       29
       +
                   ? [

     

       30
       30
       +
                       IconButton(

     

       31
       31
       +
                         icon: const Icon(Icons.person),

     

       32
       32
       +
                         onPressed: () {

     

       33
       33
       +
                           // TODO: Navigate to profile screen

     

       34
       34
       +
                         },

     

       35
       35
       +
                       ),

     

       36
       36
       +
                     ]

     

       37
       37
       +
                   : null,

     

       27
       38
        
             ),

     

       28
       39
        
             body: Center(

     

       29
       40
        
               child: Padding(

     
···

       31
       42
        
                 child: Column(

     

       32
       43
        
                   mainAxisAlignment: MainAxisAlignment.center,

     

       33
       44
        
                   children: [

     

       34
       34
       -
                     const Text(

     

       35
       35
       -
                       'Feed Screen',

     

       36
       36
       -
                       style: TextStyle(

     

       37
       37
       -
                         fontSize: 24,

     

       45
       45
       +
                     const Icon(

     

       46
       46
       +
                       Icons.forum,

     

       47
       47
       +
                       size: 64,

     

       48
       48
       +
                       color: Color(0xFFFF6B35),

     

       49
       49
       +
                     ),

     

       50
       50
       +
                     const SizedBox(height: 24),

     

       51
       51
       +
                     Text(

     

       52
       52
       +
                       isAuthenticated ? 'Welcome to Coves!' : 'Explore Coves',

     

       53
       53
       +
                       style: const TextStyle(

     

       54
       54
       +
                         fontSize: 28,

     

       38
       55
        
                         color: Colors.white,

     

       39
       56
        
                         fontWeight: FontWeight.bold,

     

       40
       57
        
                       ),

     

       41
       58
        
                     ),

     

       42
       59
        
                     const SizedBox(height: 16),

     

       43
       43
       -
                     const Text(

     

       44
       44
       -
                       'Browse communities without signing in',

     

       45
       45
       -
                       style: TextStyle(

     

       60
       60
       +
                     if (isAuthenticated && authProvider.did != null) ...[

     

       61
       61
       +
                       Text(

     

       62
       62
       +
                         'Signed in as:',

     

       63
       63
       +
                         style: TextStyle(

     

       64
       64
       +
                           fontSize: 14,

     

       65
       65
       +
                           color: Colors.white.withValues(alpha: 0.6),

     

       66
       66
       +
                         ),

     

       67
       67
       +
                       ),

     

       68
       68
       +
                       const SizedBox(height: 4),

     

       69
       69
       +
                       Text(

     

       70
       70
       +
                         authProvider.did!,

     

       71
       71
       +
                         style: const TextStyle(

     

       72
       72
       +
                           fontSize: 16,

     

       73
       73
       +
                           color: Color(0xFFB6C2D2),

     

       74
       74
       +
                           fontFamily: 'monospace',

     

       75
       75
       +
                         ),

     

       76
       76
       +
                         textAlign: TextAlign.center,

     

       77
       77
       +
                       ),

     

       78
       78
       +
                     ],

     

       79
       79
       +
                     const SizedBox(height: 32),

     

       80
       80
       +
                     Text(

     

       81
       81
       +
                       isAuthenticated

     

       82
       82
       +
                           ? 'Your personalized feed will appear here'

     

       83
       83
       +
                           : 'Browse communities and discover conversations',

     

       84
       84
       +
                       style: const TextStyle(

     

       46
       85
        
                         fontSize: 16,

     

       47
       86
        
                         color: Color(0xFFB6C2D2),

     

       48
       87
        
                       ),

     

       49
       88
        
                       textAlign: TextAlign.center,

     

       50
       89
        
                     ),

     

       51
       51
       -
                     const SizedBox(height: 32),

     

       52
       52
       -
                     PrimaryButton(

     

       53
       53
       -
                       title: 'Back to Home',

     

       54
       54
       -
                       onPressed: () {

     

       55
       55
       -
                         context.go('/');

     

       56
       56
       -
                       },

     

       57
       57
       -
                       variant: ButtonVariant.outline,

     

       58
       58
       -
                     ),

     

       90
       90
       +
                     const SizedBox(height: 48),

     

       91
       91
       +
                     if (isAuthenticated) ...[

     

       92
       92
       +
                       PrimaryButton(

     

       93
       93
       +
                         title: 'Sign Out',

     

       94
       94
       +
                         onPressed: () async {

     

       95
       95
       +
                           await authProvider.signOut();

     

       96
       96
       +
                           // Explicitly redirect to landing screen after sign out

     

       97
       97
       +
                           if (context.mounted) {

     

       98
       98
       +
                             context.go('/');

     

       99
       99
       +
                           }

     

       100
       100
       +
                         },

     

       101
       101
       +
                         variant: ButtonVariant.outline,

     

       102
       102
       +
                       ),

     

       103
       103
       +
                     ] else ...[

     

       104
       104
       +
                       PrimaryButton(

     

       105
       105
       +
                         title: 'Sign in',

     

       106
       106
       +
                         onPressed: () => context.go('/login'),

     

       107
       107
       +
                         variant: ButtonVariant.solid,

     

       108
       108
       +
                       ),

     

       109
       109
       +
                       const SizedBox(height: 12),

     

       110
       110
       +
                       PrimaryButton(

     

       111
       111
       +
                         title: 'Create account',

     

       112
       112
       +
                         onPressed: () => context.go('/login'),

     

       113
       113
       +
                         variant: ButtonVariant.outline,

     

       114
       114
       +
                       ),

     

       115
       115
       +
                     ],

     

       59
       116
        
                   ],

     

       60
       117
        
                 ),

     

       61
       118
        
               ),

     

       62
       62
       -
             ),

     

       63
       119
        
             ),

     

       64
       120
        
           );

     

       65
       121
        
         }