diff --git a/app/lib/account/widgets/get_started_button.dart b/app/lib/account/widgets/get_started_button.dart index b6a16dea..9ad679cd 100644 --- a/app/lib/account/widgets/get_started_button.dart +++ b/app/lib/account/widgets/get_started_button.dart @@ -36,9 +36,9 @@ class _GetStartedButtonState extends State { borderRadius: BorderRadius.circular(10), color: const Color.fromARGB(255, 224, 227, 231), ), - child: const Row( + child: Row( mainAxisAlignment: MainAxisAlignment.center, - children: [ + children: const [ Text( "Get Started", style: TextStyle( diff --git a/app/lib/features/authentication/sign_in_page.dart b/app/lib/features/authentication/sign_in_page.dart index 1ae20fc6..d38b70d7 100644 --- a/app/lib/features/authentication/sign_in_page.dart +++ b/app/lib/features/authentication/sign_in_page.dart @@ -27,7 +27,7 @@ class SignInPageState extends State { child: Column( mainAxisSize: MainAxisSize.max, children: [ - const Row(), + Row(), Expanded( child: Column( mainAxisSize: MainAxisSize.min, diff --git a/app/lib/main.dart b/app/lib/main.dart index f765c0e4..186ebc71 100755 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -1,8 +1,5 @@ +import 'package:app/page_viewer.dart'; import 'package:app/app/app_routes.dart'; -import 'package:app/features/home/home_page.dart'; -import 'package:app/features/profile/profile_page.dart'; -import 'package:app/features/blog/blog_page_test.dart'; -import 'package:app/features/team/team_page.dart'; import 'package:flutter/material.dart'; import 'package:firebase_core/firebase_core.dart'; import 'firebase_options.dart'; @@ -22,73 +19,25 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - home: const MainScaffold(), + home: const PageViewer(), routes: AppRoutes.routes, ); } } -enum AppTab { Home, Blog, Team, Profile } -class MainScaffold extends StatefulWidget { - const MainScaffold({super.key}); - - @override - _MainScaffoldState createState() => _MainScaffoldState(); -} - -class _MainScaffoldState extends State { - AppTab _selectedTab = AppTab.Home; +// class MainScaffold extends StatefulWidget { +// @override +// _MainScaffoldState createState() => _MainScaffoldState(); +// } - void _onTabTapped(int index) { - setState(() { - _selectedTab = AppTab.values[index]; - }); - } +// class _MainScaffoldState extends State { +// AppTab _selectedTab = AppTab.Home; - @override - Widget build(BuildContext context) { - return Scaffold( - bottomNavigationBar: BottomNavigationBar( - items: const [ - BottomNavigationBarItem( - icon: Icon(Icons.home), - label: 'Home', - ), - BottomNavigationBarItem( - icon: Icon(Icons.notifications), - label: 'Blog', - ), - BottomNavigationBarItem( - icon: Icon(Icons.group), - label: 'Team', - ), - BottomNavigationBarItem( - icon: Icon(Icons.person), - label: 'Profile', - ), - ], - currentIndex: _selectedTab.index, - onTap: _onTabTapped, - ), - body: _buildBody(), - ); - } - - Widget _buildBody() { - switch (_selectedTab) { - case AppTab.Home: - return const HomePage(); - case AppTab.Blog: - return const BlogPage(); - case AppTab.Team: - return const TeamPage(); - case AppTab.Profile: - return const ProfilePage(); - default: - return Container(); - } - } -} +// void _onTabTapped(int index) { +// setState(() { +// _selectedTab = AppTab.values[index]; +// }); +// } // class AuthService { // final FirebaseAuth _auth = FirebaseAuth.instance; diff --git a/app/lib/page_viewer.dart b/app/lib/page_viewer.dart new file mode 100644 index 00000000..e82373be --- /dev/null +++ b/app/lib/page_viewer.dart @@ -0,0 +1,46 @@ +import 'package:app/features/blog/blog_page.dart'; +import 'package:app/features/home/home_page.dart'; +import 'package:app/features/profile/profile_page.dart'; +import 'package:app/features/team/team_page.dart'; +import 'package:flutter/material.dart'; + +class PageViewer extends StatelessWidget { + const PageViewer({super.key}); + + @override + Widget build(BuildContext context) { + return const DefaultTabController( + length: 4, // make sure that this matches the amount of pages + child: Scaffold( + body: TabBarView( + children:[ + HomePage(), + BlogPage(), + TeamPage(), + ProfilePage(), + ] + ), + bottomNavigationBar: TabBar( + tabs: [ + Tab( + icon: Icon(Icons.home) + ), + Tab( + icon: Icon(Icons.book) + ), + Tab( + icon: Icon(Icons.group) + ), + Tab( + icon: Icon(Icons.person) + ), + ], + labelColor: Color(0xff2B7BBC), + unselectedLabelColor: Color(0xff141D1D), + indicatorColor: Color(0xff2B7BBC), + ), + backgroundColor: Color(0xffEFEFEF), + ), + ); + } +} diff --git a/app/macos/Flutter/GeneratedPluginRegistrant.swift b/app/macos/Flutter/GeneratedPluginRegistrant.swift index 804ef2fb..20ed81a6 100755 --- a/app/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -8,9 +8,11 @@ import Foundation import cloud_firestore import firebase_auth import firebase_core +import wakelock_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin")) FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin")) FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) + WakelockMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockMacosPlugin")) } diff --git a/app/pubspec.lock b/app/pubspec.lock index cc251e04..f367ae8b 100755 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -29,10 +29,26 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.2.1" + chewie: + dependency: transitive + description: + name: chewie + sha256: "745e81e84c6d7f3835f89f85bb49771c0a66099e4caf8f8e9e9a372bc66fb2c1" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + chewie_audio: + dependency: transitive + description: + name: chewie_audio + sha256: "73948a8b9841d050433af3498a1f8b11320bd5a2cd70b449bdbe16d4405e97c5" + url: "https://pub.dev" + source: hosted + version: "1.5.0" clock: dependency: transitive description: @@ -69,10 +85,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.17.0" csslib: dependency: transitive description: @@ -101,18 +117,18 @@ packages: dependency: transitive description: name: ffi - sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.0.2" file_picker: dependency: transitive description: name: file_picker - sha256: be325344c1f3070354a1d84a231a1ba75ea85d413774ec4bdf444c023342e030 + sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "5.2.10" firebase_auth: dependency: "direct main" description: @@ -173,10 +189,10 @@ packages: dependency: transitive description: name: flex_seed_scheme - sha256: "29c12aba221eb8a368a119685371381f8035011d18de5ba277ad11d7dfb8657f" + sha256: e4168a6fc88a3e5bc3d6b7a748c6a6083eedc193d343ddc26bbad7fb1b258555 url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -186,10 +202,10 @@ packages: dependency: "direct main" description: name: flutter_html - sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee" + sha256: ccb810fcabfce3a7ffaca46e458323915ac7e7fc59082c7357ff848972c02230 url: "https://pub.dev" source: hosted - version: "3.0.0-beta.2" + version: "2.2.1" flutter_inappwebview: dependency: transitive description: @@ -246,6 +262,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + flutter_layout_grid: + dependency: transitive + description: + name: flutter_layout_grid + sha256: "86c1b21520612edfbb93f189b3ec05058470570f3a5c08ce10c92cc76a6e814e" + url: "https://pub.dev" + source: hosted + version: "1.0.6" flutter_lints: dependency: "direct dev" description: @@ -254,6 +278,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" + flutter_math_fork: + dependency: transitive + description: + name: flutter_math_fork + sha256: a34205227e1a1d040a56e74a5e2e56e9397ea930540a9373bd0b3e2e4f122017 + url: "https://pub.dev" + source: hosted + version: "0.5.0" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -270,6 +302,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" + flutter_svg: + dependency: transitive + description: + name: flutter_svg + sha256: cbf529d563dd910a249041bde2a0dfc3cf62280fcc459b85f3d614b2ab73abb3 + url: "https://pub.dev" + source: hosted + version: "0.23.0+1" flutter_test: dependency: "direct dev" description: flutter @@ -380,10 +420,10 @@ packages: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.6.5" lints: dependency: transitive description: @@ -392,14 +432,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.1" - list_counter: - dependency: transitive - description: - name: list_counter - sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237 - url: "https://pub.dev" - source: hosted - version: "1.0.2" local_auth: dependency: "direct main" description: @@ -444,10 +476,10 @@ packages: dependency: transitive description: name: matcher - sha256: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8 + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" url: "https://pub.dev" source: hosted - version: "0.12.14" + version: "0.12.13" material_color_utilities: dependency: transitive description: @@ -460,10 +492,10 @@ packages: dependency: transitive description: name: meta - sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.8.0" nested: dependency: transitive description: @@ -480,14 +512,38 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" + numerus: + dependency: transitive + description: + name: numerus + sha256: "0087ef729d63b96cb347a9c44b9c592f21cecb3605b415bbd18710aef80ce5cb" + url: "https://pub.dev" + source: hosted + version: "1.1.1" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" + source: hosted + version: "1.8.2" + path_drawing: + dependency: transitive + description: + name: path_drawing + sha256: "3bdd251dae9ffaef944450b73f168610db7e968e7b20daf0c3907f8b4aafc8a2" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "0.5.1+1" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: ee5c47c1058ad66b4a41746ec3996af9593d0858872807bcd64ac118f0700337 + url: "https://pub.dev" + source: hosted + version: "0.2.1" pedantic: dependency: transitive description: @@ -496,6 +552,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.11.1" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" + source: hosted + version: "5.1.0" plugin_platform_interface: dependency: transitive description: @@ -508,10 +572,10 @@ packages: dependency: transitive description: name: pointer_interceptor - sha256: adf7a637f97c077041d36801b43be08559fd4322d2127b3f20bb7be1b9eebc22 + sha256: acfcd63c00ec3d5a7894b0e2a875893716d31958fe03f064734dba7dfd9113d9 url: "https://pub.dev" source: hosted - version: "0.9.3+7" + version: "0.9.3+5" provider: dependency: "direct main" description: @@ -577,10 +641,18 @@ packages: dependency: transitive description: name: test_api - sha256: "6182294da5abf431177fccc1ee02401f6df30f766bc6130a0852c6b6d7ee6b2d" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 url: "https://pub.dev" source: hosted - version: "0.4.18" + version: "0.4.16" + tuple: + dependency: transitive + description: + name: tuple + sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151 + url: "https://pub.dev" + source: hosted + version: "2.0.2" typed_data: dependency: transitive description: @@ -597,6 +669,46 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + video_player: + dependency: transitive + description: + name: video_player + sha256: "74b86e63529cf5885130c639d74cd2f9232e7c8a66cbecbddd1dcb9dbd060d1e" + url: "https://pub.dev" + source: hosted + version: "2.7.2" + video_player_android: + dependency: transitive + description: + name: video_player_android + sha256: "3fe89ab07fdbce786e7eb25b58532d6eaf189ceddc091cb66cba712f8d9e8e55" + url: "https://pub.dev" + source: hosted + version: "2.4.10" + video_player_avfoundation: + dependency: transitive + description: + name: video_player_avfoundation + sha256: bf1a1322bf68bccd349982ba1f5a41314a3880861fb9a93d25d6d0a2345845f0 + url: "https://pub.dev" + source: hosted + version: "2.4.11" + video_player_platform_interface: + dependency: transitive + description: + name: video_player_platform_interface + sha256: be72301bf2c0150ab35a8c34d66e5a99de525f6de1e8d27c0672b836fe48f73a + url: "https://pub.dev" + source: hosted + version: "6.2.1" + video_player_web: + dependency: transitive + description: + name: video_player_web + sha256: "9c34a243785feca23148bfcd772dbb803d63c9304488177ec4f3f4463802fcb7" + url: "https://pub.dev" + source: hosted + version: "2.0.17" visibility_detector: dependency: transitive description: @@ -605,22 +717,94 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.3" - web: + wakelock: + dependency: transitive + description: + name: wakelock + sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db" + url: "https://pub.dev" + source: hosted + version: "0.6.2" + wakelock_macos: + dependency: transitive + description: + name: wakelock_macos + sha256: "047c6be2f88cb6b76d02553bca5a3a3b95323b15d30867eca53a19a0a319d4cd" + url: "https://pub.dev" + source: hosted + version: "0.4.0" + wakelock_platform_interface: + dependency: transitive + description: + name: wakelock_platform_interface + sha256: "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621" + url: "https://pub.dev" + source: hosted + version: "0.3.0" + wakelock_web: + dependency: transitive + description: + name: wakelock_web + sha256: "1b256b811ee3f0834888efddfe03da8d18d0819317f20f6193e2922b41a501b5" + url: "https://pub.dev" + source: hosted + version: "0.4.0" + wakelock_windows: + dependency: transitive + description: + name: wakelock_windows + sha256: "857f77b3fe6ae82dd045455baa626bc4b93cb9bb6c86bf3f27c182167c3a5567" + url: "https://pub.dev" + source: hosted + version: "0.2.1" + webview_flutter: + dependency: transitive + description: + name: webview_flutter + sha256: "6886b3ceef1541109df5001054aade5ee3c36b5780302e41701c78357233721c" + url: "https://pub.dev" + source: hosted + version: "2.8.0" + webview_flutter_android: dependency: transitive description: - name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + name: webview_flutter_android + sha256: "8b3b2450e98876c70bfcead876d9390573b34b9418c19e28168b74f6cb252dbd" url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "2.10.4" + webview_flutter_platform_interface: + dependency: transitive + description: + name: webview_flutter_platform_interface + sha256: "812165e4e34ca677bdfbfa58c01e33b27fd03ab5fa75b70832d4b7d4ca1fa8cf" + url: "https://pub.dev" + source: hosted + version: "1.9.5" + webview_flutter_wkwebview: + dependency: transitive + description: + name: webview_flutter_wkwebview + sha256: a5364369c758892aa487cbf59ea41d9edd10f9d9baf06a94e80f1bd1b4c7bbc0 + url: "https://pub.dev" + source: hosted + version: "2.9.5" win32: dependency: transitive description: name: win32 - sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4 + url: "https://pub.dev" + source: hosted + version: "3.1.4" + xml: + dependency: transitive + description: + name: xml + sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a" url: "https://pub.dev" source: hosted - version: "5.0.9" + version: "5.4.1" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=2.19.6 <3.0.0" + flutter: ">=3.7.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 378c36fc..92a2a9d1 100755 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -44,7 +44,7 @@ dependencies: provider: ^6.0.5 flutter_profile_picture: ^2.0.0 html_editor_enhanced: ^2.5.1 - flutter_html: ^3.0.0-beta.2 + flutter_html: ^2.1.2 dev_dependencies: flutter_test: