diff --git a/lib/main.dart b/lib/main.dart index 3feeffa..7f36095 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -123,8 +123,12 @@ class _MyAppState extends State with WidgetsBindingObserver { ), debugShowCheckedModeBanner: false, // initialRoute: RouteName.individualactivitystep2, + + + initialRoute: RouteName.splashScreen, + getPages: AppRoutes.appRoutes(), ), designSize: const Size(390, 844), diff --git a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart index 2903f56..b381b2f 100644 --- a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart +++ b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonButton.dart'; @@ -11,6 +12,7 @@ import 'package:regroup/Utils/texts.dart'; import 'package:regroup/onboarding/Signup/view_model/getmethod.dart'; import 'package:regroup/onboarding/Signup/view_model/postmethod.dart'; import 'package:regroup/resources/routes/route_name.dart'; +import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; int? _firstSelectedIndex; bool _isFirstSelectionActive = false; @@ -427,108 +429,121 @@ class _SelectIndividualActivityState extends State { children: [Text("No Data Found")], ); } -} -interestdialogwidget() { - Get.dialog(Dialog( - // backgroundColor: Colors.transparent, - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.r), - color: const Color(0xFF222935)), - child: Padding( - padding: EdgeInsets.only( - right: 16.w, left: 16.w, top: 20.h, bottom: 40.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Spacer(), - Image.asset( - "assets/images/png/x-circle.png", - height: 28.h, - width: 28.w, - ) - ], - ), - text16w700_FCFCFC("Suggest interest"), - sizedBoxHeight(16.h), - Center( - child: CustomTextFormField( - hintText: "Please type your interest", - )), - sizedBoxHeight(10.h), - text10w400_FCFCFC_blur("We will surely make this happen"), - sizedBoxHeight(20.h), - Align( - alignment: Alignment.center, - child: SizedBox( - width: 177.w, - child: CommonBtn( - text: "Suggest", - onTap: () { - Get.back(); - thankdialogwidget(); - })), - ) - ], + interestdialogwidget() { + Get.dialog(Dialog( + // backgroundColor: Colors.transparent, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.r), + color: const Color(0xFF222935)), + child: Padding( + padding: EdgeInsets.only( + right: 16.w, left: 16.w, top: 20.h, bottom: 40.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Spacer(), + Image.asset( + "assets/images/png/x-circle.png", + height: 28.h, + width: 28.w, + ) + ], + ), + text16w700_FCFCFC("Suggest interest"), + sizedBoxHeight(16.h), + Center( + child: CustomTextFormField( + textEditingController: otheractivitycontroller, + hintText: "Please type your interest", + texttype: TextInputType.text, + validator: (value) { + if (value!.isEmpty) { + return 'Enter your full name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter.allow(RegExp('[a-zA-Z ]')) + ], + )), + sizedBoxHeight(10.h), + text10w400_FCFCFC_blur("We will surely make this happen"), + sizedBoxHeight(20.h), + Align( + alignment: Alignment.center, + child: SizedBox( + width: 177.w, + child: CommonBtn( + text: "Suggest", + onTap: () { + Get.back(); + thankdialogwidget(); + })), + ) + ], + ), ), ), - ), - ], - ), - )); -} + ], + ), + )); + } -thankdialogwidget() { - Get.dialog(Dialog( - // backgroundColor: Colors.transparent, - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.r), - color: const Color(0xFF222935)), - child: Padding( - padding: EdgeInsets.only( - right: 16.w, left: 16.w, top: 20.h, bottom: 40.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row( - children: [ - Spacer(), - Image.asset( - "assets/images/png/x-circle.png", - height: 28.h, - width: 28.w, - ) - ], - ), - Image.asset( - "assets/images/png/correct 1.png", - height: 72.h, - width: 72.w, - ), - sizedBoxHeight(20.h), - text16w700_FCFCFC( - "Thank You! \n for adding one more to the club", - textAlign: TextAlign.center), - sizedBoxHeight(16.h), - ], + thankdialogwidget() { + Get.dialog(Dialog( + // backgroundColor: Colors.transparent, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.r), + color: const Color(0xFF222935)), + child: Padding( + padding: EdgeInsets.only( + right: 16.w, left: 16.w, top: 20.h, bottom: 40.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + children: [ + Spacer(), + Image.asset( + "assets/images/png/x-circle.png", + height: 28.h, + width: 28.w, + ) + ], + ), + Image.asset( + "assets/images/png/correct 1.png", + height: 72.h, + width: 72.w, + ), + sizedBoxHeight(20.h), + text16w700_FCFCFC( + "Thank You! \n for adding one more to the club", + textAlign: TextAlign.center), + sizedBoxHeight(16.h), + ], + ), ), ), - ), - ], - ), - )); + ], + ), + )); + } } class ActivityContainer extends StatelessWidget { @@ -557,16 +572,16 @@ class ActivityContainer extends StatelessWidget { // height: 120.h, decoration: ShapeDecoration( gradient: LinearGradient( - begin: const Alignment(0.98, -0.21), - end: const Alignment(-0.98, 0.21), + begin: const Alignment(0.98, 0.10), + end: const Alignment(-0.40, -0.70), colors: isSelected ? _firstSelectedIndex == index && _isFirstSelectionActive == true ? [ - gradientColor.withOpacity(0.80), - gradientColor.withOpacity(0.77), - Color(0xFF009DAB).withOpacity(0.66), - Color(0xFF009DAB).withOpacity(0.18), + Color(0xFF009DAB).withOpacity(0.80), + Color(0xFF009DAB).withOpacity(0.77), + gradientColor.withOpacity(0.70), + gradientColor.withOpacity(0.50), ] : [ Colors.white.withOpacity(0.06), @@ -581,11 +596,9 @@ class ActivityContainer extends StatelessWidget { side: isSelected ? _firstSelectedIndex == index && _isFirstSelectionActive == true - ? BorderSide(width: 1.w, color: Color(0xFF434A53)) + ? BorderSide(width: 0.4.w, color: Colors.transparent) : BorderSide(width: 3.w, color: gradientColor) - : BorderSide(width: 3.w, color: gradientColor), - - + : BorderSide(width: 2.w, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(10), ), ),