Skip to content

project upgraded #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "E-commerce-Complete-Flutter-UI",
"request": "launch",
"type": "dart"
},
{
"name": "E-commerce-Complete-Flutter-UI (profile mode)",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "E-commerce-Complete-Flutter-UI (release mode)",
"request": "launch",
"type": "dart",
"flutterMode": "release"
}
]
}
2 changes: 1 addition & 1 deletion ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import Flutter

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
Expand Down
2 changes: 1 addition & 1 deletion lib/components/Banner/L/banner_l_style_1.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import 'package:shop/components/Banner/L/banner_l.dart';
import 'banner_l.dart';

import '../../../constants.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/entry_point.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:animations/animations.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:shop/constants.dart';
import 'package:shop/route/screen_export.dart';
import 'constants.dart';
import 'route/screen_export.dart';

class EntryPoint extends StatefulWidget {
const EntryPoint({super.key});
Expand Down
6 changes: 3 additions & 3 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:shop/route/route_constants.dart';
import 'package:shop/route/router.dart' as router;
import 'package:shop/theme/app_theme.dart';
import 'route/route_constants.dart';
import 'route/router.dart' as router;
import 'theme/app_theme.dart';

void main() {
runApp(const MyApp());
Expand Down
2 changes: 1 addition & 1 deletion lib/route/router.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/entry_point.dart';
import '../entry_point.dart';

import 'screen_export.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/screens/address/views/addresses_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class AddressesScreen extends StatelessWidget {
const AddressesScreen({super.key});
Expand Down
4 changes: 2 additions & 2 deletions lib/screens/auth/views/login_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:shop/constants.dart';
import 'package:shop/route/route_constants.dart';
import '../../../constants.dart';
import '../../../route/route_constants.dart';

import 'components/login_form.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/screens/auth/views/signup_screen.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:shop/screens/auth/views/components/sign_up_form.dart';
import 'package:shop/route/route_constants.dart';
import 'components/sign_up_form.dart';
import '../../../route/route_constants.dart';

import '../../../constants.dart';

Expand Down
6 changes: 3 additions & 3 deletions lib/screens/bookmark/views/bookmark_screen.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:shop/components/product/product_card.dart';
import 'package:shop/models/product_model.dart';
import 'package:shop/route/route_constants.dart';
import '../../../components/product/product_card.dart';
import '../../../models/product_model.dart';
import '../../../route/route_constants.dart';

import '../../../constants.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/screens/checkout/views/cart_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class CartScreen extends StatelessWidget {
const CartScreen({super.key});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:shop/route/screen_export.dart';
import '../../../../route/screen_export.dart';

import '../../../../constants.dart';

Expand Down
6 changes: 3 additions & 3 deletions lib/screens/discover/views/discover_screen.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:shop/constants.dart';
import 'package:shop/models/category_model.dart';
import 'package:shop/screens/search/views/components/search_form.dart';
import '../../../constants.dart';
import '../../../models/category_model.dart';
import '../../search/views/components/search_form.dart';

import 'components/expansion_category.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/screens/home/views/components/best_sellers.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:shop/components/product/product_card.dart';
import 'package:shop/models/product_model.dart';
import '../../../../components/product/product_card.dart';
import '../../../../models/product_model.dart';

import '../../../../constants.dart';
import '../../../../route/route_constants.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/home/views/components/categories.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:shop/route/screen_export.dart';
import '../../../../route/screen_export.dart';

import '../../../../constants.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/screens/home/views/components/flash_sale.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
import 'package:shop/route/route_constants.dart';

import '/components/Banner/M/banner_m_with_counter.dart';
import '../../../../components/product/product_card.dart';
import '../../../../constants.dart';
import '../../../../models/product_model.dart';
import '../../../../route/route_constants.dart';

class FlashSale extends StatelessWidget {
const FlashSale({
Expand Down
4 changes: 2 additions & 2 deletions lib/screens/home/views/components/most_popular.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:shop/components/product/secondary_product_card.dart';
import 'package:shop/models/product_model.dart';
import '../../../../components/product/secondary_product_card.dart';
import '../../../../models/product_model.dart';

import '../../../../constants.dart';
import '../../../../route/route_constants.dart';
Expand Down
10 changes: 5 additions & 5 deletions lib/screens/home/views/components/offers_carousel.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'dart:async';

import 'package:flutter/material.dart';
import 'package:shop/components/Banner/M/banner_m_style_1.dart';
import 'package:shop/components/Banner/M/banner_m_style_2.dart';
import 'package:shop/components/Banner/M/banner_m_style_3.dart';
import 'package:shop/components/Banner/M/banner_m_style_4.dart';
import 'package:shop/components/dot_indicators.dart';
import '../../../../components/Banner/M/banner_m_style_1.dart';
import '../../../../components/Banner/M/banner_m_style_2.dart';
import '../../../../components/Banner/M/banner_m_style_3.dart';
import '../../../../components/Banner/M/banner_m_style_4.dart';
import '../../../../components/dot_indicators.dart';

import '../../../../constants.dart';

Expand Down
6 changes: 3 additions & 3 deletions lib/screens/home/views/components/popular_products.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:shop/components/product/product_card.dart';
import 'package:shop/models/product_model.dart';
import 'package:shop/route/screen_export.dart';
import '../../../../components/product/product_card.dart';
import '../../../../models/product_model.dart';
import '../../../../route/screen_export.dart';

import '../../../../constants.dart';

Expand Down
8 changes: 4 additions & 4 deletions lib/screens/home/views/home_screen.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:shop/components/Banner/S/banner_s_style_1.dart';
import 'package:shop/components/Banner/S/banner_s_style_5.dart';
import 'package:shop/constants.dart';
import 'package:shop/route/screen_export.dart';
import '../../../components/Banner/S/banner_s_style_1.dart';
import '../../../components/Banner/S/banner_s_style_5.dart';
import '../../../constants.dart';
import '../../../route/screen_export.dart';

import 'components/best_sellers.dart';
import 'components/flash_sale.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/kids/views/kids_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class KidsScreen extends StatelessWidget {
const KidsScreen({super.key});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class EnableNotificationScreen extends StatelessWidget {
const EnableNotificationScreen({super.key});
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/notification/view/no_notification_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class NoNotificationScreen extends StatelessWidget {
const NoNotificationScreen({super.key});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class NotificationOptionsScreen extends StatelessWidget {
const NotificationOptionsScreen({super.key});
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/notification/view/notificatios_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class NotificationsScreen extends StatelessWidget {
const NotificationsScreen({super.key});
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/on_sale/views/on_sale_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class OnSaleScreen extends StatelessWidget {
const OnSaleScreen({super.key});
Expand Down
6 changes: 3 additions & 3 deletions lib/screens/onbording/views/onbording_screnn.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:shop/components/dot_indicators.dart';
import 'package:shop/constants.dart';
import 'package:shop/route/route_constants.dart';
import '../../../components/dot_indicators.dart';
import '../../../constants.dart';
import '../../../route/route_constants.dart';

import 'components/onbording_content.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/screens/order/views/orders_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/components/buy_full_ui_kit.dart';
import '../../../components/buy_full_ui_kit.dart';

class OrdersScreen extends StatelessWidget {
const OrdersScreen({super.key});
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/preferences/views/preferences_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/constants.dart';
import '../../../constants.dart';

import 'components/prederence_list_tile.dart';

Expand Down
4 changes: 2 additions & 2 deletions lib/screens/product/views/added_to_cart_message_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:shop/constants.dart';
import 'package:shop/route/screen_export.dart';
import '../../../constants.dart';
import '../../../route/screen_export.dart';

class AddedToCartMessageScreen extends StatelessWidget {
const AddedToCartMessageScreen({super.key});
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/product/views/components/color_dot.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shop/components/check_mark.dart';
import '../../../../components/check_mark.dart';

import '../../../../constants.dart';

Expand Down
3 changes: 2 additions & 1 deletion lib/screens/product/views/components/notify_me_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ class NotifyMeCard extends StatelessWidget {
),
child: SvgPicture.asset(
"assets/icons/Notification.svg",
color: Colors.white,
colorFilter:
const ColorFilter.mode(Colors.white, BlendMode.srcIn),
),
),
),
Expand Down
8 changes: 6 additions & 2 deletions lib/screens/product/views/components/product_list_tile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,16 @@ class ProductListTile extends StatelessWidget {
leading: SvgPicture.asset(
svgSrc,
height: 24,
color: Theme.of(context).textTheme.bodyLarge!.color,
colorFilter: ColorFilter.mode(
Theme.of(context).textTheme.bodyLarge!.color!,
BlendMode.srcIn),
),
title: Text(title),
trailing: SvgPicture.asset(
"assets/icons/miniRight.svg",
color: Theme.of(context).textTheme.bodyMedium!.color,
colorFilter: ColorFilter.mode(
Theme.of(context).textTheme.bodyMedium!.color!,
BlendMode.srcIn),
),
),
if (isShowBottomBorder) const Divider(height: 1),
Expand Down
8 changes: 6 additions & 2 deletions lib/screens/product/views/components/product_quantity.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ class ProductQuantity extends StatelessWidget {
padding: const EdgeInsets.all(defaultPadding / 2)),
child: SvgPicture.asset(
"assets/icons/Minus.svg",
color: Theme.of(context).iconTheme.color,
colorFilter: ColorFilter.mode(
Theme.of(context).iconTheme.color!, BlendMode.srcIn,
),
),
),
),
Expand All @@ -60,7 +62,9 @@ class ProductQuantity extends StatelessWidget {
padding: const EdgeInsets.all(defaultPadding / 2)),
child: SvgPicture.asset(
"assets/icons/Plus1.svg",
color: Theme.of(context).iconTheme.color,
colorFilter: ColorFilter.mode(
Theme.of(context).iconTheme.color!, BlendMode.srcIn,
),
),
),
),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:shop/theme/input_decoration_theme.dart';
import '../../../theme/input_decoration_theme.dart';

import '../../../constants.dart';

Expand Down Expand Up @@ -51,10 +51,12 @@ class LocationPermissonStoreAvailabilityScreen extends StatelessWidget {
child: SvgPicture.asset(
"assets/icons/Search.svg",
height: 24,
color: Theme.of(context)
.inputDecorationTheme
.hintStyle!
.color,
colorFilter: ColorFilter.mode(
Theme.of(context)
.inputDecorationTheme
.hintStyle!
.color!,
BlendMode.srcIn),
),
),
),
Expand Down
Loading