update

lib/pages/add_medicine_page.dart

@@ -11,7 +11,6 @@ import 'package:pharmacy_mobile/tables/storage.dart';
 import 'package:pharmacy_mobile/widgets/button_widget.dart';
 import 'package:pharmacy_mobile/widgets/dropdown_widget.dart';
 import 'package:pharmacy_mobile/widgets/dropdown_wrappermulti_widget.dart';
-import 'package:pharmacy_mobile/widgets/form_border_widget.dart';
 import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
 import 'package:pharmacy_mobile/widgets/input_widget.dart';
 import 'package:pharmacy_mobile/widgets/page_background_widget.dart';

lib/pages/add_stock_page.dart

@@ -5,7 +5,6 @@ import 'package:pharmacy_mobile/tables/stocks.dart';
 import 'package:pharmacy_mobile/widgets/button_widget.dart';
 import 'package:pharmacy_mobile/widgets/datepicker_widget.dart';
 import 'package:pharmacy_mobile/widgets/dropdown_widget.dart';
-import 'package:pharmacy_mobile/widgets/form_border_widget.dart';
 import 'package:pharmacy_mobile/widgets/form_border_widget2.dart';
 import 'package:pharmacy_mobile/widgets/input_widget.dart';
 import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
@@ -27,6 +26,8 @@ class _AddStockPageState extends State<AddStockPage> {
   final _dateController = TextEditingController();
   final _stocks = Stocks();
 
+  final bool _isLoading = false;
+
   late List _medicineList = [];
   late String _selectedMedicine = '';
   late DateTime selectedDate = DateTime.now();
@@ -99,7 +100,7 @@ class _AddStockPageState extends State<AddStockPage> {
                           controller: _dateController,
                           value: selectedDate,
                         ),
-                        const Gap(16),
+                        const Gap(32),
                         ButtonWidget(text: 'Add Stock', onPressed: _saveStock)
                       ],
                     ),

lib/widgets/datepicker_widget.dart

@@ -3,21 +3,27 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:gap/gap.dart';
 import 'package:intl/intl.dart';
 
-class DatePickerWidget extends StatelessWidget {
+class DatePickerWidget extends StatefulWidget {
   final String label;
   final TextEditingController controller;
-  // final VoidCallback onPressed;
+  DateTime value;
-  late DateTime value = DateTime.now();
 
   DatePickerWidget({super.key, required this.label, required this.controller, required this.value});
 
+  @override
+  State<DatePickerWidget> createState() => _DatePickerWidgetState();
+}
+
+class _DatePickerWidgetState extends State<DatePickerWidget> {
   Future<void> _selectDate(BuildContext context) async {
     final DateTime? picked = await showDatePicker(
-        context: context, initialDate: value, firstDate: DateTime(2015, 8), lastDate: DateTime(2101));
+        context: context, initialDate: widget.value, firstDate: DateTime(2015, 8), lastDate: DateTime(2101));
-    if (picked != null && picked != value) {
+    if (picked != null && picked != widget.value) {
-      value = picked;
+      setState(() {
+        widget.value = picked;
         final DateFormat formatter = DateFormat('MMMM dd, yyyy');
-      controller.text = formatter.format(value);
+        widget.controller.text = formatter.format(widget.value);
+      });
     }
   }
 
@@ -26,40 +32,27 @@ class DatePickerWidget extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text('$label:',
+        Text('${widget.label}:',
             style: GoogleFonts.outfit(
-              textStyle: const TextStyle(color: Colors.white, fontSize: 16),
+              textStyle: const TextStyle(color: Colors.white, fontSize: 12),
             )),
         const Gap(8),
-        TextField(
+        GestureDetector(
-          controller: controller,
+          onTap: () => {_selectDate(context)},
-          decoration: InputDecoration(
-            border: OutlineInputBorder(borderRadius: BorderRadius.circular(10)),
-          ),
-          readOnly: true,
-          style: GoogleFonts.outfit(textStyle: const TextStyle(color: Color.fromRGBO(255, 255, 255, 1), fontSize: 16)),
-        ),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.end,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(top: 8),
           child: Container(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 16),
             decoration: BoxDecoration(
-                  border: Border.all(color: const Color.fromRGBO(255, 255, 255, 1), width: 1),
+              // border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
-                  borderRadius: BorderRadius.circular(10),
+              border: Border.all(color: Colors.white),
+              borderRadius: BorderRadius.circular(8),
+              color: Colors.transparent,
             ),
-                child: TextButton(
+            alignment: Alignment.centerLeft,
-                  onPressed: () => {_selectDate(context)},
+            child: Text(widget.controller.text.isNotEmpty ? widget.controller.text : 'Select Date',
-                  child: Text('Select Date',
                 style: GoogleFonts.outfit(
-                        textStyle: const TextStyle(color: Colors.white, fontSize: 14, height: 2),
+                    textStyle: const TextStyle(color: Color.fromRGBO(255, 255, 255, 1), fontSize: 16))),
-                      )),
           ),
         ),
-            ),
-          ],
-        ),
       ],
     );
   }

lib/widgets/dropdown_widget.dart

@@ -25,13 +25,13 @@ class DropDownWidget extends StatelessWidget {
         Text(
           '$label:',
           style: GoogleFonts.outfit(
-            textStyle: const TextStyle(color: Colors.white, fontSize: 16),
+            textStyle: const TextStyle(color: Colors.white, fontSize: 12),
           ),
         ),
         const Gap(8),
         Container(
           decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(12), // Set the desired border radius
+            borderRadius: BorderRadius.circular(8), // Set the desired border radius
             border: Border.all(color: const Color.fromRGBO(255, 255, 255, 1)), // Set the border color
           ),
           child: DropdownMenu(
@@ -42,19 +42,20 @@ class DropDownWidget extends StatelessWidget {
                     label: item[listTitle].toString(),
                     value: item[listTitle],
                     style: ButtonStyle(
-                        foregroundColor: WidgetStateProperty.all<Color>(const Color.fromRGBO(255, 255, 255, 1)),
+                        foregroundColor: WidgetStateProperty.all<Color>(const Color.fromRGBO(230, 230, 230, 1)),
                         textStyle: WidgetStateProperty.all<TextStyle>(
-                            GoogleFonts.outfit(fontSize: 16, fontWeight: FontWeight.w500)))),
+                            GoogleFonts.inter(fontSize: 16, fontWeight: FontWeight.w500)))),
             ],
             onSelected: onChanged,
-            width: MediaQuery.of(context).size.width * 0.8,
+            width: MediaQuery.of(context).size.width * 0.9,
             menuHeight: MediaQuery.of(context).size.height * 0.8,
-            textStyle: GoogleFonts.outfit(textStyle: const TextStyle(color: Color.fromRGBO(255, 255, 255, 1))),
+            textStyle:
+                GoogleFonts.outfit(textStyle: const TextStyle(color: Color.fromRGBO(255, 255, 255, 1), fontSize: 16)),
             menuStyle: MenuStyle(
-              backgroundColor: WidgetStateProperty.all<Color>(const Color.fromRGBO(23, 37, 62, 0.8)),
+              backgroundColor: WidgetStateProperty.all<Color>(const Color.fromRGBO(13, 21, 42, 0.663)),
-              padding: WidgetStateProperty.all(const EdgeInsets.symmetric(vertical: 16)),
+              padding: WidgetStateProperty.all(const EdgeInsets.symmetric(vertical: 16, horizontal: 8)),
               shape: WidgetStateProperty.all(RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(20), // Set the border radius for the dropdown menu
+                borderRadius: BorderRadius.circular(8), // Set the border radius for the dropdown menu
               )),
             ),
           ),

macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,4 +1,8 @@
 {
+    "info": {
+        "version": 1,
+        "author": "xcode"
+    },
     "images": [
         {
             "size": "16x16",
@@ -60,9 +64,5 @@
             "filename": "app_icon_1024.png",
             "scale": "2x"
         }
-  ],
+    ]
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
 }