dev #1

Merged
aefril merged 128 commits from dev into main 2025-08-13 17:19:48 +00:00
10 changed files with 33 additions and 31 deletions
Showing only changes of commit ba2e010150 - Show all commits

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,15 @@
/// GENERATED CODE - DO NOT MODIFY BY HAND
/// *****************************************************
/// FlutterGen
/// *****************************************************
// coverage:ignore-file
// ignore_for_file: type=lint
// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
class FontFamily {
FontFamily._();
/// Font family: Quicksand
static const String quicksand = 'Quicksand';
}

View File

@ -1,6 +1,6 @@
import 'package:enaklo_pos/core/assets/fonts.gen.dart';
import 'package:enaklo_pos/core/constants/colors.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
ThemeData getApplicationTheme = ThemeData(
primaryColor: AppColors.primary,
@ -8,7 +8,7 @@ ThemeData getApplicationTheme = ThemeData(
appBarTheme: AppBarTheme(
color: AppColors.white,
elevation: 0,
titleTextStyle: GoogleFonts.quicksand(
titleTextStyle: TextStyle(
color: AppColors.primary,
fontSize: 16.0,
fontWeight: FontWeight.w500,
@ -17,7 +17,7 @@ ThemeData getApplicationTheme = ThemeData(
color: AppColors.primary,
),
),
fontFamily: GoogleFonts.quicksand().fontFamily,
fontFamily: FontFamily.quicksand,
colorScheme: ColorScheme.fromSeed(seedColor: AppColors.primary),
useMaterial3: true,
inputDecorationTheme: InputDecorationTheme(

View File

@ -49,9 +49,7 @@ import 'package:enaklo_pos/presentation/setting/bloc/sync_product/sync_product_b
import 'package:enaklo_pos/presentation/setting/bloc/tax_settings/tax_settings_bloc.dart';
import 'package:enaklo_pos/presentation/table/blocs/update_table/update_table_bloc.dart';
import 'package:enaklo_pos/presentation/home/bloc/add_order_items/add_order_items_bloc.dart';
import 'package:google_fonts/google_fonts.dart';
import 'core/constants/colors.dart';
import 'presentation/auth/bloc/login/login_bloc.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

View File

@ -541,14 +541,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.2"
google_fonts:
dependency: "direct main"
description:
name: google_fonts
sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
url: "https://pub.dev"
source: hosted
version: "6.2.1"
graphs:
dependency: transitive
description:

View File

@ -2,7 +2,7 @@ name: enaklo_pos
description: "EnakloPOS - Point of Sale Application"
# The following line prevents the package from being accidentally published to
# pub.dev using `flutter pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
publish_to: "none" # Remove this line if you wish to publish to pub.dev
# The following defines the version and build number for your application.
# A version number is three numbers separated by dots, like 1.2.43
@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1
environment:
sdk: '>=3.2.4 <4.0.0'
sdk: ">=3.2.4 <4.0.0"
# Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions
@ -41,7 +41,6 @@ dependencies:
flutter_svg: ^2.0.9
freezed: ^2.4.6
freezed_annotation: ^2.4.1
google_fonts: ^6.1.0
hive: ^2.2.3
horizontal_data_table: ^4.3.1
http: ^1.2.0
@ -98,7 +97,6 @@ flutter_launcher_icons:
image_path: "assets/logo/logo.png"
flutter:
# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in
# the material Icons class.
@ -118,17 +116,16 @@ flutter:
# "family" key with the font family name, and a "fonts" key with a
# list giving the asset and other descriptors for the font. For
# example:
# fonts:
# - family: Schyler
# fonts:
# - asset: fonts/Schyler-Regular.ttf
# - asset: fonts/Schyler-Italic.ttf
# style: italic
# - family: Trajan Pro
# fonts:
# - asset: fonts/TrajanPro.ttf
# - asset: fonts/TrajanPro_Bold.ttf
# weight: 700
#
# For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages
fonts:
- family: Quicksand
fonts:
- asset: assets/fonts/quicksand/Quicksand-Light.ttf
weight: 300
- asset: assets/fonts/quicksand/Quicksand-Regular.ttf
weight: 400
- asset: assets/fonts/quicksand/Quicksand-Medium.ttf
weight: 500
- asset: assets/fonts/quicksand/Quicksand-SemiBold.ttf
weight: 600
- asset: assets/fonts/quicksand/Quicksand-Bold.ttf
weight: 700