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

lib/main.dart

@@ -20,6 +20,39 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       theme: ThemeData(
+        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),
+              ),
+            ),
+            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,
@@ -27,10 +60,12 @@ class MyApp extends StatelessWidget {
               bodyColor: CustomMaterialColor(240, 240, 240).mdColor,
               displayColor: CustomMaterialColor(240, 240, 240).mdColor,
             ),
-          textButtonTheme: TextButtonThemeData(
+        textButtonTheme: TextButtonThemeData(style: ButtonStyle(textStyle: MaterialStatePropertyAll(TextStyle(color: CustomMaterialColor(240, 240, 240).mdColor)))),
-              style: ButtonStyle(
+        checkboxTheme: CheckboxThemeData(
-                  textStyle: MaterialStatePropertyAll(TextStyle(
+          fillColor: MaterialStatePropertyAll(CustomMaterialColor(240, 240, 240).mdColor),
-                      color: CustomMaterialColor(240, 240, 240).mdColor))))),
+          checkColor: MaterialStatePropertyAll(Colors.black),
+        ),
+      ),
       home: const AuthGate(),
     );
   }

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:
+        child: Column(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
-            Column(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
           Row(
+            children: [
+              Expanded(
+                  child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
-            children: const [
+                children: [
-              Icon(Icons.store_mall_directory, color: Colors.red),
+                  Icon(
-              Text('Place'),
+                    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,
+                  DatePicker.showDateTimePicker(context, showTitleActions: true, minTime: DateTime.now(), onChanged: (date) {
-                      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,
+                  DatePicker.showDateTimePicker(context, showTitleActions: true, minTime: DateTime.now(), onChanged: (date) {
-                      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(
+                Seller seller = Seller(user.displayName, user.uid, locations, TimeRange(Timestamp.fromDate(startTimeTime), Timestamp.fromDate(endTimeTime)), double.parse(priceController.text));
-                    user.displayName,
-                    user.uid,
-                    locations,
-                    TimeRange(Timestamp.fromDate(startTimeTime),
-                        Timestamp.fromDate(endTimeTime)),
-                    double.parse(priceController.text));
                 addSeller(seller);
               }
             },
             style: ButtonStyle(
-              backgroundColor:
+              backgroundColor: MaterialStateColor.resolveWith((states) => Colors.blue),
-                  MaterialStateColor.resolveWith((states) => Colors.blue),
             ),
             child: const Text('Submit Sell Request'),
           ),

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"))

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:

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

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"));
 }

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