Skip to content

Commit de41f53

Browse files
committed
remove unnecessary 'new' keyword, resolves mdanics#39
1 parent fdd1bc6 commit de41f53

12 files changed

+377
-377
lines changed

lib/activity_feed.dart

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ import 'main.dart'; //needed for currentuser id
66

77
class ActivityFeedPage extends StatefulWidget {
88
@override
9-
_ActivityFeedPageState createState() => new _ActivityFeedPageState();
9+
_ActivityFeedPageState createState() => _ActivityFeedPageState();
1010
}
1111

1212
class _ActivityFeedPageState extends State<ActivityFeedPage> with AutomaticKeepAliveClientMixin<ActivityFeedPage> {
1313
@override
1414
Widget build(BuildContext context) {
1515
super.build(context); // reloads state when opened again
1616

17-
return new Scaffold(
18-
appBar: new AppBar(
19-
title: new Text(
17+
return Scaffold(
18+
appBar: AppBar(
19+
title: Text(
2020
"Activity Feed",
21-
style: new TextStyle(color: Colors.black),
21+
style: TextStyle(color: Colors.black),
2222
),
2323
backgroundColor: Colors.white,
2424
),
@@ -27,17 +27,17 @@ class _ActivityFeedPageState extends State<ActivityFeedPage> with AutomaticKeepA
2727
}
2828

2929
buildActivityFeed() {
30-
return new Container(
31-
child: new FutureBuilder(
30+
return Container(
31+
child: FutureBuilder(
3232
future: getFeed(),
3333
builder: (context, snapshot) {
3434
if (!snapshot.hasData)
35-
return new Container(
35+
return Container(
3636
alignment: FractionalOffset.center,
3737
padding: const EdgeInsets.only(top: 10.0),
38-
child: new CircularProgressIndicator());
38+
child: CircularProgressIndicator());
3939
else {
40-
return new ListView(children: snapshot.data);
40+
return ListView(children: snapshot.data);
4141
}
4242
}),
4343
);
@@ -53,7 +53,7 @@ class _ActivityFeedPageState extends State<ActivityFeedPage> with AutomaticKeepA
5353
.getDocuments();
5454

5555
for (var doc in snap.documents) {
56-
items.add(new ActivityFeedItem.fromDocument(doc));
56+
items.add(ActivityFeedItem.fromDocument(doc));
5757
}
5858
return items;
5959
}
@@ -68,7 +68,7 @@ class ActivityFeedItem extends StatelessWidget {
6868
final String username;
6969
final String userId;
7070
final String
71-
type; // potetial types include liked photo, follow user, comment on photo
71+
type; // types include liked photo, follow user, comment on photo
7272
final String mediaUrl;
7373
final String mediaId;
7474
final String userProfileImg;
@@ -84,7 +84,7 @@ class ActivityFeedItem extends StatelessWidget {
8484
this.commentData});
8585

8686
factory ActivityFeedItem.fromDocument(DocumentSnapshot document) {
87-
return new ActivityFeedItem(
87+
return ActivityFeedItem(
8888
username: document['username'],
8989
userId: document['userId'],
9090
type: document['type'],
@@ -95,26 +95,26 @@ class ActivityFeedItem extends StatelessWidget {
9595
);
9696
}
9797

98-
Widget mediaPreview = new Container();
98+
Widget mediaPreview = Container();
9999
String actionText;
100100

101101
void configureItem(BuildContext context) {
102102
if (type == "like" || type == "comment") {
103-
mediaPreview = new GestureDetector(
103+
mediaPreview = GestureDetector(
104104
onTap: () {
105105
openImage(context, mediaId);
106106
},
107-
child: new Container(
107+
child: Container(
108108
height: 45.0,
109109
width: 45.0,
110-
child: new AspectRatio(
110+
child: AspectRatio(
111111
aspectRatio: 487 / 451,
112-
child: new Container(
113-
decoration: new BoxDecoration(
114-
image: new DecorationImage(
112+
child: Container(
113+
decoration: BoxDecoration(
114+
image: DecorationImage(
115115
fit: BoxFit.fill,
116116
alignment: FractionalOffset.topCenter,
117-
image: new NetworkImage(mediaUrl),
117+
image: NetworkImage(mediaUrl),
118118
)),
119119
),
120120
),
@@ -136,18 +136,18 @@ class ActivityFeedItem extends StatelessWidget {
136136
@override
137137
Widget build(BuildContext context) {
138138
configureItem(context);
139-
return new Row(
139+
return Row(
140140
mainAxisSize: MainAxisSize.max,
141141
children: <Widget>[
142-
new Padding(
142+
Padding(
143143
padding: const EdgeInsets.only(left: 20.0, right: 15.0),
144-
child: new CircleAvatar(
144+
child: CircleAvatar(
145145
radius: 23.0,
146-
backgroundImage: new NetworkImage(userProfileImg),
146+
backgroundImage: NetworkImage(userProfileImg),
147147
),
148148
),
149149
Expanded(
150-
child: new Row(
150+
child: Row(
151151
mainAxisSize: MainAxisSize.min,
152152
children: <Widget>[
153153
GestureDetector(
@@ -170,11 +170,11 @@ class ActivityFeedItem extends StatelessWidget {
170170
],
171171
),
172172
),
173-
new Container(
174-
child: new Align(
175-
child: new Padding(
173+
Container(
174+
child: Align(
175+
child: Padding(
176176
child: mediaPreview,
177-
padding: new EdgeInsets.all(15.0),
177+
padding: EdgeInsets.all(15.0),
178178
),
179179
alignment: AlignmentDirectional.bottomEnd))
180180
],
@@ -185,19 +185,19 @@ class ActivityFeedItem extends StatelessWidget {
185185
openImage(BuildContext context, String imageId) {
186186
print("the image id is $imageId");
187187
Navigator.of(context)
188-
.push(new MaterialPageRoute<bool>(builder: (BuildContext context) {
189-
return new Center(
190-
child: new Scaffold(
191-
appBar: new AppBar(
192-
title: new Text('Photo',
193-
style: new TextStyle(
188+
.push(MaterialPageRoute<bool>(builder: (BuildContext context) {
189+
return Center(
190+
child: Scaffold(
191+
appBar: AppBar(
192+
title: Text('Photo',
193+
style: TextStyle(
194194
color: Colors.black, fontWeight: FontWeight.bold)),
195195
backgroundColor: Colors.white,
196196
),
197-
body: new ListView(
197+
body: ListView(
198198
children: <Widget>[
199-
new Container(
200-
child: new ImagePostFromId(id: imageId),
199+
Container(
200+
child: ImagePostFromId(id: imageId),
201201
),
202202
],
203203
)),

lib/comment_screen.dart

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class CommentScreen extends StatefulWidget {
1010

1111
const CommentScreen({this.postId, this.postOwner, this.postMediaUrl});
1212
@override
13-
_CommentScreenState createState() => new _CommentScreenState(
13+
_CommentScreenState createState() => _CommentScreenState(
1414
postId: this.postId,
1515
postOwner: this.postOwner,
1616
postMediaUrl: this.postMediaUrl);
@@ -21,17 +21,17 @@ class _CommentScreenState extends State<CommentScreen> {
2121
final String postOwner;
2222
final String postMediaUrl;
2323

24-
final TextEditingController _commentController = new TextEditingController();
24+
final TextEditingController _commentController = TextEditingController();
2525

2626
_CommentScreenState({this.postId, this.postOwner, this.postMediaUrl});
2727

2828
@override
2929
Widget build(BuildContext context) {
30-
return new Scaffold(
31-
appBar: new AppBar(
32-
title: new Text(
30+
return Scaffold(
31+
appBar: AppBar(
32+
title: Text(
3333
"Comments",
34-
style: new TextStyle(color: Colors.black),
34+
style: TextStyle(color: Colors.black),
3535
),
3636
backgroundColor: Colors.white,
3737
),
@@ -40,20 +40,20 @@ class _CommentScreenState extends State<CommentScreen> {
4040
}
4141

4242
Widget buildPage() {
43-
return new Column(
43+
return Column(
4444
children: [
45-
new Expanded(
45+
Expanded(
4646
child:
4747
buildComments(),
4848
),
49-
new Divider(),
50-
new ListTile(
51-
title: new TextFormField(
49+
Divider(),
50+
ListTile(
51+
title: TextFormField(
5252
controller: _commentController,
53-
decoration: new InputDecoration(labelText: 'Write a comment...'),
53+
decoration: InputDecoration(labelText: 'Write a comment...'),
5454
onFieldSubmitted: addComment,
5555
),
56-
trailing: new OutlineButton(onPressed: (){addComment(_commentController.text);}, borderSide: BorderSide.none, child: new Text("Post"),),
56+
trailing: OutlineButton(onPressed: (){addComment(_commentController.text);}, borderSide: BorderSide.none, child: Text("Post"),),
5757
),
5858

5959
],
@@ -63,15 +63,15 @@ class _CommentScreenState extends State<CommentScreen> {
6363

6464

6565
Widget buildComments() {
66-
return new FutureBuilder<List<Comment>>(
66+
return FutureBuilder<List<Comment>>(
6767
future: getComments(),
6868
builder: (context, snapshot) {
6969
if (!snapshot.hasData)
70-
return new Container(
70+
return Container(
7171
alignment: FractionalOffset.center,
72-
child: new CircularProgressIndicator());
72+
child: CircularProgressIndicator());
7373

74-
return new ListView(
74+
return ListView(
7575
children: snapshot.data,
7676
);
7777
});
@@ -86,7 +86,7 @@ class _CommentScreenState extends State<CommentScreen> {
8686
.collection("comments")
8787
.getDocuments();
8888
data.documents.forEach((DocumentSnapshot doc) {
89-
comments.add(new Comment.fromDocument(doc));
89+
comments.add(Comment.fromDocument(doc));
9090
});
9191

9292
return comments;
@@ -101,7 +101,7 @@ class _CommentScreenState extends State<CommentScreen> {
101101
.add({
102102
"username": currentUserModel.username,
103103
"comment": comment,
104-
"timestamp": new DateTime.now().toString(),
104+
"timestamp": DateTime.now().toString(),
105105
"avatarUrl": currentUserModel.photoUrl,
106106
"userId": currentUserModel.id
107107
});
@@ -117,7 +117,7 @@ class _CommentScreenState extends State<CommentScreen> {
117117
"type": "comment",
118118
"userProfileImg": currentUserModel.photoUrl,
119119
"commentData": comment,
120-
"timestamp": new DateTime.now().toString(),
120+
"timestamp": DateTime.now().toString(),
121121
"postId": postId,
122122
"mediaUrl": postMediaUrl,
123123
});
@@ -139,7 +139,7 @@ class Comment extends StatelessWidget {
139139
this.timestamp});
140140

141141
factory Comment.fromDocument(DocumentSnapshot document) {
142-
return new Comment(
142+
return Comment(
143143
username: document['username'],
144144
userId: document['userId'],
145145
comment: document["comment"],
@@ -150,15 +150,15 @@ class Comment extends StatelessWidget {
150150

151151
@override
152152
Widget build(BuildContext context) {
153-
return new Column(
153+
return Column(
154154
children: <Widget>[
155-
new ListTile(
156-
title: new Text(comment),
157-
leading: new CircleAvatar(
158-
backgroundImage: new NetworkImage(avatarUrl),
155+
ListTile(
156+
title: Text(comment),
157+
leading: CircleAvatar(
158+
backgroundImage: NetworkImage(avatarUrl),
159159
),
160160
),
161-
new Divider(),
161+
Divider(),
162162
],
163163
);
164164
}

0 commit comments

Comments
 (0)