From 5840df0879ee3617e32ec07c08ae676d269fc074 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Mon, 10 Feb 2025 09:51:04 +0800 Subject: [PATCH] update --- .metadata | 26 +++++++----------------- lib/pages/add_category.dart | 2 +- lib/pages/add_medicine.dart | 2 +- lib/pages/add_stock.dart | 6 ++---- lib/pages/add_type.dart | 6 +++--- lib/pages/index_page.dart | 4 ---- lib/pages/list_stocks.dart | 8 ++++---- lib/pages/login_page.dart | 10 ++++----- lib/widgets/button_widget.dart | 6 ++++-- lib/widgets/datatable_widget.dart | 4 ++-- lib/widgets/datepicker_widget.dart | 4 ++-- lib/widgets/dropdown_widget.dart | 6 +++--- lib/widgets/dropdown_wrapper_widget.dart | 2 +- lib/widgets/form_border_widget.dart | 8 ++++---- lib/widgets/input_widget.dart | 6 +++--- lib/widgets/menu_widget.dart | 6 +++--- 16 files changed, 45 insertions(+), 61 deletions(-) diff --git a/.metadata b/.metadata index 72bc489..da6e627 100644 --- a/.metadata +++ b/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled and should not be manually edited. version: - revision: "archlinuxaur0000000000000000000000000000" - channel: "" + revision: "c519ee916eaeb88923e67befb89c0f1dabfa83e6" + channel: "stable" project_type: app @@ -13,23 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: archlinuxaur0000000000000000000000000000 - base_revision: archlinuxaur0000000000000000000000000000 - - platform: android - create_revision: archlinuxaur0000000000000000000000000000 - base_revision: archlinuxaur0000000000000000000000000000 - - platform: ios - create_revision: archlinuxaur0000000000000000000000000000 - base_revision: archlinuxaur0000000000000000000000000000 - - platform: linux - create_revision: archlinuxaur0000000000000000000000000000 - base_revision: archlinuxaur0000000000000000000000000000 - - platform: macos - create_revision: archlinuxaur0000000000000000000000000000 - base_revision: archlinuxaur0000000000000000000000000000 - - platform: windows - create_revision: archlinuxaur0000000000000000000000000000 - base_revision: archlinuxaur0000000000000000000000000000 + create_revision: c519ee916eaeb88923e67befb89c0f1dabfa83e6 + base_revision: c519ee916eaeb88923e67befb89c0f1dabfa83e6 + - platform: web + create_revision: c519ee916eaeb88923e67befb89c0f1dabfa83e6 + base_revision: c519ee916eaeb88923e67befb89c0f1dabfa83e6 # User provided section diff --git a/lib/pages/add_category.dart b/lib/pages/add_category.dart index 5e5effd..ea0a76f 100644 --- a/lib/pages/add_category.dart +++ b/lib/pages/add_category.dart @@ -76,7 +76,7 @@ class _AddCategoryPageState extends State { InputWidget(label: 'Category Name', controller: _categoryController), const Gap(32), if (_isLoading) - Center(child: CircularProgressIndicator(color: Colors.white)) + const Center(child: CircularProgressIndicator(color: Colors.white)) else ButtonWidget(text: 'Save Category', onPressed: _saveCategory) ], diff --git a/lib/pages/add_medicine.dart b/lib/pages/add_medicine.dart index 18aa71f..a7ba8f3 100644 --- a/lib/pages/add_medicine.dart +++ b/lib/pages/add_medicine.dart @@ -214,7 +214,7 @@ class _AddMedicinePageState extends State { onChanged: _updateManufactorer)), const Gap(32), if (_isLoading) - Center(child: CircularProgressIndicator(color: Colors.white)) + const Center(child: CircularProgressIndicator(color: Colors.white)) else ButtonWidget(text: 'Save Medicine', onPressed: _saveMedicine) ], diff --git a/lib/pages/add_stock.dart b/lib/pages/add_stock.dart index 39f6e64..94cd283 100644 --- a/lib/pages/add_stock.dart +++ b/lib/pages/add_stock.dart @@ -11,8 +11,6 @@ import 'package:pharmacy_mobile/widgets/page_background_widget.dart'; import 'package:pharmacy_mobile/widgets/text_widget.dart'; import 'package:pharmacy_mobile/widgets/title_widget.dart'; -// import 'package:intl/intl.dart'; - class AddStockPage extends StatefulWidget { const AddStockPage({super.key}); @@ -40,7 +38,7 @@ class _AddStockPageState extends State { _selectedMedicine = medicine; } - void saveStock() async { + void _saveStock() async { final stockNameUUID = await _refMedicines.getUUID(_selectedMedicine); final stockQuantity = _quantityController.text; final stockExpiration = _dateController.text; @@ -97,7 +95,7 @@ class _AddStockPageState extends State { value: selectedDate, ), const Gap(16), - ButtonWidget(text: 'Add Stock', onPressed: saveStock) + ButtonWidget(text: 'Add Stock', onPressed: _saveStock) ], ), ), diff --git a/lib/pages/add_type.dart b/lib/pages/add_type.dart index e29b792..6ac990d 100644 --- a/lib/pages/add_type.dart +++ b/lib/pages/add_type.dart @@ -25,7 +25,7 @@ class _AddTypePageState extends State { bool _isLoading = false; - void saveType() async { + void _saveType() async { setState(() => _isLoading = true); try { if (await InternetConnectionChecker.instance.hasConnection) { @@ -83,9 +83,9 @@ class _AddTypePageState extends State { InputWidget(label: 'Type Name', controller: _typeController), const Gap(32), if (_isLoading) - Center(child: CircularProgressIndicator(color: Colors.white)) + const Center(child: CircularProgressIndicator(color: Colors.white)) else - ButtonWidget(text: 'Save Type', onPressed: saveType) + ButtonWidget(text: 'Save Type', onPressed: _saveType) ], ), )), diff --git a/lib/pages/index_page.dart b/lib/pages/index_page.dart index 8bab356..b98b858 100644 --- a/lib/pages/index_page.dart +++ b/lib/pages/index_page.dart @@ -1,8 +1,5 @@ -import 'dart:developer'; - import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -// import 'package:google_fonts/google_fonts.dart'; import 'package:gap/gap.dart'; import 'package:pharmacy_mobile/widgets/button_widget.dart'; import 'package:pharmacy_mobile/widgets/page_background_widget.dart'; @@ -16,7 +13,6 @@ class IndexPage extends StatelessWidget { @override Widget build(BuildContext context) { void gotoLogin() { - log(MediaQuery.of(context).size.height.toString()); context.push('/login'); } diff --git a/lib/pages/list_stocks.dart b/lib/pages/list_stocks.dart index d0f7e22..20eb64e 100644 --- a/lib/pages/list_stocks.dart +++ b/lib/pages/list_stocks.dart @@ -94,9 +94,9 @@ class _ListStocksPageState extends State { const TextWidget(text: 'List of Stocks'), const Gap(16), if (_isLoading) - Center( + const Center( child: CircularProgressIndicator( - color: Colors.white, + color: Color.fromRGBO(255, 255, 255, 1), )) else if (_stockList.isEmpty) // TextWidget(text: 'No Stock Listed') @@ -105,11 +105,11 @@ class _ListStocksPageState extends State { border: Border.all(color: const Color.fromRGBO(205, 59, 208, 0.702), width: 2), borderRadius: BorderRadius.circular(12), ), - padding: EdgeInsets.symmetric(horizontal: 32, vertical: 16.0), + padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 16.0), child: Text( 'No Stock Listed', style: GoogleFonts.outfit( - color: Color.fromRGBO(255, 255, 255, 1), + color: const Color.fromRGBO(255, 255, 255, 1), fontSize: 14, fontWeight: FontWeight.normal, ), diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index 982934d..e9e4953 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -115,13 +115,13 @@ class _LoginPageState extends State { Padding( padding: const EdgeInsets.only(left: 32, right: 32), child: Container( - padding: EdgeInsets.fromLTRB(32, 32, 32, 40), - decoration: BoxDecoration( - color: const Color.fromRGBO(57, 38, 62, 0.6), + padding: const EdgeInsets.fromLTRB(32, 32, 32, 40), + decoration: const BoxDecoration( + color: Color.fromRGBO(57, 38, 62, 0.6), borderRadius: BorderRadius.all(Radius.circular(16)), boxShadow: [ BoxShadow( - color: const Color.fromRGBO(0, 0, 0, 0.2), // Subtle shadow to give depth + color: Color.fromRGBO(0, 0, 0, 0.2), // Subtle shadow to give depth spreadRadius: 0, blurRadius: 4, offset: Offset(0, 2), @@ -148,7 +148,7 @@ class _LoginPageState extends State { const Gap(40), // TextButton(onPressed: () => {_signIn()}, child: const Text('Login')) if (_isLoading) - Center(child: CircularProgressIndicator(color: Colors.white)) + const Center(child: CircularProgressIndicator(color: Color.fromRGBO(255, 255, 255, 1))) else ButtonWidget(text: 'Login', onPressed: _signIn) ], diff --git a/lib/widgets/button_widget.dart b/lib/widgets/button_widget.dart index 7d680c0..dcc04e2 100644 --- a/lib/widgets/button_widget.dart +++ b/lib/widgets/button_widget.dart @@ -19,7 +19,8 @@ class ButtonWidget extends StatelessWidget { shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12), ), - minimumSize: Size(MediaQuery.of(context).size.width - 96, 44), // minimum size + minimumSize: Size(MediaQuery.of(context).size.width <= 768 ? MediaQuery.of(context).size.width - 96 : 320, + 44), // minimum size padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16), ) : ElevatedButton.styleFrom( @@ -29,7 +30,8 @@ class ButtonWidget extends StatelessWidget { shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12), // rounded corners ), - minimumSize: Size(MediaQuery.of(context).size.width - 96, 44), // minimum size + minimumSize: Size(MediaQuery.of(context).size.width <= 768 ? MediaQuery.of(context).size.width - 96 : 320, + 44), // minimum size padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16), ), onPressed: onPressed, diff --git a/lib/widgets/datatable_widget.dart b/lib/widgets/datatable_widget.dart index ab5c4b7..8f14021 100644 --- a/lib/widgets/datatable_widget.dart +++ b/lib/widgets/datatable_widget.dart @@ -10,9 +10,9 @@ class DataTableWidget extends StatelessWidget { Widget build(BuildContext context) { return DataTable( decoration: BoxDecoration( - border: Border.all(color: Colors.black, width: 1.0), + border: Border.all(color: const Color.fromRGBO(0, 0, 0, 1), width: 1.0), borderRadius: BorderRadius.circular(12), - color: Color.fromARGB(255, 240, 240, 240), + color: const Color.fromARGB(255, 240, 240, 240), ), headingTextStyle: GoogleFonts.outfit(textStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500)), dataTextStyle: GoogleFonts.outfit(textStyle: const TextStyle(fontSize: 14)), diff --git a/lib/widgets/datepicker_widget.dart b/lib/widgets/datepicker_widget.dart index 9757122..8ad66e5 100644 --- a/lib/widgets/datepicker_widget.dart +++ b/lib/widgets/datepicker_widget.dart @@ -37,7 +37,7 @@ class DatePickerWidget extends StatelessWidget { border: OutlineInputBorder(borderRadius: BorderRadius.circular(10)), ), readOnly: true, - style: GoogleFonts.outfit(textStyle: TextStyle(color: Colors.white, fontSize: 16)), + style: GoogleFonts.outfit(textStyle: const TextStyle(color: Color.fromRGBO(255, 255, 255, 1), fontSize: 16)), ), Row( mainAxisAlignment: MainAxisAlignment.end, @@ -46,7 +46,7 @@ class DatePickerWidget extends StatelessWidget { padding: const EdgeInsets.only(top: 8), child: Container( decoration: BoxDecoration( - border: Border.all(color: Colors.white, width: 1), + border: Border.all(color: const Color.fromRGBO(255, 255, 255, 1), width: 1), borderRadius: BorderRadius.circular(10), ), child: TextButton( diff --git a/lib/widgets/dropdown_widget.dart b/lib/widgets/dropdown_widget.dart index 3aed1aa..3cab28a 100644 --- a/lib/widgets/dropdown_widget.dart +++ b/lib/widgets/dropdown_widget.dart @@ -32,7 +32,7 @@ class DropDownWidget extends StatelessWidget { Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), // Set the desired border radius - border: Border.all(color: Colors.white), // Set the border color + border: Border.all(color: const Color.fromRGBO(255, 255, 255, 1)), // Set the border color ), child: DropdownMenu( initialSelection: '', @@ -42,14 +42,14 @@ class DropDownWidget extends StatelessWidget { label: item[listTitle].toString(), value: item[listTitle], style: ButtonStyle( - foregroundColor: WidgetStateProperty.all(Colors.white), + foregroundColor: WidgetStateProperty.all(const Color.fromRGBO(255, 255, 255, 1)), textStyle: WidgetStateProperty.all( GoogleFonts.outfit(fontSize: 16, fontWeight: FontWeight.w500)))), ], onSelected: onChanged, width: MediaQuery.of(context).size.width * 0.8, menuHeight: MediaQuery.of(context).size.height * 0.8, - textStyle: GoogleFonts.outfit(textStyle: TextStyle(color: Colors.white)), + textStyle: GoogleFonts.outfit(textStyle: const TextStyle(color: Color.fromRGBO(255, 255, 255, 1))), menuStyle: MenuStyle( backgroundColor: WidgetStateProperty.all(const Color.fromRGBO(23, 37, 62, 0.8)), padding: WidgetStateProperty.all(const EdgeInsets.symmetric(vertical: 16)), diff --git a/lib/widgets/dropdown_wrapper_widget.dart b/lib/widgets/dropdown_wrapper_widget.dart index 911c94b..77973eb 100644 --- a/lib/widgets/dropdown_wrapper_widget.dart +++ b/lib/widgets/dropdown_wrapper_widget.dart @@ -25,7 +25,7 @@ class DropdownWrapperWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, spacing: 16, children: [ - CircularProgressIndicator(color: Colors.white), + const CircularProgressIndicator(color: Color.fromRGBO(255, 255, 255, 1)), TextWidget( text: 'Fetching $text', size: 16, diff --git a/lib/widgets/form_border_widget.dart b/lib/widgets/form_border_widget.dart index 6dad869..d71cb58 100644 --- a/lib/widgets/form_border_widget.dart +++ b/lib/widgets/form_border_widget.dart @@ -17,13 +17,13 @@ class FormBorderWidget extends StatelessWidget { return Padding( padding: const EdgeInsets.only(left: 32, right: 32), child: Container( - padding: EdgeInsets.fromLTRB(32, 32, 32, 40), + padding: const EdgeInsets.fromLTRB(32, 32, 32, 40), decoration: BoxDecoration( color: _getColor(color ?? ''), - borderRadius: BorderRadius.all(Radius.circular(16)), + borderRadius: const BorderRadius.all(Radius.circular(16)), boxShadow: [ - BoxShadow( - color: const Color.fromRGBO(0, 0, 0, 0.2), // Subtle shadow to give depth + const BoxShadow( + color: Color.fromRGBO(0, 0, 0, 0.2), // Subtle shadow to give depth spreadRadius: 0, blurRadius: 4, offset: Offset(0, 2), diff --git a/lib/widgets/input_widget.dart b/lib/widgets/input_widget.dart index bc63d98..333ad7d 100644 --- a/lib/widgets/input_widget.dart +++ b/lib/widgets/input_widget.dart @@ -24,10 +24,10 @@ class InputWidget extends StatelessWidget { controller: controller, decoration: InputDecoration( filled: true, // Enable filling the background - fillColor: Colors.white, + fillColor: const Color.fromRGBO(255, 255, 255, 1), border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)), - contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 24)), - style: GoogleFonts.outfit(textStyle: TextStyle(color: const Color.fromRGBO(0, 0, 0, 1), fontSize: 16)), + contentPadding: const EdgeInsets.symmetric(vertical: 10, horizontal: 24)), + style: GoogleFonts.outfit(textStyle: const TextStyle(color: Color.fromRGBO(0, 0, 0, 1), fontSize: 16)), obscureText: password ?? false, ), ], diff --git a/lib/widgets/menu_widget.dart b/lib/widgets/menu_widget.dart index 636228f..287beac 100644 --- a/lib/widgets/menu_widget.dart +++ b/lib/widgets/menu_widget.dart @@ -22,13 +22,13 @@ class MenuWidget extends StatelessWidget { onTap: onPressed, child: Container( width: MediaQuery.of(context).size.width - 96, - padding: EdgeInsets.only(top: 16, bottom: 16), + padding: const EdgeInsets.only(top: 16, bottom: 16), decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), border: Border.all( color: color != null ? _getColorBasedOnString(color ?? '') : const Color.fromRGBO(255, 255, 255, 0.6), width: 2), - color: color != null ? _getColorBasedOnString(color ?? '') : Colors.transparent, + color: color != null ? _getColorBasedOnString(color ?? '') : const Color.fromRGBO(0, 0, 0, 0), ), child: Row( mainAxisAlignment: MainAxisAlignment.start, @@ -61,7 +61,7 @@ class MenuWidget extends StatelessWidget { case 'teal': return teal; default: - return Colors.transparent; // Default to transparent if color is not recognized + return const Color.fromRGBO(0, 0, 0, 0); // Default to transparent if color is not recognized } } }