diff --git a/.gitignore b/.gitignore index 773b828..d6c9806 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,6 @@ app.*.map.json *.env .env /api-keys.json -/lib/env/env.dart +# /lib/env/env.dart /lib/env/env.g.dart .vscode/settings.json diff --git a/lib/assets/logos/Artboard 1.png b/lib/assets/logos/artboard_1.png similarity index 100% rename from lib/assets/logos/Artboard 1.png rename to lib/assets/logos/artboard_1.png diff --git a/lib/assets/logos/image 7.png b/lib/assets/logos/image_7.png similarity index 100% rename from lib/assets/logos/image 7.png rename to lib/assets/logos/image_7.png diff --git a/lib/assets/logos/PaLM Logo.png b/lib/assets/logos/palm_logo.png similarity index 100% rename from lib/assets/logos/PaLM Logo.png rename to lib/assets/logos/palm_logo.png diff --git a/lib/assets/logos/PaLM_Logo.svg b/lib/assets/logos/palm_logo.svg similarity index 100% rename from lib/assets/logos/PaLM_Logo.svg rename to lib/assets/logos/palm_logo.svg diff --git a/lib/env/env.dart b/lib/env/env.dart new file mode 100644 index 0000000..4a4375b --- /dev/null +++ b/lib/env/env.dart @@ -0,0 +1,18 @@ +import 'package:envied/envied.dart'; + +part 'env.g.dart'; + +// @Envied(path: '.env') +@Envied() +abstract class Env { + @EnviedField(varName: "FIREBASE_WEB", obfuscate: true) + static final String firebaseWeb = _Env.firebaseWeb; + @EnviedField(varName: "FIREBASE_ANDROID", obfuscate: true) + static final String firebaseAndroid = _Env.firebaseAndroid; + @EnviedField(varName: "FIREBASE_IOS", obfuscate: true) + static final String firebaseIos = _Env.firebaseIos; + @EnviedField(varName: "FIREBASE_MACOS", obfuscate: true) + static final String firebaseMacos = _Env.firebaseMacos; + @EnviedField(varName: "PALM_API_KEY", obfuscate: true) + static final String palmApiKey= _Env.palmApiKey; +} \ No newline at end of file diff --git a/lib/screens/Authentication/login_page.dart b/lib/screens/Authentication/login_page.dart index fda8da0..93323e1 100644 --- a/lib/screens/Authentication/login_page.dart +++ b/lib/screens/Authentication/login_page.dart @@ -72,7 +72,7 @@ class _LoginPageState extends State { height: 50, ), Image.asset( - 'lib/assets/logos/PaLM Logo.png', + 'lib/assets/logos/palm_logo.png', width: 75, height: 75, ), diff --git a/lib/screens/Authentication/register_page.dart b/lib/screens/Authentication/register_page.dart index 6e4f7ca..7d3889f 100644 --- a/lib/screens/Authentication/register_page.dart +++ b/lib/screens/Authentication/register_page.dart @@ -68,7 +68,7 @@ class _RegisterPageState extends State { height: 50, ), Image.asset( - 'lib/assets/logos/PaLM Logo.png', + 'lib/assets/logos/palm_logo.png', width: 75, height: 75, ), diff --git a/lib/screens/Forgot_Password/forgot_password.dart b/lib/screens/Forgot_Password/forgot_password.dart index 9d54796..63ebdd1 100644 --- a/lib/screens/Forgot_Password/forgot_password.dart +++ b/lib/screens/Forgot_Password/forgot_password.dart @@ -59,7 +59,7 @@ class _ForgotPasswordScreenState extends State { child: Column( children: [ Image.asset( - 'lib/assets/logos/PaLM Logo.png', + 'lib/assets/logos/palm_logo.png', width: 75, height: 75, ), diff --git a/lib/screens/Home/home_page.dart b/lib/screens/Home/home_page.dart index 6169368..2e6aae6 100644 --- a/lib/screens/Home/home_page.dart +++ b/lib/screens/Home/home_page.dart @@ -86,7 +86,7 @@ class _HomePageState extends State { Padding( padding: const EdgeInsets.only(top: 22.0, left: 50.0), child: Image.asset( - "lib/assets/logos/image 7.png", + "lib/assets/logos/image_7.png", height: 50, alignment: Alignment.center, ), @@ -122,25 +122,25 @@ class _HomePageState extends State { }); }, currentIndex: myIndex, - items: [ - const BottomNavigationBarItem( + items: const [ + BottomNavigationBarItem( icon: Icon(Icons.home), label: "Home", backgroundColor: Colors.black, ), - const BottomNavigationBarItem( + BottomNavigationBarItem( icon: Icon(Icons.person), label: "Profile", backgroundColor: Colors.black, ), - if (Platform - .isAndroid) // Conditionally include the item only on Android - const BottomNavigationBarItem( - icon: Icon(Icons.settings), - label: "Settings", - backgroundColor: Colors.black, - ), - const BottomNavigationBarItem( + // if (Platform + // .isAndroid) // Conditionally include the item only on Android + // const BottomNavigationBarItem( + // icon: Icon(Icons.settings), + // label: "Settings", + // backgroundColor: Colors.black, + // ), + BottomNavigationBarItem( icon: Icon(Icons.health_and_safety), label: "Safety", backgroundColor: Colors.black, diff --git a/pubspec.lock b/pubspec.lock index 45a24a1..eff0706 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "78f9e0914a5b85de1257a0c1d1af92c4e22f86448133dfc967651ca606a87a82" + sha256: "737321f9be522620ed3794937298fb0027a48a402624fa2500f7532f94aea810" url: "https://pub.dev" source: hosted - version: "1.3.20" + version: "1.3.22" analyzer: dependency: transitive description: @@ -261,34 +261,34 @@ packages: dependency: "direct main" description: name: firebase_auth - sha256: "6dae39ef1a4aba95c160506fa15a6d8545a4dbcffeff80e498a52f4698bbf520" + sha256: "06863a0031b5f1b11ecac2c7d93c026df039a1379224a6671c59f528397d19e1" url: "https://pub.dev" source: hosted - version: "4.17.3" + version: "4.17.5" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: "1e8703687fe7ff78ff8b0c580b6476dca18087eadc6985bc8f578b5739b8e8e3" + sha256: dba259dee045b706112c3d7619b01c2ad338d86cc492df52dd2073584a64de66 url: "https://pub.dev" source: hosted - version: "7.1.3" + version: "7.1.5" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: "946069f8c96fb7d0fe46bcfbf1902cfa48c7445beff14a1305e29cae7e00c0f5" + sha256: ea47c590d0da836ae7253fadb95546b4595fbc59a5c50583e0fb5a1c5c476aff url: "https://pub.dev" source: hosted - version: "5.9.3" + version: "5.9.5" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "0b066f2dc196de65f4e57dc851984acba751a7929bffaee69464b3f75e175a5c" + sha256: "7e049e32a9d347616edb39542cf92cd53fdb4a99fb6af0a0bff327c14cd76445" url: "https://pub.dev" source: hosted - version: "2.25.3" + version: "2.25.4" firebase_core_platform_interface: dependency: transitive description: @@ -301,10 +301,10 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: df9d4ce37b97ecbe4347fb21887cb61383e3e95f8cf8d6c2de5999ef58e8b312 + sha256: "57e61d6010e253b36d38191cefd6199d7849152cdcd234b61ca290cdb278a0ba" url: "https://pub.dev" source: hosted - version: "2.11.3" + version: "2.11.4" fixnum: dependency: transitive description: @@ -460,10 +460,10 @@ packages: dependency: transitive description: name: google_sign_in_web - sha256: a278ea2d01013faf341cbb093da880d0f2a552bbd1cb6ee90b5bebac9ba69d77 + sha256: f2b3af0ba52ff59439f18962fca71db860f09507a81da929fc0e719270b35db2 url: "https://pub.dev" source: hosted - version: "0.12.3+2" + version: "0.12.3+3" graphs: dependency: transitive description: @@ -528,6 +528,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -556,26 +580,26 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" mime: dependency: transitive description: @@ -596,10 +620,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_parsing: dependency: transitive description: @@ -989,6 +1013,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" watcher: dependency: transitive description: @@ -998,13 +1030,13 @@ packages: source: hosted version: "1.1.0" web: - dependency: transitive + dependency: "direct main" description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.4.2" web_socket_channel: dependency: transitive description: @@ -1046,5 +1078,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.19.0" diff --git a/pubspec.yaml b/pubspec.yaml index 920e152..22a5608 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,8 +36,8 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - firebase_core: ^2.15.1 - firebase_auth: ^4.9.0 + firebase_core: ^2.25.4 + firebase_auth: ^4.17.5 google_sign_in: ^6.1.5 google_generative_language_api: ^0.2.1 http: ^1.1.0 @@ -49,6 +49,7 @@ dependencies: url_launcher: ^6.2.2 dash_bubble: ^2.0.0 flutter_riverpod: ^2.4.9 + web: ^0.4.2 dev_dependencies: flutter_test: sdk: flutter @@ -68,7 +69,7 @@ dev_dependencies: flutter_icons: android: true ios: true - image_path: "lib/assets/logos/PaLM Logo.png" + image_path: "lib/assets/logos/palm_logo.png" # The following section is specific to Flutter packages. flutter: @@ -81,9 +82,9 @@ flutter: assets: - lib/assets/images/ - - lib/assets/logos/PaLM_logo.svg + - lib/assets/logos/palm_logo.svg - lib/assets/logos/ - - .env + # - .env # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see @@ -109,5 +110,4 @@ flutter: # - asset: fonts/TrajanPro_Bold.ttf # weight: 700 # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages + # For details regarding fonts from package dependencies, \ No newline at end of file diff --git a/web/favicon.png b/web/favicon.png index 8aaa46a..2d4b39a 100644 Binary files a/web/favicon.png and b/web/favicon.png differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png index b749bfe..da6a62d 100644 Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png index 88cfd48..e107401 100644 Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png index eb9b4d7..da6a62d 100644 Binary files a/web/icons/Icon-maskable-192.png and b/web/icons/Icon-maskable-192.png differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png index d69c566..e107401 100644 Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ diff --git a/web/index.html b/web/index.html index fa31be9..1542bff 100644 --- a/web/index.html +++ b/web/index.html @@ -18,18 +18,18 @@ - + - + - chatpalm_app + ChatPaLM