Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fixing this real for this time #15

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixing this real for this time #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.webkul.bagisto.mobikul"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 22
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
Expand All @@ -58,8 +55,6 @@ android {

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
}
}
Expand All @@ -75,17 +70,11 @@ dependencies {

implementation 'com.facebook.android:facebook-android-sdk:8.2.0'
implementation 'com.google.ar.sceneform.ux:sceneform-ux:1.17.1'
// ML KIT
api 'com.google.android.gms:play-services-mlkit-text-recognition:18.0.0'
api 'com.google.mlkit:image-labeling:17.0.7'
// Image labeling custom
api 'com.google.mlkit:image-labeling-custom:17.0.1'
//===Ar Core
implementation "com.google.ar.sceneform.ux:sceneform-ux:1.17.1"
// implementation "com.google.ar.sceneform:core:1.17.1"
implementation 'com.google.ar.sceneform:assets:1.17.1'
implementation "com.google.ar:core:1.30.0"
//---------------------------------------//
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.github.bumptech.glide:glide:4.12.0'
Expand Down
2 changes: 2 additions & 0 deletions lib/data_model/order_model/order_detail_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class OrderDetailModel extends GraphQlBaseModel {
factory OrderDetailModel.fromJson(Map<String, dynamic> json) =>
_$OrderDetailModelFromJson(json);

@override
Map<String, dynamic> toJson() => _$OrderDetailModelToJson(this);
}

Expand Down Expand Up @@ -179,6 +180,7 @@ class OrderDetail extends GraphQlBaseErrorModel {
factory OrderDetail.fromJson(Map<String, dynamic> json) =>
_$OrderDetailFromJson(json);

@override
Map<String, dynamic> toJson() => _$OrderDetailToJson(this);
}

Expand Down
4 changes: 2 additions & 2 deletions lib/screens/add_edit_address/view/add_edit_address_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,8 @@ class _AddNewAddressState extends State<AddNewAddress>
elevation: 0.0,
height: 48,
minWidth: MediaQuery.of(context).size.width,
color: Theme.of(context).colorScheme.background,
textColor: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.surface,
textColor: Theme.of(context).colorScheme.onSurface,
onPressed: () {
_onPressSaveButton();
},
Expand Down
6 changes: 3 additions & 3 deletions lib/screens/add_review/view/add_review.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ class _AddReviewState extends State<AddReview> {
images.clear();
if(image != null){
images.add({
"uploadType": '\"base64\"',
"imageUrl": '\"data:image/png;base64,$image\"'
"uploadType": '"base64"',
"imageUrl": '"data:image/png;base64,$image"'
});
}
return _reviewForm();
Expand Down Expand Up @@ -244,7 +244,7 @@ class _AddReviewState extends State<AddReview> {
elevation: 0.0,
height: AppSizes.buttonHeight,
minWidth: MediaQuery.of(context).size.width,
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
textColor: MobikulTheme.primaryColor,
onPressed: () {
_onPressSubmitButton();
Expand Down
4 changes: 2 additions & 2 deletions lib/screens/address_list/view/widget/add_new_address_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AddNewAddressButton extends StatelessWidget {
: Padding(
padding: const EdgeInsets.all(8.0),
child: MaterialButton(
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
padding: const EdgeInsets.all(AppSizes.spacingMedium),
onPressed: () {
Navigator.pushNamed(context, addAddressScreen,
Expand All @@ -56,7 +56,7 @@ class AddNewAddressButton extends StatelessWidget {
),
Text(
StringConstants.addNewAddress.localized().toUpperCase(),
style: TextStyle(color: Theme.of(context).colorScheme.background),
style: TextStyle(color: Theme.of(context).colorScheme.surface),
)
],
),
Expand Down
10 changes: 1 addition & 9 deletions lib/screens/address_list/view/widget/saved_address_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,7 @@ class SavedAddressList extends StatelessWidget {
return Padding(
padding: const EdgeInsets.fromLTRB(AppSizes.spacingMedium, 0, 0, 0),
child: Text(
("${addressModel?.address1!.replaceAll("[", "").replaceAll("]", "") ?? ""}") +
"," +
(" ${addressModel?.city ?? ""}") +
"," +
(" ${addressModel?.stateName ?? (addressModel?.state ?? "")}") +
"," +
(" ${addressModel?.countryName ?? ""}") +
"," +
(" ${addressModel?.postcode ?? ""}"),
"${addressModel?.address1!.replaceAll("[", "").replaceAll("]", "") ?? ""}, ${addressModel?.city ?? ""}, ${addressModel?.stateName ?? (addressModel?.state ?? "")}, ${addressModel?.countryName ?? ""}, ${addressModel?.postcode ?? ""}",
style: TextStyle(
fontSize: AppSizes.spacingLarge, color: Colors.grey[600]),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/categories_screen/categories_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class _SubCategoryScreenState extends State<SubCategoryScreen> {

@override
void initState() {
filters.add({"key": '\"category_id\"', "value": '\"${widget.id}\"'});
filters.add({"key": '"category_id"', "value": '"${widget.id}"'});

_fetchSharedPreferenceData();
getSharePreferenceCartCount().then((value) {
Expand Down
1 change: 0 additions & 1 deletion lib/screens/checkout/checkout_addres/view/widget/billing_shipping_address_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
import '../../../../../../data_model/app_route_arguments.dart';
import '../../../../../../utils/assets_constants.dart';
import '../../../../address_list/data_model/address_model.dart';
import '../../bloc/checkout_bloc.dart';

// ignore: must_be_immutable
class BillingAndShippingAddressView extends StatefulWidget {
Expand Down
5 changes: 0 additions & 5 deletions lib/screens/checkout/checkout_addres/view/widget/checkout_address_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@
*/

import 'package:bagisto_app_demo/screens/cart_screen/cart_index.dart';
import 'package:bagisto_app_demo/utils/application_localization.dart';
import 'package:bagisto_app_demo/widgets/loader.dart';
import 'package:flutter/material.dart';
import '../../../../../../utils/app_constants.dart';
import '../../../../../../utils/app_global_data.dart';
import '../../../../../utils/string_constants.dart';
import '../../../../address_list/data_model/address_model.dart';
import '../../bloc/checkout_address_state.dart';
import '../../bloc/checkout_base_event.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/checkout/checkout_review/view/widget/apply_coupon_code.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class _ApplyCouponCodeState extends State<ApplyCouponCode> {
right: 3),
child: MaterialButton(
height: 47,
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
textColor: MobikulTheme.primaryColor,
elevation: 0.0,
shape: RoundedRectangleBorder(
Expand Down
6 changes: 3 additions & 3 deletions lib/screens/checkout/checkout_save_order/view/save_order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ class _CheckOutSaveOrderState extends State<CheckOutSaveOrder> {
height: AppSizes.spacingMedium,
),
MaterialButton(
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
elevation: 0.0,
textColor: Theme.of(context).colorScheme.background,
textColor: Theme.of(context).colorScheme.surface,
onPressed: () {
Navigator.pushReplacementNamed(context, home);
},
Expand All @@ -184,7 +184,7 @@ class _CheckOutSaveOrderState extends State<CheckOutSaveOrder> {
.localized()
.toUpperCase(),
style: Theme.of(context).textTheme.labelMedium?.copyWith(
color: Theme.of(context).colorScheme.background
color: Theme.of(context).colorScheme.surface
),
),
),
Expand Down
4 changes: 1 addition & 3 deletions lib/screens/checkout/checkout_shipping/view/checkout_shipping_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,7 @@ class _CheckoutShippingPageViewState extends State<CheckoutShippingPageView> {
key: const Key('Shipping'),
labels: checkOutSaveAddressModel.shippingMethods
?.map((e) =>
(e.title ?? '') +
' ' +
(e.methods?.formattedPrice.toString() ?? ''))
'${e.title ?? ''} ${e.methods?.formattedPrice.toString() ?? ''}')
.toList() ??
[],
onChange: (value, index) {
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/checkout/guest_add_address/view/guest_add_address_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ class _GuestAddAddressFormState extends State<GuestAddAddressForm>
elevation: 0.0,
height: AppSizes.buttonHeight,
minWidth: MediaQuery.of(context).size.width,
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
textColor: MobikulTheme.primaryColor,
onPressed: () {
_onPressSaveButton();
Expand Down
8 changes: 4 additions & 4 deletions lib/screens/checkout/view/checkout_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ class _CheckoutScreenState extends State<CheckoutScreen> {
Expanded(
flex: 1,
child: MaterialButton(
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
elevation: 0.0,
textColor: MobikulTheme.primaryColor,
shape: RoundedRectangleBorder(
Expand Down Expand Up @@ -473,7 +473,7 @@ class _CheckoutScreenState extends State<CheckoutScreen> {
? StringConstants.placeOrder.localized()
: StringConstants.proceed.localized().toUpperCase(),
style: Theme.of(context).textTheme.labelMedium?.copyWith(
color: Theme.of(context).colorScheme.background
color: Theme.of(context).colorScheme.surface
),
),
),
Expand Down Expand Up @@ -514,7 +514,7 @@ class _CheckoutScreenState extends State<CheckoutScreen> {
Expanded(
flex: 1,
child: MaterialButton(
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
elevation: 0.0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8.0),
Expand Down Expand Up @@ -549,7 +549,7 @@ class _CheckoutScreenState extends State<CheckoutScreen> {
? StringConstants.placeOrder.localized()
: StringConstants.proceed.localized().toUpperCase(),
style: Theme.of(context).textTheme.labelMedium?.copyWith(
color: Theme.of(context).colorScheme.background
color: Theme.of(context).colorScheme.surface
),
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/compare/view/compare_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ class _CompareScreenState extends State<CompareScreen>
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Loader(),
const Loader(),
const SizedBox(
height: AppSizes.spacingNormal,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/compare/view/widget/compare_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class CompareList extends StatelessWidget {
decoration: BoxDecoration(
color: Theme.of(context)
.colorScheme
.onBackground,
.onSurface,
borderRadius: const BorderRadius.all(
Radius.circular(20)),
boxShadow: [
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/compare/view/widget/compare_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class CompareView extends StatelessWidget {
left: 8.0, top: 8, right: 8),
child: ColorFiltered(
colorFilter: ColorFilter.mode(
Theme.of(context).colorScheme.onBackground,
Theme.of(context).colorScheme.onSurface,
BlendMode.srcIn,
),
child: HtmlWidget(
Expand Down
22 changes: 11 additions & 11 deletions lib/screens/dashboard/view/dashboard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class _DashboardScreenState extends State<DashboardScreen>
Widget reviewsScreen = BlocProvider(
create: (context) =>
ReviewsBloc(repository: ReviewsRepositoryImp(), context: context),
child: ReviewsScreen(
child: const ReviewsScreen(
isFromDashboard: true,
));

Expand Down Expand Up @@ -97,7 +97,7 @@ class _DashboardScreenState extends State<DashboardScreen>
),
Container(
height: MediaQuery.of(context).size.height / 2.15,
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
child: TabBarView(children: [
///orderScreen
Column(
Expand All @@ -115,9 +115,9 @@ class _DashboardScreenState extends State<DashboardScreen>
elevation: 0.0,
height: AppSizes.buttonHeight,
minWidth: MediaQuery.of(context).size.width,
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
textColor:
Theme.of(context).colorScheme.background,
Theme.of(context).colorScheme.surface,
onPressed: () {
Navigator.pushReplacementNamed(context, home);
},
Expand All @@ -136,7 +136,7 @@ class _DashboardScreenState extends State<DashboardScreen>
style: Theme.of(context)
.textTheme
.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.background
color: Theme.of(context).colorScheme.surface
),
),
],
Expand All @@ -163,9 +163,9 @@ class _DashboardScreenState extends State<DashboardScreen>
elevation: 0.0,
height: AppSizes.buttonHeight,
minWidth: MediaQuery.of(context).size.width,
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
textColor:
Theme.of(context).colorScheme.background,
Theme.of(context).colorScheme.surface,
onPressed: () {
addressIsEmpty
? Navigator.pushNamed(context, addAddressScreen,
Expand Down Expand Up @@ -198,7 +198,7 @@ class _DashboardScreenState extends State<DashboardScreen>
.textTheme
.bodyLarge
?.copyWith(
color: Theme.of(context).colorScheme.background),
color: Theme.of(context).colorScheme.surface),
),
],
),
Expand All @@ -224,9 +224,9 @@ class _DashboardScreenState extends State<DashboardScreen>
elevation: 0.0,
height: AppSizes.buttonHeight,
minWidth: MediaQuery.of(context).size.width,
color: Theme.of(context).colorScheme.onBackground,
color: Theme.of(context).colorScheme.onSurface,
textColor:
Theme.of(context).colorScheme.background,
Theme.of(context).colorScheme.surface,
onPressed: () {
Navigator.pushReplacementNamed(context, home);
},
Expand All @@ -245,7 +245,7 @@ class _DashboardScreenState extends State<DashboardScreen>
style: Theme.of(context)
.textTheme
.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.background
color: Theme.of(context).colorScheme.surface
),
),
],
Expand Down
16 changes: 8 additions & 8 deletions lib/screens/downloadable_products/view/widgets/download_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ class DownloadButton extends StatelessWidget {
Widget build(BuildContext context) {
return ElevatedButton(
style: ButtonStyle(
maximumSize: MaterialStateProperty.all(const Size(270, 104)),
foregroundColor: MaterialStateProperty.all<Color>(
Theme.of(context).colorScheme.background,
maximumSize: WidgetStateProperty.all(const Size(270, 104)),
foregroundColor: WidgetStateProperty.all<Color>(
Theme.of(context).colorScheme.surface,
),
backgroundColor: MaterialStateProperty.all<Color>(
Theme.of(context).colorScheme.onBackground,
backgroundColor: WidgetStateProperty.all<Color>(
Theme.of(context).colorScheme.onSurface,
),
shape: MaterialStateProperty.all<RoundedRectangleBorder>(
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8.0),
),
Expand Down Expand Up @@ -57,7 +57,7 @@ class DownloadButton extends StatelessWidget {
Icon(
Icons.download,
size: 17,
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
),
const SizedBox(
width: 2,
Expand All @@ -68,7 +68,7 @@ class DownloadButton extends StatelessWidget {
"",
style: TextStyle(
fontSize: 14,
color: Theme.of(context).colorScheme.background,
color: Theme.of(context).colorScheme.surface,
),
overflow: TextOverflow.clip,
maxLines: 1,
Expand Down
Loading