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

feat(mobile): Write test for notification_domain_layer #66

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feat(mobile): Write test for notification_domain_layer #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a54742f
fix(mobile): fix homePage UI
duressaJemal Jun 30, 2023
62721cb
feat(mobile): Write test for notification_remote_datasource
duressaJemal Jul 4, 2023
89bee29
feat(mobile): Write test for notification model.
duressaJemal Jul 4, 2023
1c43261
feat(mobile): Write test for notification_repository_impl_test.dart
duressaJemal Jul 4, 2023
6eb2e7b
fix(mobile): Fix import issues regarding generated test files
duressaJemal Jul 4, 2023
f32d7ac
feat(mobile): Write test for notfication entity of domain layer
duressaJemal Jul 6, 2023
0b215e6
feat(mobile): Write getNotification Usecase test
duressaJemal Jul 6, 2023
96ad3bb
feat(mobile): Write test for sendIsRead usecase
duressaJemal Jul 6, 2023
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
9 changes: 2 additions & 7 deletions ...ommunity_portal_mobile/lib/features/announcement_page/presentation/page/announcement.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class AnnouncementPage extends StatelessWidget {
body: ListView(
children: [
const UpperBar(
title: 'Announcemet',
title: 'Announcement',
),
const SizedBox(
height: 20,
Expand All @@ -40,12 +40,7 @@ class AnnouncementPage extends StatelessWidget {
GestureDetector(
onTap: () =>
context.push("/announcement/detail", extra: announcement),
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) => AnnouncementDetailsPage(
// title: data.title,
// description: data.description))),

child: Container(
margin: const EdgeInsets.only(bottom: 10),
padding:
Expand Down
9 changes: 2 additions & 7 deletions ...community_portal_mobile/lib/features/announcement_page/presentation/page/custom_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,7 @@ class CustomListTile extends StatelessWidget {
padding: const EdgeInsets.only(top: 5, bottom: 0),
child: Html(
data: description,
// description,
// style: const TextStyle(
// color: Color.fromRGBO(74, 85, 104, 1),
// fontWeight: FontWeight.w500,
// fontSize: 14,
// fontFamily: "Urbanist",
// ),

),
),
trailing: Container(
Expand All @@ -58,6 +52,7 @@ class CustomListTile extends StatelessWidget {
shape: BoxShape.circle,
),
),

),
);
}
Expand Down
192 changes: 100 additions & 92 deletions a2sv_community_portal_mobile/lib/features/application_page/presentation/screen/home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,105 +27,113 @@ class _HomeState extends State<Home> {

@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: whiteColor,
appBar: const UpperBar(),
body: BlocBuilder<ApplicationBloc, ApplicationState>(
builder: (context, state) {
if (state is ApplicationLoading) {
return const CircularProgressIndicator();
} else if (state is ApplicationLoaded) {
final subSteps = state.applicationStepEntity[i].subSteps;
final subStepCards = subSteps.map((subStep) {
return CustomCard(
title: subStep.subStepName,
description: subStep.description,
done: subStep.isCompleted,
return Padding(
padding: const EdgeInsets.only(top:16),
child: Scaffold(
backgroundColor: whiteColor,
appBar: const UpperBar(),
body: BlocBuilder<ApplicationBloc, ApplicationState>(
builder: (context, state) {
if (state is ApplicationLoading) {
return Container(
alignment: Alignment.center,
width: 130,
height: 130,
child: const CircularProgressIndicator(),
);
}).toList();
return Column(
children: [
Padding(
padding: const EdgeInsets.only(top: 17, bottom: 17.0),
child: StepperBox(
text: '${i + 1} of ${state.applicationStepEntity.length}',
percentage: (i + 1) / (state.applicationStepEntity.length),
currentStep: state.applicationStepEntity[i].stepName,
nextStep: i != state.applicationStepEntity.length - 1
? state.applicationStepEntity[i + 1].stepName
: "Apply",
} else if (state is ApplicationLoaded) {
final subSteps = state.applicationStepEntity[i].subSteps;
final subStepCards = subSteps.map((subStep) {
return CustomCard(
title: subStep.subStepName,
description: subStep.description,
done: subStep.isCompleted,
);
}).toList();
return Column(
children: [
Padding(
padding: const EdgeInsets.only(top: 17, bottom: 17.0),
child: StepperBox(
text: '${i + 1} of ${state.applicationStepEntity.length}',
percentage: (i + 1) / (state.applicationStepEntity.length),
currentStep: state.applicationStepEntity[i].stepName,
nextStep: i != state.applicationStepEntity.length - 1
? state.applicationStepEntity[i + 1].stepName
: "Apply",
),
),
),
Expanded(
child: SingleChildScrollView(
child: Column(
children: subStepCards,
Expanded(
child: SingleChildScrollView(
child: Column(
children: subStepCards,
),
),
),
),
Padding(
padding: const EdgeInsets.only(top: 15.0, bottom: 15.0),
child: SizedBox(
height: UIConverter.getComponentHeight(context, 48),
child: Align(
alignment: Alignment.bottomCenter,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
i != 0
? CustomButton(
label: 'Previous',
onTap: () {
if (i > 0) {
setState(() {
i -= 1;
});
}
},
)
: SizedBox(
width: UIConverter.getDeviceWidth(context) > 700
? 124
: UIConverter.getComponentWidth(
context, 124),
height:
UIConverter.getComponentHeight(context, 48),
),
i != state.applicationStepEntity.length - 1
? CustomButton(
label:
i != state.applicationStepEntity.length - 1
? 'Next'
: 'Apply',
onTap: () {
if (i <
state.applicationStepEntity.length - 1) {
setState(() {
i += 1;
});
}
})
: SizedBox(
width: UIConverter.getDeviceWidth(context) > 700
? 124
: UIConverter.getComponentWidth(
context, 124),
height:
UIConverter.getComponentHeight(context, 48),
),
],
Padding(
padding: const EdgeInsets.only(top: 15.0, bottom: 15.0),
child: SizedBox(
height: UIConverter.getComponentHeight(context, 48),
child: Align(
alignment: Alignment.bottomCenter,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
i != 0
? CustomButton(
label: 'Previous',
onTap: () {
if (i > 0) {
setState(() {
i -= 1;
});
}
},
)
: SizedBox(
width: UIConverter.getDeviceWidth(context) > 700
? 124
: UIConverter.getComponentWidth(
context, 124),
height:
UIConverter.getComponentHeight(context, 48),
),
i != state.applicationStepEntity.length - 1
? CustomButton(
label:
i != state.applicationStepEntity.length - 1
? 'Next'
: 'Apply',
onTap: () {
if (i <
state.applicationStepEntity.length - 1) {
setState(() {
i += 1;
});
}
})
: SizedBox(
width: UIConverter.getDeviceWidth(context) > 700
? 124
: UIConverter.getComponentWidth(
context, 124),
height:
UIConverter.getComponentHeight(context, 48),
),
],
),
),
),
),
),
],
);
} else if (state is ApplicationError) {
return Text(state.message);
} else {
return Text("${state is ApplicationInitial}");
}
}),
],
);
} else if (state is ApplicationError) {
return Text(state.message);
} else {
return Text("${state is ApplicationInitial}");
}
}),
),
);
}
}
114 changes: 59 additions & 55 deletions ...community_portal_mobile/lib/features/application_page/presentation/widgets/upper_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,65 +11,69 @@ class UpperBar extends StatelessWidget implements PreferredSizeWidget {

@override
Widget build(BuildContext context) {
return AppBar(
elevation: 0,
backgroundColor: whiteColor,
title: Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Welcome',
style: TextStyle(fontSize: 14, color: whiteGreyColor),
),
SizedBox(height: 4.0), // Use const with SizedBox constructor
Text(
'Joe Doe',
style: TextStyle(
fontSize: 20,
color: userNameColor,
fontWeight: FontWeight.w600),
),
],
),
),
GestureDetector(
onTap: () {
GoRouter.of(context).push('/home/notifications');
context.read<NotificationBloc>().add(GetNotificationsEvent());
},
child: Stack(
children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: greyColorForIcon, // Use const with Color constructor
return SafeArea(
child: AppBar(
elevation: 0,
backgroundColor: whiteColor,
title:
// margin: EdgeInsets.only(top: 16),
Row(
children: [
const Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Welcome',
style: TextStyle(fontSize: 14, color: whiteGreyColor),
),
SizedBox(height: 4.0), // Use const with SizedBox constructor
Text(
'Joen Doe',
style: TextStyle(
fontSize: 20,
color: userNameColor,
fontWeight: FontWeight.w600),
),
padding: const EdgeInsets.all(5),
height: 50,
width: 50,
margin: const EdgeInsets.only(top: 5),
child: const Icon(
Icons.notifications,
color: blueBlackForAppBar,
size: 24,
],
),
),
GestureDetector(
onTap: () {
GoRouter.of(context).push('/home/notifications');
context.read<NotificationBloc>().add(GetNotificationsEvent());
},
child: Stack(
children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: greyColorForIcon, // Use const with Color constructor
),
padding: const EdgeInsets.all(5),
height: 50,
width: 50,
margin: const EdgeInsets.only(top: 5),
child: const Icon(
Icons.notifications,
color: blueBlackForAppBar,
size: 24,
),
),
),
Container(
width: 11,
height: 11,
margin: const EdgeInsets.only(left: 33, top: 2),
decoration: const BoxDecoration(
color: primaryColor, // Use const with Color constructor
shape: BoxShape.circle,
Container(
width: 11,
height: 11,
margin: const EdgeInsets.only(left: 33, top: 2),
decoration: const BoxDecoration(
color: primaryColor, // Use const with Color constructor
shape: BoxShape.circle,
),
),
),
],
],
),
),
),
],
],
),
),
);
}
Expand Down
4 changes: 2 additions & 2 deletions a2sv_community_portal_mobile/lib/features/contest/presentation/widgets/upper_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class UpperBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.only(top: 16.0, left: 16.0, right: 16.0),
padding: const EdgeInsets.only(top: 16, left: 16.0, right: 16.0),
child: Row(
children: [
const Expanded(
Expand All @@ -23,7 +23,7 @@ class UpperBar extends StatelessWidget {
),
SizedBox(height: 4.0), // Adds spacing between the texts
Text(
'Joe Doe',
'Joen Doe',
style: TextStyle(
fontSize: 20,
color: Color.fromRGBO(0, 0, 0, 1),
Expand Down
Loading