diff --git a/lib/main.dart b/lib/main.dart index 171c6cc..1ca9fa7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -125,7 +125,7 @@ class _MyAppState extends State with WidgetsBindingObserver { debugShowCheckedModeBanner: false, // initialRoute: RouteName.individualactivitystep2, - initialRoute: RouteName.splashScreen, + initialRoute: RouteName.individualactivitystep2, getPages: AppRoutes.appRoutes(), ), diff --git a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart index 1243faa..2d54159 100644 --- a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart +++ b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart @@ -70,10 +70,10 @@ class _SelectIndividualActivityState extends State { return Colors.transparent; } else if (_firstSelectedIndex == index && _isFirstSelectionActive) { // Apply Color(0XFFD90B2E) to the first selected item - return const Color(0XFFD90B2E); + return Color(0XFFD90B2E); } else if (_selectedIndices.contains(index)) { // Apply Color(0xFF009DAB) to all other selected items - return const Color(0xFF009DAB); + return Color(0xFF009DAB); } return Colors.transparent; } @@ -318,40 +318,35 @@ class _SelectIndividualActivityState extends State { shrinkWrap: true, gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 3, - crossAxisSpacing: 12.w, - mainAxisSpacing: 12.h, + crossAxisCount: + 3, // Number of items in each row + crossAxisSpacing: 12 + .w, // Horizontal spacing between items + mainAxisSpacing: 12 + .h, // Vertical spacing between items ), itemCount: indiactivityobj!.data!.length, itemBuilder: (context, index) { - final activity = - indiactivityobj!.data![index]; return ActivityContainer( - key: ValueKey( - activity.id), // Added ValueKey - index: activity.id!, - titleString: activity.name!, - image: activity.image, + index: indiactivityobj! + .data![index].id!, + titleString: indiactivityobj! + .data![index].name!, + image: indiactivityobj! + .data![index].image, + // 'assets/images/svg/individualact7.svg', isSelected: _selectedIndices - .contains(activity.id!), - gradientColor: - _getGradientColor(activity.id!), - onTap: (selectedIndex) { - setState(() { - if (_selectedIndices - .contains(selectedIndex)) { - _selectedIndices - .remove(selectedIndex); - } else { - _selectedIndices - .add(selectedIndex); - } - }); - }, + .contains(indiactivityobj! + .data![index].id!), + gradientColor: _getGradientColor( + indiactivityobj! + .data![index].id!), + onTap: _onContainerTap, ); }, ), + sizedBoxHeight(30.h), // text20400FCFCFC("Add other activity"), // sizedBoxHeight(25.h), @@ -417,10 +412,10 @@ class _SelectIndividualActivityState extends State { width: 212.w, height: 35.h, decoration: BoxDecoration( - color: const Color(0xFF363636), + color: Color(0xFF363636), borderRadius: BorderRadius.circular(20), - border: Border.all( - color: const Color(0xFFD90B2E), width: 1.w)), + border: + Border.all(color: Color(0xFFD90B2E), width: 1.w)), child: Center( child: text16400white("Can’t find your interest"))), ) @@ -455,7 +450,7 @@ class _SelectIndividualActivityState extends State { children: [ Row( children: [ - const Spacer(), + Spacer(), InkWell( onTap: () { Get.back(); @@ -529,7 +524,7 @@ class _SelectIndividualActivityState extends State { children: [ Row( children: [ - const Spacer(), + Spacer(), Image.asset( "assets/images/png/x-circle.png", height: 28.h, @@ -565,8 +560,7 @@ class ActivityContainer extends StatelessWidget { final Color gradientColor; final Function(int) onTap; - const ActivityContainer({ - super.key, + ActivityContainer({ required this.index, required this.titleString, required this.image, @@ -590,8 +584,8 @@ class ActivityContainer extends StatelessWidget { ? _firstSelectedIndex == index && _isFirstSelectionActive == true ? [ - const Color(0xFF009DAB).withOpacity(0.80), - const Color(0xFF009DAB).withOpacity(0.77), + Color(0xFF009DAB).withOpacity(0.80), + Color(0xFF009DAB).withOpacity(0.77), gradientColor.withOpacity(0.70), gradientColor.withOpacity(0.50), ] @@ -610,7 +604,7 @@ class ActivityContainer extends StatelessWidget { _isFirstSelectionActive == true ? BorderSide(width: 0.4.w, color: Colors.transparent) : BorderSide(width: 3.w, color: gradientColor) - : BorderSide(width: 2.w, color: const Color(0xFF434A53)), + : BorderSide(width: 2.w, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(10), ), ),