Merge branch 'master' of github.com:SoPat712/RUSwipeShare

2025-08-21 10:58:47 -04:00 · 2023-02-26 15:28:18 -05:00
parent 06de125486 83d3a1a1f1
commit 9af53484fa
8 changed files with 73 additions and 99 deletions
--- a/lib/auth_gate.dart
+++ b/lib/auth_gate.dart
@@ -25,7 +25,7 @@ class AuthGate extends StatelessWidget {
      stream: FirebaseAuth.instance.authStateChanges(),
      builder: (context, snapshot) {
        if (!snapshot.hasData) {
-          return SignInScreen(
+          return SignInScreen(  
            providerConfigs: const [
              EmailProviderConfiguration(),
            ],
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -10,8 +10,8 @@ void main() async {
  WidgetsFlutterBinding.ensureInitialized();
  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
  Stripe.publishableKey = "pk_test_51MfY7PFVdcWv896FKvDhgKabYeDq4AnoFcWxCAg4hquj6TBAsN0kznXPVyKA7M1pMq5PsieGQwsx6QY5ld5ZQzJ500rVCMPPXp";
-  
-runApp(const MyApp());
+
+  runApp(const MyApp());
 }

 class MyApp extends StatelessWidget {
@@ -20,23 +20,58 @@ class MyApp extends StatelessWidget {
  Widget build(BuildContext context) {
    return MaterialApp(
      theme: ThemeData(
-          primarySwatch: CustomMaterialColor(205, 0, 48).mdColor,
-          scaffoldBackgroundColor: Colors.black87,
-          fontFamily: GoogleFonts.figtree().fontFamily,
-          textTheme: Theme.of(context).textTheme.apply(
-                bodyColor: CustomMaterialColor(240, 240, 240).mdColor,
-                displayColor: CustomMaterialColor(240, 240, 240).mdColor,
+        inputDecorationTheme: InputDecorationTheme(
+          fillColor: Color.fromARGB(255, 40, 40, 40),
+          filled: true,
+          outlineBorder: BorderSide(
+            color: Colors.white,
+          ),
+          labelStyle: TextStyle(
+            color: Color.fromARGB(255, 205, 0, 48),
+          ),
+          focusColor: Colors.white,
+          hintStyle: TextStyle(
+            color: Color.fromARGB(255, 205, 0, 48),
+          ),
+          border: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(8),
+          ),
+        ),
+        textSelectionTheme: TextSelectionThemeData(),
+        fixTextFieldOutlineLabel: true,
+        outlinedButtonTheme: OutlinedButtonThemeData(
+          style: ButtonStyle(
+            padding: MaterialStateProperty.all<EdgeInsets>(
+              const EdgeInsets.all(24),
+            ),
+            shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+              RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(8),
              ),
-          textButtonTheme: TextButtonThemeData(
-              style: ButtonStyle(
-                  textStyle: MaterialStatePropertyAll(TextStyle(
-                      color: CustomMaterialColor(240, 240, 240).mdColor))))),
+            ),
+            backgroundColor: MaterialStateProperty.all<Color>(Color.fromARGB(255, 205, 0, 48)),
+            foregroundColor: MaterialStateProperty.all<Color>(Colors.white),
+          ),
+        ),
+        primarySwatch: CustomMaterialColor(205, 0, 48).mdColor,
+        scaffoldBackgroundColor: Colors.black87,
+        fontFamily: GoogleFonts.figtree().fontFamily,
+        textTheme: Theme.of(context).textTheme.apply(
+              bodyColor: CustomMaterialColor(240, 240, 240).mdColor,
+              displayColor: CustomMaterialColor(240, 240, 240).mdColor,
+            ),
+        textButtonTheme: TextButtonThemeData(style: ButtonStyle(textStyle: MaterialStatePropertyAll(TextStyle(color: CustomMaterialColor(240, 240, 240).mdColor)))),
+        checkboxTheme: CheckboxThemeData(
+          fillColor: MaterialStatePropertyAll(CustomMaterialColor(240, 240, 240).mdColor),
+          checkColor: MaterialStatePropertyAll(Colors.black),
+        ),
+      ),
      home: const AuthGate(),
    );
  }
 }

- class CustomMaterialColor {
+class CustomMaterialColor {
  final int r;
  final int g;
  final int b;
--- a/lib/sell.dart
+++ b/lib/sell.dart
@@ -46,18 +46,32 @@ class _SellScreenState extends State<SellScreen> {
      resizeToAvoidBottomInset: true,
      body: Padding(
        padding: const EdgeInsets.fromLTRB(0, 8, 0, 0),
-        child:
-            Column(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
+        child: Column(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: const [
-              Icon(Icons.store_mall_directory, color: Colors.red),
-              Text('Place'),
+            children: [
+              Expanded(
+                  child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Icon(
+                    Icons.store_mall_directory,
+                    color: Colors.red,
+                    size: 40,
+                  ),
+                  Text(
+                    'Place',
+                    style: TextStyle(
+                      fontSize: 30,
+                    ),
+                  ),
+                ],
+              ))
            ],
          ),
          ConstrainedBox(
            constraints: const BoxConstraints.expand(height: 250),
            child: ListView.builder(
+              physics: BouncingScrollPhysics(),
              itemCount: values.length,
              itemBuilder: (context, index) => CheckboxListTile(
                title: Text(values.keys.elementAt(index)),
@@ -102,9 +116,7 @@ class _SellScreenState extends State<SellScreen> {
            children: [
              ElevatedButton(
                onPressed: () async {
-                  DatePicker.showDateTimePicker(context,
-                      showTitleActions: true,
-                      minTime: DateTime.now(), onChanged: (date) {
+                  DatePicker.showDateTimePicker(context, showTitleActions: true, minTime: DateTime.now(), onChanged: (date) {
                    print('change $date');
                  }, onConfirm: (date) {
                    setState(() {
@@ -128,9 +140,7 @@ class _SellScreenState extends State<SellScreen> {
              ),
              ElevatedButton(
                onPressed: () async {
-                  DatePicker.showDateTimePicker(context,
-                      showTitleActions: true,
-                      minTime: DateTime.now(), onChanged: (date) {
+                  DatePicker.showDateTimePicker(context, showTitleActions: true, minTime: DateTime.now(), onChanged: (date) {
                    print('change $date');
                  }, onConfirm: (date) {
                    setState(() {
@@ -183,19 +193,12 @@ class _SellScreenState extends State<SellScreen> {
                if (value == true) locations.add(key);
              });
              if (user != null) {
-                Seller seller = Seller(
-                    user.displayName,
-                    user.uid,
-                    locations,
-                    TimeRange(Timestamp.fromDate(startTimeTime),
-                        Timestamp.fromDate(endTimeTime)),
-                    double.parse(priceController.text));
+                Seller seller = Seller(user.displayName, user.uid, locations, TimeRange(Timestamp.fromDate(startTimeTime), Timestamp.fromDate(endTimeTime)), double.parse(priceController.text));
                addSeller(seller);
              }
            },
            style: ButtonStyle(
-              backgroundColor:
-                  MaterialStateColor.resolveWith((states) => Colors.blue),
+              backgroundColor: MaterialStateColor.resolveWith((states) => Colors.blue),
            ),
            child: const Text('Submit Sell Request'),
          ),
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -10,7 +10,6 @@ import desktop_webview_auth
 import firebase_auth
 import firebase_core
 import firebase_database
-import geolocator_apple
 import path_provider_foundation
 import sign_in_with_apple
 import twitter_login
@@ -21,7 +20,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin"))
  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
  FLTFirebaseDatabasePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseDatabasePlugin"))
-  GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
  SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin"))
  TwitterLoginPlugin.register(with: registry.registrar(forPlugin: "TwitterLoginPlugin"))
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -262,14 +262,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.5.1"
-  flutter_dotenv:
-    dependency: "direct main"
-    description:
-      name: flutter_dotenv
-      sha256: d9283d92059a22e9834bc0a31336658ffba77089fb6f3cc36751f1fc7c6661a3
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.2"
  flutter_facebook_auth:
    dependency: transitive
    description:
@@ -349,54 +341,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.2.0"
-  geolocator:
-    dependency: "direct main"
-    description:
-      name: geolocator
-      sha256: "5c23f3613f50586c0bbb2b8f970240ae66b3bd992088cf60dd5ee2e6f7dde3a8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.0.2"
-  geolocator_android:
-    dependency: transitive
-    description:
-      name: geolocator_android
-      sha256: "2ba24690aee0a3e1b6b7bd47c2711a50c874e95e4c758346589d35194adf6d6a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.7"
-  geolocator_apple:
-    dependency: transitive
-    description:
-      name: geolocator_apple
-      sha256: "22b60ca3b8c0f58e6a9688ff855ee39ab813ca3f0c0609a48d282f6631266f2e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.5"
-  geolocator_platform_interface:
-    dependency: transitive
-    description:
-      name: geolocator_platform_interface
-      sha256: af4d69231452f9620718588f41acc4cb58312368716bfff2e92e770b46ce6386
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.7"
-  geolocator_web:
-    dependency: transitive
-    description:
-      name: geolocator_web
-      sha256: f68a122da48fcfff68bbc9846bb0b74ef651afe84a1b1f6ec20939de4d6860e1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.6"
-  geolocator_windows:
-    dependency: transitive
-    description:
-      name: geolocator_windows
-      sha256: f5911c88e23f48b598dd506c7c19eff0e001645bdc03bb6fecb9f4549208354d
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.1"
  google_fonts:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -38,9 +38,7 @@ dependencies:
  firebase_core: ^2.7.0
  firebase_auth: ^4.2.9
  flutterfire_ui: ^0.4.3+20
-  flutter_dotenv: ^5.0.2
  persistent_bottom_nav_bar: any
-  geolocator: ^9.0.2
  flutter_credit_card: any
  flutter_stripe: any
  material_dialogs: any
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -7,11 +7,8 @@
 #include "generated_plugin_registrant.h"

 #include <desktop_webview_auth/desktop_webview_auth_plugin.h>
-#include <geolocator_windows/geolocator_windows.h>

 void RegisterPlugins(flutter::PluginRegistry* registry) {
  DesktopWebviewAuthPluginRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("DesktopWebviewAuthPlugin"));
-  GeolocatorWindowsRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("GeolocatorWindows"));
 }
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -4,7 +4,6 @@

 list(APPEND FLUTTER_PLUGIN_LIST
  desktop_webview_auth
-  geolocator_windows
 )

 list(APPEND FLUTTER_FFI_PLUGIN_LIST