CityCards/CityCards_Customer_Flutter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/vinayak' into dinesh

Browse Source 
# Conflicts:
#	lib/core/app_router.dart
#	lib/main.dart
This commit is contained in:
Dinesh Patil
2025-10-27 15:47:54 +05:30
parent 7c146c9f1e 9b79fb6db7
commit 66f9abe4e0
14 changed files with 496 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/logo/logo_city_cards_orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

1
lib/attractions/views/attractions_page_view.dart
View File

@@ -54,6 +54,7 @@ class AttractionsPage extends StatelessWidget {
// 🔍 Search field
CommonSearchField(
hint: "Search attractions...",
hintColor: Colors.grey.shade500,
onChanged: (value) {
if (value.isEmpty) {
bloc.add(LoadAttractions());

32
lib/checkout/checkout_view.dart → lib/checkout/view/checkout_view.dart
View File

@@ -1,3 +1,4 @@
import 'package:citycards_customer/checkout/widget/login_email_bottomsheet.dart';
import 'package:citycards_customer/common_packages/app_bar.dart';
import 'package:citycards_customer/common_packages/custom_filled_button.dart';
import 'package:citycards_customer/common_packages/custom_text.dart';
@@ -11,6 +12,7 @@ class CheckoutView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: true,
backgroundColor: Colors.white,
body: SafeArea(
child: Padding(
@@ -34,9 +36,7 @@ class CheckoutView extends StatelessWidget {
Container(
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(
color: Color(0xFFF95FAF).withOpacity(0.2),
),
border: Border.all(color: Color(0xFFF95FAF).withOpacity(0.2)),
borderRadius: BorderRadius.circular(8.r),
),
child: Expanded(
@@ -117,10 +117,7 @@ class CheckoutView extends StatelessWidget {
SizedBox(height: 7.h),
Row(
children: [
Image.asset(
"assets/icons/kid.png",
scale: 4,
),
Image.asset("assets/icons/kid.png", scale: 4),
SizedBox(width: 4.w),
CustomText(
text: "3 Kids",
@@ -196,10 +193,7 @@ class CheckoutView extends StatelessWidget {
SizedBox(height: 15.h),
Container(
padding: EdgeInsets.symmetric(
horizontal: 12.w,
vertical: 12.h,
),
padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 12.h),
decoration: BoxDecoration(
color: Color(0xFFFFF5F5),
borderRadius: BorderRadius.circular(8.r),
@@ -322,10 +316,22 @@ class CheckoutView extends StatelessWidget {
),
const Spacer(),
CustomFilledButton(
onTap: () {},
onTap: () {
showModalBottomSheet(
context: context,
isScrollControlled: true,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(12.r),
),
),
builder: (_) => const LoginEmailBottomsheet(),
);
},
label: "Login to Checkout",
),
SizedBox(height: 25.h,)
SizedBox(height: 25.h),
],
),
),

107
lib/checkout/widget/login_email_bottomsheet.dart Normal file
View File

@@ -0,0 +1,107 @@
import 'package:citycards_customer/checkout/widget/verify_otp_bottomsheet.dart';
import 'package:citycards_customer/common_packages/custom_filled_button.dart';
import 'package:citycards_customer/common_packages/custom_text.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class LoginEmailBottomsheet extends StatelessWidget {
const LoginEmailBottomsheet({super.key});
@override
Widget build(BuildContext context) {
return AnimatedPadding(
duration: const Duration(milliseconds: 250),
curve: Curves.easeOut,
padding: EdgeInsets.only(
top: 24.h,
left: 20.h,
right: 20.h,
bottom: MediaQuery.of(context).viewInsets.bottom,
),
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min, // shrink to fit content
children: [
Image.asset("assets/logo/logo_city_cards_orange.png", scale: 4),
SizedBox(height: 8.h),
CustomText(text: "Get Started", size: 18.sp, weight: FontWeight.w500),
SizedBox(height: 42.h),
CustomText(
text: "Enter your email to begin your CityCards journey",
size: 14.sp,
color: const Color(0xFF000000).withOpacity(.6),
),
SizedBox(height: 12.h),
TextField(
decoration: InputDecoration(
filled: true,
contentPadding: EdgeInsets.symmetric(vertical: 6.h),
fillColor: const Color(0xFFFFF5F5),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: const Color(0xFFBB474A), width: 0.4.w),
borderRadius: BorderRadius.circular(8.sp),
),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: const Color(0xFFBB474A), width: 0.4.w),
borderRadius: BorderRadius.circular(8.sp),
),
prefixIcon: const Icon(Icons.email_outlined, color: Color(0xFFF95F62)),
hintText: "john.doe@gmail.com",
hintStyle: TextStyle(
color: const Color(0xFF000000).withOpacity(0.6),
fontSize: 12.sp,
),
),
),
SizedBox(height: 38.h),
CustomFilledButton(
onTap: () {
Navigator.pop(context);
showModalBottomSheet(
context: context,
isScrollControlled: true,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(12.r),
),
),
builder: (_) => VerifyOtpBottomsheet(),
);
},
label: "Continue",
width: double.infinity,
),
SizedBox(height: 20.h),
Text.rich(
TextSpan(
children: [
TextSpan(
text: "Already have an account?",
style: TextStyle(
color: Colors.black.withOpacity(0.6),
fontSize: 12.sp,
fontWeight: FontWeight.w400,
),
),
TextSpan(
text: " Sign in",
style: TextStyle(
color: const Color(0xFFF95F62),
fontSize: 12.sp,
fontWeight: FontWeight.w600,
),
),
],
),
),
SizedBox(height: 15.h),
],
),
),
);
}
}

113
lib/checkout/widget/verify_otp_bottomsheet.dart Normal file
View File

@@ -0,0 +1,113 @@
import 'package:citycards_customer/common_packages/custom_filled_button.dart';
import 'package:citycards_customer/common_packages/custom_text.dart';
import 'package:flutter/material.dart';
import 'package:flutter_otp_text_field/flutter_otp_text_field.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class VerifyOtpBottomsheet extends StatelessWidget {
VerifyOtpBottomsheet({super.key});
@override
Widget build(BuildContext context) {
return AnimatedPadding(
duration: const Duration(milliseconds: 250),
curve: Curves.easeOut,
padding: EdgeInsets.only(
top: 24.h,
left: 20.h,
right: 20.h,
bottom: MediaQuery.of(context).viewInsets.bottom,
),
child: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min, // shrink to fit content
children: [
Image.asset("assets/logo/logo_city_cards_orange.png", scale: 4),
SizedBox(height: 8.h),
CustomText(
text: "Verify your phone",
size: 18.sp,
weight: FontWeight.w500,
),
SizedBox(height: 42.h),
Text.rich(
TextSpan(
children: [
TextSpan(
text: "Enter the verification code sent to your email id",
style: TextStyle(
fontSize: 14.sp,
color: Colors.black.withOpacity(0.6),
),
),
TextSpan(
text: " frank7824@mail.com",
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.w500,
color: Colors.black,
),
),
],
),
),
SizedBox(height: 15.h),
OtpTextField(
numberOfFields: 6,
borderWidth: 0.4.w,
fieldWidth: 48.w,
fieldHeight: 60.h,
borderRadius: BorderRadius.circular(8.r),
filled: true,
fillColor: const Color(0xFFFFF5F5),
borderColor: const Color(0xFFBB474A),
cursorColor: const Color(0xFFF95F62),
showFieldAsBox: true,
textStyle: TextStyle(
fontSize: 18.sp,
fontWeight: FontWeight.w500,
),
onCodeChanged: (code) {},
onSubmit: (code) {
debugPrint("OTP entered: $code");
},
),
SizedBox(height: 42.h),
CustomFilledButton(
onTap: () {},
label: "Continue",
width: double.infinity,
),
SizedBox(height: 20.h),
Text.rich(
TextSpan(
children: [
TextSpan(
text: "Already have an account?",
style: TextStyle(
color: Colors.black.withOpacity(0.6),
fontSize: 12.sp,
fontWeight: FontWeight.w400,
),
),
TextSpan(
text: " Sign in",
style: TextStyle(
color: const Color(0xFFF95F62),
fontSize: 12.sp,
fontWeight: FontWeight.w600,
),
),
],
),
),
SizedBox(height: 15.h),
],
),
),
);
}
}

8
lib/common_packages/custom_search_field.dart
View File

@@ -4,11 +4,16 @@ import 'package:google_fonts/google_fonts.dart';
class CommonSearchField extends StatelessWidget {
final ValueChanged<String> onChanged;
final String hint;
final bool showSuffix;
final Color hintColor;
const CommonSearchField({
super.key,
required this.onChanged,
this.hint = "Search attractions",
this.showSuffix = false,
required this.hintColor
});
@override
@@ -17,9 +22,10 @@ class CommonSearchField extends StatelessWidget {
onChanged: onChanged,
decoration: InputDecoration(
hintText: hint,
hintStyle: GoogleFonts.poppins(color: Colors.grey.shade500),
hintStyle: GoogleFonts.poppins(color: hintColor),
filled: true,
fillColor: Colors.white,
suffixIcon: showSuffix ? Image.asset("assets/icons/search.png",scale: 4,) : null,
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0xffF95F62).withOpacity(0.4)),

15
lib/core/app_router.dart
View File

@@ -1,8 +1,7 @@
import 'package:citycards_customer/Profile/profile_page_view.dart';
import 'package:citycards_customer/attraction_details/attraction_details_view.dart';
import 'package:citycards_customer/buy_a_pass/view/buy_pass_view.dart';
import 'package:citycards_customer/cart/views/my_cart_view_page.dart';
import 'package:citycards_customer/checkout/checkout_view.dart';
import 'package:citycards_customer/checkout/view/checkout_view.dart';
import 'package:citycards_customer/common_bloc/language_selection_bloc.dart';
import 'package:citycards_customer/contact_us/contact_us_view.dart';
import 'package:citycards_customer/edit_profile/edit_profile_view.dart';
@@ -13,6 +12,8 @@ import 'package:citycards_customer/itinerary_creation/bloc/itinerary_detail_bloc
import 'package:citycards_customer/itinerary_creation/bloc/itinerary_steps_selection_bloc.dart';
import 'package:citycards_customer/itinerary_creation/views/itinerary_creation_start_view.dart';
import 'package:citycards_customer/itinerary_creation/views/itinerary_creation_view.dart';
import 'package:citycards_customer/offer_section/bloc/search_offers_listing_bloc.dart';
import 'package:citycards_customer/offer_section/view/search_offers_with_listing.dart';
import 'package:citycards_customer/privacy/privacy_view.dart';
import 'package:citycards_customer/terms_and_condition/terms_and_condition_view.dart';
import 'package:flutter/material.dart';
@@ -32,8 +33,6 @@ class AppRouter {
return BlocProvider(
create: (_) => NavigationBloc(),
child: const HomePage(),
);
},
);
@@ -137,6 +136,14 @@ class AppRouter {
return MaterialPageRoute(builder: (_){
return MyCartPage();
});
case RouteConstants.searchOffer:
return MaterialPageRoute(builder: (_){
return BlocProvider(
create: (_) => OffersBloc(),
child: SearchOffersWithListing(),
);
});
default:
return MaterialPageRoute(
builder: (_) =>

1
lib/core/route_constants.dart
View File

@@ -34,6 +34,7 @@ class RouteConstants {
static const String buyPass ='/buyPass';
static const String checkout ='/checkout';
static const String searchOffer = '/searchOffer';
/************************** My card page ***************************************/
static const String cartPage = '/cartPage';

21
lib/itinerary_creation/views/itinerary_creation_steps/city_selection_view.dart
View File

@@ -143,27 +143,6 @@ class CitySelectionView extends StatelessWidget {
),
),
// Container(
// height: 56.h,
// width: double.infinity,
// padding: EdgeInsets.only(left: 20.w),
// decoration: BoxDecoration(
// color: Colors.white,
// border: Border.all(color: Color(0xFFF95F62)),
// borderRadius: BorderRadius.circular(28.r),
// ),
// child: Row(
// children: [
// Image.asset("assets/icons/location.png", scale: 4),
// SizedBox(width: 12.w),
// CustomText(
// text: "Tokyo",
// color: Color(0xFF737373),
// size: 14.sp,
// ),
// ],
// ),
// ),
SizedBox(height: 16.h),
Align(
alignment: Alignment.topLeft,

1
lib/main.dart
View File

@@ -29,6 +29,7 @@ class MyApp extends StatelessWidget {
builder: (context, child) {
return MaterialApp(
onGenerateRoute: _appRouter.onGenerateRoute,
initialRoute: RouteConstants.checkout,
debugShowCheckedModeBanner: false,
title: 'City Cards',
theme: ThemeData(

75
lib/offer_section/bloc/search_offers_listing_bloc.dart Normal file
View File

@@ -0,0 +1,75 @@
import 'package:flutter_bloc/flutter_bloc.dart';
// ----- Events -----
abstract class OffersEvent {}
class LoadOffers extends OffersEvent {}
class SearchOffers extends OffersEvent {
final String query;
SearchOffers(this.query);
}
// ----- State -----
class OffersState {
final List<Map<String, String>> offers;
const OffersState(this.offers);
}
// ----- Bloc -----
class OffersBloc extends Bloc<OffersEvent, OffersState> {
OffersBloc() : super(const OffersState([])) {
on<LoadOffers>(_onLoadOffers);
on<SearchOffers>(_onSearchOffers);
}
final List<Map<String, String>> _allOffers = [
{
"image": "assets/images/aa1.png",
"title": "Astor Hotels Ultra Deluxe",
"description": "15% Discount on all treatments for first-time clients"
},
{
"image": "assets/images/aa2.png",
"title": "Green Valley Spa Lux",
"description": "20% off on spa memberships and treatments"
},
{
"image": "assets/images/aa3.png",
"title": "Ocean Breeze Resort",
"description": "Complimentary breakfast with every booking for first-time guests"
},
{
"image": "assets/images/aa4.png",
"title": "Mountain Retreat of Light",
"description": "10% Discount on group bookings of 5 or more guests"
},
{
"image": "assets/images/card_banner.png",
"title": "Mountain View Retreat",
"description": "Free hiking gear rental for all visitors during their stay"
},
{
"image": "assets/images/city_germany.jpg",
"title": "Sunny Shores Hotel",
"description": "10% Discount on group bookings of 5 or more guests"
},
];
void _onLoadOffers(event,emit) {
emit(OffersState(_allOffers));
}
void _onSearchOffers(event,emit) {
final filtered = _allOffers
.where((offer) =>
offer["title"]!.toLowerCase().contains(event.query.toLowerCase()) ||
offer["description"]!
.toLowerCase()
.contains(event.query.toLowerCase()))
.toList();
emit(OffersState(filtered));
}
}

152
lib/offer_section/view/search_offers_with_listing.dart Normal file
View File

@@ -0,0 +1,152 @@
import 'package:citycards_customer/common_packages/app_bar.dart';
import 'package:citycards_customer/common_packages/custom_search_field.dart';
import 'package:citycards_customer/common_packages/custom_text.dart';
import 'package:citycards_customer/offer_section/bloc/search_offers_listing_bloc.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class SearchOffersWithListing extends StatelessWidget {
SearchOffersWithListing({super.key});
final List<String> category = ["Beach", "Hike", "Popular", "Best in Summer"];
@override
Widget build(BuildContext context) {
return BlocProvider(
create: (_) => OffersBloc()..add(LoadOffers()),
child: Scaffold(
backgroundColor: Colors.white,
body: SafeArea(
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
children: [
CommonAppBar(isWhiteLogo: false, isProfilePage: false,showCart: false,),
Row(
children: [
Icon(Icons.arrow_back),
SizedBox(width: 8.w),
CustomText(text: "Offers with Flexi Card", size: 12.sp),
],
),
SizedBox(height: 33.h),
Builder(
builder: (context) => CommonSearchField(
hint: "Search offers",
hintColor: const Color(0xFFF95F62).withOpacity(.6),
showSuffix: true,
onChanged: (value) {
context.read<OffersBloc>().add(SearchOffers(value));
},
),
),
SizedBox(height: 20.h),
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
children: [
...List.generate(category.length, (index) {
return Padding(
padding: EdgeInsets.only(right: 8.0.w),
child: Container(
padding: EdgeInsets.symmetric(
vertical: 6.h,
horizontal: 12.w,
),
decoration: BoxDecoration(
color: Color(0xFFFEE7E7),
borderRadius: BorderRadius.circular(100.sp),
border: Border.all(color: Color(0xFFFDCDCE)),
),
child: Center(
child: CustomText(text: category[index]),
),
),
);
}),
],
),
),
SizedBox(height: 20.h),
/// Offer list
Expanded(
child: BlocBuilder<OffersBloc, OffersState>(
builder: (context, state) {
final offers = state.offers;
if (offers.isEmpty) {
return const Center(
child: Text(
"No offers found",
style: TextStyle(color: Colors.grey, fontSize: 14),
),
);
}
return GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
crossAxisSpacing: 16.w,
mainAxisSpacing: 22.h,
childAspectRatio: 0.65,
),
itemCount: offers.length,
itemBuilder: (context, index) {
final offer = offers[index];
return Container(
padding: EdgeInsets.symmetric(
horizontal: 6.w,
vertical: 6.h,
),
decoration: BoxDecoration(
border: Border.all(
color: Color(0xFFF95F62).withOpacity(.24),
),
borderRadius: BorderRadius.circular(12.sp),
),
child: Column(
children: [
ClipRRect(
borderRadius: BorderRadius.circular(8.sp),
child: Image.asset(
offer["image"] ?? "",
width: double.infinity,
height: 120.5.h,
fit: BoxFit.cover,
),
),
SizedBox(height: 8.h),
CustomText(
text: offer["title"] ?? "",
size: 18.sp,
),
SizedBox(height: 8.h),
CustomText(
text: offer["description"] ?? "",
color: Colors.black.withOpacity(.6),
size: 12.sp,
),
],
),
);
},
);
},
),
),
],
),
),
),
),
);
}
}

8
pubspec.lock
View File

@@ -150,6 +150,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.0.0"
flutter_otp_text_field:
dependency: "direct main"
description:
name: flutter_otp_text_field
sha256: e7e589dc51cde120d63da6db55f3cef618f5d013d12adba76137ca1a51ce1390
url: "https://pub.dev"
source: hosted
version: "1.5.1+1"
flutter_plugin_android_lifecycle:
dependency: transitive
description:

1
pubspec.yaml
View File

@@ -40,6 +40,7 @@ dependencies:
intl: ^0.20.2
image_picker: ^1.2.0
image: ^4.5.4
flutter_otp_text_field: ^1.5.1+1
dev_dependencies:
flutter_test: