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

Spuggy_Improved Pull Request #1

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Spuggy_Improved Pull Request #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7251ba4
test commit for PR
Sparsh1212 Jul 8, 2020
83678ff
second test commit for pr
Sparsh1212 Jul 8, 2020
997dcbb
Enhanced UI of list_issues screen
Sparsh1212 Jul 8, 2020
5cf4176
Enhanced UI of issue detail page
Sparsh1212 Jul 9, 2020
772131d
Enhanced List Projects Screen
Sparsh1212 Jul 9, 2020
647a429
Enhanced UI of Edit Issue, New Issue
Sparsh1212 Jul 9, 2020
07dd819
Enhanced App Bar Font
Sparsh1212 Jul 9, 2020
561ad8d
Enhanced UI of many more screens, improved app bar, bottom navigation…
Sparsh1212 Jul 10, 2020
c713648
UI Enhancement v1.00 completed
Sparsh1212 Jul 10, 2020
31ffbd2
UI Enhancement Completed v1.01
Sparsh1212 Jul 10, 2020
1b0d6cf
Iterations solved part 1
Sparsh1212 Jul 12, 2020
8bc6b85
Iterations1 completed
Sparsh1212 Jul 12, 2020
664203b
Removed curved navigator dependency
Sparsh1212 Jul 12, 2020
6d7e079
Removed unused import
Sparsh1212 Jul 12, 2020
faf1868
Reduced font sizes of some pages
Sparsh1212 Jul 14, 2020
9da7263
Resolved overflow problem 1
Sparsh1212 Jul 14, 2020
34fee74
UX improve 1
Sparsh1212 Jul 14, 2020
061bd18
UX improv. 2
Sparsh1212 Jul 14, 2020
b070668
improved comments screen, members search page
Sparsh1212 Jul 16, 2020
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
Binary file added flutter_01.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fonts/Galada-Regular.ttf
View file
Open in desktop
Binary file not shown.
193 changes: 121 additions & 72 deletions lib/assignedissues.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
import 'package:spuggyflutter/common.dart';
import 'brain.dart';
import 'issuedetail.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:dropdown_formfield/dropdown_formfield.dart';
import 'bottomnavigator.dart';

import 'popupButton.dart';

final bottomNavObj = BottomNavigator();
final popupObj = PopupButton();

class AssignedIssues extends StatefulWidget {
Expand All @@ -20,75 +20,146 @@ class AssignedIssues extends StatefulWidget {
}

class _AssignedIssuesState extends State<AssignedIssues> {
final _scaffoldKey = GlobalKey<ScaffoldState>();
final String token;
final dynamic profile;
_AssignedIssuesState({@required this.token, @required this.profile});
final brainObj = Brain();
var x = 'Assigned';
final editIssue = SnackBar(
duration: const Duration(seconds: 2),
content: Row(
children: [
Text(
'Issue updated',
style: TextStyle(fontSize: 15.0),
)
],
),
);

final updateFailure = SnackBar(
duration: const Duration(seconds: 2),
content: Row(
children: [
Text(
'Something went wrong. ',
style: TextStyle(fontSize: 15.0),
)
],
),
);

@override
Widget build(BuildContext context) {
return Scaffold(
key: _scaffoldKey,
appBar: AppBar(
automaticallyImplyLeading: false,
title: Text('Assigned Issues'),
backgroundColor: Colors.purple,
actions: [
popupObj.popupList(
profile[0]['name'],
profile[0]['branch'],
profile[0]['username'],
profile[0]['status'],
profile[0]['current_year'])
],
centerTitle: true,
title: Text(
'Assigned Issues',
style: whiteBold,
),
backgroundColor: Colors.blue[900],
actions: [popupObj.popupList(profile)],
),
bottomNavigationBar:
bottomNavObj.bottomNavigator(token, profile, 2, context),
body: FutureBuilder(
future: brainObj.fetchAssignedIssues(widget.token),
builder: (context, snapshot) {
if (snapshot.hasData == true) {
return ListView.builder(
itemCount: snapshot.data.length,
itemBuilder: (context, index) {
return Padding(
padding: const EdgeInsets.all(20.0),
child: Card(
itemCount: snapshot.data.length,
itemBuilder: (context, index) {
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15.0, vertical: 8.0),
child: InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => IssueDetail(
token: token,
issue: snapshot.data[index],
project: null,
profile: profile,
)));
},
child: Container(
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Colors.blue[900],
blurRadius: 3.0,
offset: Offset(1, 3)),
],
borderRadius: BorderRadius.circular(15.0),
gradient: LinearGradient(
colors: [Colors.blue[300], Colors.blue[800]],
)),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.symmetric(
horizontal: 15.0, vertical: 15.0),
child: Text(
snapshot.data[index]['issue_title'],
style: TextStyle(
fontWeight: FontWeight.bold,
),
fontWeight: FontWeight.bold,
color: Colors.white,
fontSize: 20.0),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'Status: ${snapshot.data[index]['issue_status']}',
style: TextStyle(
color: Colors.orange[900],
),
padding: const EdgeInsets.symmetric(
horizontal: 8.0, vertical: 0.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Icon(
Icons.report,
size: 20.0,
color: Colors.white,
),
SizedBox(
width: 8.0,
),
Text(snapshot.data[index]['issue_status'],
style: TextStyle(
fontStyle: FontStyle.italic,
fontWeight: FontWeight.bold,
color: Colors.white,
fontSize: 15.0)),
],
),
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.symmetric(
horizontal: 10.0, vertical: 10.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Icon(Icons.person),
SizedBox(
width: 10.0,
Icon(
Icons.person,
size: 20.0,
color: Colors.white,
),
Text(snapshot.data[index]['created_by']),
SizedBox(width: 8.0),
Text(snapshot.data[index]['created_by'],
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontStyle: FontStyle.italic,
fontSize: 15.0)),
],
),
),
Padding(
padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.symmetric(
vertical: 3.0, horizontal: 12.0),
child: Row(
children: [
Expanded(
Expand Down Expand Up @@ -130,7 +201,10 @@ class _AssignedIssuesState extends State<AssignedIssues> {
),
Expanded(
child: FlatButton(
child: Icon(Icons.mode_edit),
child: Icon(
Icons.mode_edit,
color: Colors.white,
),
onPressed: () async {
var obj = {
'issue_title': snapshot.data[index]
Expand All @@ -143,59 +217,34 @@ class _AssignedIssuesState extends State<AssignedIssues> {
await brainObj.updateIssue(token, obj,
snapshot.data[index]['id']);
if (responseCode == 200) {
showDialog(
context: context,
builder: (context) => AlertDialog(
title: Text('Success'),
content: Text(
'Status Successfully Updated'),
));
setState(() {});
_scaffoldKey.currentState
.showSnackBar(editIssue);
} else {
showDialog(
context: context,
builder: (context) => AlertDialog(
title: Text('Oops'),
content: Text(
'Sorry, something went wrong'),
));
_scaffoldKey.currentState
.showSnackBar(updateFailure);
}
},
),
)
],
),
),
FlatButton(
color: Colors.blue,
child: Text(
'View Details',
style: TextStyle(color: Colors.white),
),
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => IssueDetail(
token: widget.token,
issue: snapshot.data[index],
project: null,
profile: profile,
)));
},
),
],
),
),
);
});
),
);
},
);
} else if (snapshot.hasError == true) {
return Center(
child: Text('Error Fetching Issues'),
);
}
return Center(
child: SpinKitWave(
color: Colors.purple,
child: SpinKitFadingGrid(
color: Colors.blue[900],
),
);
},
Expand Down
80 changes: 0 additions & 80 deletions lib/bottomnavigator.dart
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions lib/brain.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ class Brain {
dynamic targetCommentsList = allComments
.where((comment) => comment['comment_issue'] == issueId)
.toList();

return targetCommentsList;
}

Expand Down
Loading