Skip to content

Commit 0f02b6b

Browse files
TheAlphamercTheAlphamerc
committed
🍱Add octocat image asset
Add octocat image on empty screens widget
1 parent a24ccfa commit 0f02b6b

26 files changed

+69
-53
lines changed

‎assets/images/octocat_1.png

99.8 KB
Loading

‎assets/images/octocat_10.png

55.6 KB
Loading

‎assets/images/octocat_11.png

135 KB
Loading

‎assets/images/octocat_12.png

63.3 KB
Loading

‎assets/images/octocat_2.png

122 KB
Loading

‎assets/images/octocat_3.png

110 KB
Loading

‎assets/images/octocat_4.png

59 KB
Loading

‎assets/images/octocat_5.png

147 KB
Loading

‎assets/images/octocat_6.png

83.9 KB
Loading

‎assets/images/octocat_7.png

47.1 KB
Loading

‎assets/images/octocat_8.png

66.7 KB
Loading

‎assets/images/octocat_9.png

57.6 KB
Loading

‎lib/ui/page/common/no_data_page.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
33
class NoDataPage extends StatelessWidget {
44
final String title, description;
55
final IconData icon;
6-
const NoDataPage({Key key, this.title, this.description, this.icon})
7-
: super(key: key);
6+
final String image;
7+
const NoDataPage({Key key, this.image, this.title, this.description, this.icon}) : super(key: key);
88

99
@override
1010
Widget build(BuildContext context) {
@@ -16,8 +16,7 @@ class NoDataPage extends StatelessWidget {
1616
child: Column(
1717
mainAxisAlignment: MainAxisAlignment.center,
1818
children: <Widget>[
19-
// Image.asset(GImages.githubMarkLight120, width:160),
20-
Icon(icon, size: 120),
19+
image != null ? Image.asset(image, width: 160) : Icon(icon, size: 120),
2120
SizedBox(height: 16),
2221
if (title != null && title.isNotEmpty)
2322
Text(

‎lib/ui/page/home/widgets/event_page.dart

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:flutter_github_connect/helper/shared_prefrence_helper.dart';
88
import 'package:flutter_github_connect/helper/utility.dart';
99
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
1010
import 'package:flutter_github_connect/ui/theme/export_theme.dart';
11+
import 'package:flutter_github_connect/ui/theme/images.dart';
1112
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
1213
import 'package:flutter_github_connect/ui/widgets/g_card.dart';
1314
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
@@ -127,6 +128,7 @@ class _PeopleEventsPageState extends State<PeopleEventsPage> {
127128
);
128129
return NoDataPage(
129130
title: "Activities",
131+
image: GImages.octocat4,
130132
description: "No recent activity detected",
131133
icon: GIcons.github);
132134
},

‎lib/ui/page/issues/issues_page.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter_github_connect/bloc/issues/index.dart';
44
import 'package:flutter_github_connect/helper/GIcons.dart';
55
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
66
import 'package:flutter_github_connect/ui/page/search/searcgPage/issue_list_page.dart';
7+
import 'package:flutter_github_connect/ui/theme/images.dart';
78
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
89
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
910
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
@@ -78,8 +79,8 @@ class _IssuesPageState extends State<IssuesPage> {
7879
// If issues list is empty then display empty list message
7980
return NoDataPage(
8081
title: "Empty issues",
81-
description:
82-
"No issue created yet,\n Once new issues are created, they will be displayed here",
82+
image: GImages.octocat6,
83+
description: "Nothing is here to see!!",
8384
icon: GIcons.issue_opened_24,
8485
);
8586
}

‎lib/ui/page/issues/repo_issues_page.dart

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter_github_connect/bloc/issues/index.dart';
44
import 'package:flutter_github_connect/helper/GIcons.dart';
55
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
66
import 'package:flutter_github_connect/ui/page/search/searcgPage/issue_list_page.dart';
7+
import 'package:flutter_github_connect/ui/theme/images.dart';
78
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
89
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
910
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
@@ -12,11 +13,13 @@ class RepoIssuesPage extends StatefulWidget {
1213
final String owner;
1314
final String name;
1415
const RepoIssuesPage({Key key, this.owner, this.name}) : super(key: key);
15-
static getPageRoute({String owner, String name,int count}) => MaterialPageRoute(
16+
static getPageRoute({String owner, String name, int count}) => MaterialPageRoute(
1617
builder: (context) => BlocProvider(
17-
create: (BuildContext context) =>
18-
IssuesBloc()..add(LoadRepoIssuesEvent(owner: owner, name: name,count:count)),
19-
child: RepoIssuesPage(name: name, owner: owner,),
18+
create: (BuildContext context) => IssuesBloc()..add(LoadRepoIssuesEvent(owner: owner, name: name, count: count)),
19+
child: RepoIssuesPage(
20+
name: name,
21+
owner: owner,
22+
),
2023
),
2124
);
2225
@override
@@ -70,16 +73,13 @@ class _RepoIssuesPagState extends State<RepoIssuesPage> {
7073
}
7174
if (currentState is LoadedRepoIssuesState) {
7275
if (currentState.isNotNullEmpty)
73-
return IssueListPage(
74-
list: currentState.issues.list,
75-
hideAppBar: true,
76-
controller: _controller);
76+
return IssueListPage(list: currentState.issues.list, hideAppBar: true, controller: _controller);
7777

7878
// If issues list is empty then display empty list message
7979
return NoDataPage(
80+
image: GImages.octocat3,
8081
title: "Empty issues",
81-
description:
82-
"No issue created yet,\n Once new issues are created, they will be displayed here",
82+
description: "Nothing is here to see!!",
8383
icon: GIcons.issue_opened_24,
8484
);
8585
}

‎lib/ui/page/notification/notification_page.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter_github_connect/bloc/notification/index.dart';
44
import 'package:flutter_github_connect/helper/GIcons.dart';
55
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
66
import 'package:flutter_github_connect/ui/page/notification/notification_screen.dart';
7+
import 'package:flutter_github_connect/ui/theme/images.dart';
78
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
89
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
910

@@ -32,8 +33,8 @@ class NotificationPage extends StatelessWidget {
3233
);
3334
return NoDataPage(
3435
title: "",
35-
description:
36-
"Nothing to see here!!",
36+
image: GImages.octocat7,
37+
description: "Nothing to see here!!",
3738
icon: GIcons.bell_slash_24,
3839
);
3940
}

‎lib/ui/page/pullRequest/pull_request.dart

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:flutter_github_connect/bloc/pullrequest/index.dart';
66
import 'package:flutter_github_connect/helper/GIcons.dart';
77
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
88
import 'package:flutter_github_connect/ui/page/pullRequest/pull_request_screen.dart';
9+
import 'package:flutter_github_connect/ui/theme/images.dart';
910
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
1011
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
1112
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
@@ -110,6 +111,7 @@ class PullRequestPage extends StatelessWidget {
110111
);
111112
return NoDataPage(
112113
title: "",
114+
image: GImages.octocat8,
113115
description:
114116
"No pull request created yet",
115117
icon: GIcons.git_pull_request_24,
@@ -221,6 +223,7 @@ class RepoPullRequestPage extends StatelessWidget {
221223
);
222224
return NoDataPage(
223225
title: "",
226+
image: GImages.octocat10,
224227
description:
225228
"No pull request created yet",
226229
icon: GIcons.git_pull_request_24,

‎lib/ui/page/repo/commit/commit_page.dart

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter_github_connect/bloc/commit/index.dart';
44
import 'package:flutter_github_connect/helper/GIcons.dart';
55
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
66
import 'package:flutter_github_connect/ui/page/repo/commit/commit_screen.dart';
7+
import 'package:flutter_github_connect/ui/theme/images.dart';
78
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
89
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
910
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
@@ -13,10 +14,9 @@ class CommitPageProvider extends StatefulWidget {
1314
final String owner;
1415

1516
const CommitPageProvider({Key key, this.name, this.owner}) : super(key: key);
16-
static MaterialPageRoute getPageRoute({String owner, String name,int count}) => MaterialPageRoute(
17+
static MaterialPageRoute getPageRoute({String owner, String name, int count}) => MaterialPageRoute(
1718
builder: (context) => BlocProvider(
18-
create: (BuildContext context) =>
19-
CommitBloc()..add(LoadCommitsEvent(name, owner, count: count)),
19+
create: (BuildContext context) => CommitBloc()..add(LoadCommitsEvent(name, owner, count: count)),
2020
child: CommitPageProvider(name: name, owner: owner),
2121
),
2222
);
@@ -45,7 +45,11 @@ class _CommitPageProviderState extends State<CommitPageProvider> {
4545
Widget build(BuildContext context) {
4646
return Scaffold(
4747
backgroundColor: Theme.of(context).colorScheme.surface,
48-
appBar: AppBar(title: GAppBarTitle(title: "Commits",login: widget.name,)),
48+
appBar: AppBar(
49+
title: GAppBarTitle(
50+
title: "Commits",
51+
login: widget.name,
52+
)),
4953
body: BlocBuilder<CommitBloc, CommitState>(
5054
builder: (
5155
BuildContext context,
@@ -60,23 +64,19 @@ class _CommitPageProviderState extends State<CommitPageProvider> {
6064
onPressed: () {
6165
BlocProvider.of<CommitBloc>(context)
6266
..add(
63-
LoadCommitsEvent(widget.name, widget.owner,
64-
isLoadNextCommit: true),
67+
LoadCommitsEvent(widget.name, widget.owner, isLoadNextCommit: true),
6568
);
6669
},
6770
);
6871
}
6972
if (currentState is LoadedCommitState) {
70-
if (currentState.isNotNullEmpty)
71-
return CommitScreen(
72-
history: currentState.history,
73-
controller: _controller);
73+
if (currentState.isNotNullEmpty) return CommitScreen(history: currentState.history, controller: _controller);
7474

7575
// If history list is empty then display empty list message
7676
return NoDataPage(
77+
image: GImages.octocat11,
7778
title: "Empty commit history",
78-
description:
79-
"No issue created yet,\n Once new history are created, they will be displayed here",
79+
description: "Nothing is here to see!!",
8080
icon: GIcons.issue_opened_24,
8181
);
8282
}

‎lib/ui/page/repo/forks/repo_forks_page_provider.dart

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter_github_connect/bloc/bloc/repo_bloc.dart';
44
import 'package:flutter_github_connect/helper/GIcons.dart';
55
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
66
import 'package:flutter_github_connect/ui/page/repo/forks/repo_forks_screen.dart';
7+
import 'package:flutter_github_connect/ui/theme/images.dart';
78
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
89
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
910
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
@@ -99,6 +100,7 @@ class RepoForksPage extends StatelessWidget {
99100
);
100101
return NoDataPage(
101102
title: "",
103+
image: GImages.octocat12,
102104
description: "Nothing to see here!!",
103105
icon: GIcons.git_fork_24,
104106
);

‎lib/ui/page/repo/repo_list_screen.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'package:flutter_github_connect/helper/GIcons.dart';
99
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
1010
import 'package:flutter_github_connect/ui/page/repo/repo_detail_page.dart';
1111
import 'package:flutter_github_connect/ui/theme/export_theme.dart';
12+
import 'package:flutter_github_connect/ui/theme/images.dart';
1213
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
1314
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
1415
import 'package:flutter_github_connect/ui/widgets/user_image.dart';
@@ -146,7 +147,8 @@ class RepositoryListScreen extends StatelessWidget {
146147
body: !(list != null && list.isNotEmpty) && isFromUserRepositoryListPage
147148
? NoDataPage(
148149
title: "No repo Found",
149-
description: "$login haven't created any repo yet",
150+
image: GImages.octocat11,
151+
description:isFromUserRepositoryListPage ? null : "$login haven't created any repo yet",
150152
icon: GIcons.github_1,
151153
)
152154
: !isFromUserRepositoryListPage

‎lib/ui/page/repo/stargezers/repo_stargezers_page_provider.dart

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:flutter_github_connect/bloc/people/index.dart';
44
import 'package:flutter_github_connect/helper/GIcons.dart';
55
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
66
import 'package:flutter_github_connect/ui/page/repo/stargezers/repo_stargezers_screen.dart';
7+
import 'package:flutter_github_connect/ui/theme/images.dart';
78
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
89
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
910
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
@@ -99,6 +100,7 @@ class RepoStargazersPage extends StatelessWidget {
99100
);
100101
return NoDataPage(
101102
title: "",
103+
image: GImages.octocat1,
102104
description:
103105
"Nothing is here to see\nCome back later!!",
104106
icon: GIcons.star_fill_24,

‎lib/ui/page/search/searcgPage/search_list_provider.dart

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:flutter_github_connect/ui/page/repo/repo_list_screen.dart';
88
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
99
import 'package:flutter_github_connect/ui/page/search/searcgPage/issue_list_page.dart';
1010
import 'package:flutter_github_connect/ui/page/search/searcgPage/user_list_page.dart';
11+
import 'package:flutter_github_connect/ui/theme/images.dart';
1112
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
1213
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
1314

@@ -49,6 +50,7 @@ class _SearchListProviderState extends State<SearchListProvider> {
4950
}
5051
Widget _emptyWidget(){
5152
return NoDataPage(
53+
image: GImages.octocat9,
5254
title: "No ${widget.type.asSmallString()} Found",
5355
description: "Try again with different keyword",
5456
icon: GIcons.github_1,

‎lib/ui/page/search/search_page.dart

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:flutter_github_connect/ui/page/common/under_development.dart';
66
import 'package:flutter_github_connect/ui/page/search/searcgPage/search_list_provider.dart';
77
import 'package:flutter_github_connect/ui/theme/export_theme.dart';
88
import 'package:flutter_github_connect/helper/GIcons.dart';
9+
import 'package:flutter_github_connect/ui/theme/images.dart';
910

1011
class SearchPage extends StatelessWidget {
1112
SearchPage({Key key}) : super(key: key);
@@ -149,6 +150,7 @@ class SearchPage extends StatelessWidget {
149150
));
150151
},
151152
child: NoDataPage(
153+
// image: GImages.octocat12,
152154
title: "Find your stuff.",
153155
description:
154156
"Search all of Github for People,\n Repository, Organizations, Issues\n and pull request",

‎lib/ui/page/user/gist/gist_list_page.dart

+9-21
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,19 @@ import 'package:flutter_github_connect/bloc/people/index.dart';
55
import 'package:flutter_github_connect/helper/GIcons.dart';
66
import 'package:flutter_github_connect/ui/page/common/no_data_page.dart';
77
import 'package:flutter_github_connect/ui/page/user/gist/gist_list_screen.dart';
8+
import 'package:flutter_github_connect/ui/theme/images.dart';
89
import 'package:flutter_github_connect/ui/widgets/g_app_bar_title.dart';
910
import 'package:flutter_github_connect/ui/widgets/g_error_container.dart';
1011
import 'package:flutter_github_connect/ui/widgets/g_loader.dart';
1112

1213
class GistlistPageProvider extends StatefulWidget {
1314
final String login;
1415
const GistlistPageProvider({Key key, this.login}) : super(key: key);
15-
static MaterialPageRoute getPageRoute(
16-
BuildContext context, {
17-
String login,
18-
int count
19-
}) {
16+
static MaterialPageRoute getPageRoute(BuildContext context, {String login, int count}) {
2017
return MaterialPageRoute(
2118
builder: (context) {
2219
return BlocProvider<GistBloc>(
23-
create: (BuildContext context) => GistBloc()..add(OnGistLoad(login, count:count)),
20+
create: (BuildContext context) => GistBloc()..add(OnGistLoad(login, count: count)),
2421
child: GistlistPageProvider(login: login),
2522
);
2623
},
@@ -41,23 +38,18 @@ class _GistlistPageProviderState extends State<GistlistPageProvider> {
4138

4239
void listener() {
4340
if (_controller.position.pixels == _controller.position.maxScrollExtent) {
44-
BlocProvider.of<GistBloc>(context)
45-
.add(OnGistLoad(widget.login, isLoadNextGist: true));
41+
BlocProvider.of<GistBloc>(context).add(OnGistLoad(widget.login, isLoadNextGist: true));
4642
}
4743
}
4844

4945
@override
5046
Widget build(BuildContext context) {
51-
return GistlistPage(
52-
bloc: BlocProvider.of<GistBloc>(context),
53-
login: widget.login,
54-
controller: _controller);
47+
return GistlistPage(bloc: BlocProvider.of<GistBloc>(context), login: widget.login, controller: _controller);
5548
}
5649
}
5750

5851
class GistlistPage extends StatelessWidget {
59-
const GistlistPage({Key key, this.bloc, this.login, this.controller})
60-
: super(key: key);
52+
const GistlistPage({Key key, this.bloc, this.login, this.controller}) : super(key: key);
6153
final GistBloc bloc;
6254
final String login;
6355
final ScrollController controller;
@@ -82,15 +74,11 @@ class GistlistPage extends StatelessWidget {
8274
);
8375
}
8476
if (currentState is LoadedGitState) {
85-
if (currentState.isNotNullEmpty)
86-
return GistListScreen(
87-
gist: currentState.gist,
88-
login: login,
89-
controller: controller);
77+
if (currentState.isNotNullEmpty) return GistListScreen(gist: currentState.gist, login: login, controller: controller);
9078
return NoDataPage(
9179
title: "",
92-
description:
93-
"Nothing to see here!!",
80+
image: GImages.octocat4,
81+
description: "Nothing to see here!!",
9482
icon: GIcons.code_24,
9583
);
9684
}

‎lib/ui/theme/images.dart

+13-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,16 @@ class GImages {
55
static const String octocatIconLight120 = "assets/icons/GitHub-Mark-Light-120px-plus.png";
66
static const String githubOctocat = "assets/icons/github-octocat.png";
77
static const String githubMarkLight120 = "assets/icons/GitHub-Mark-Light-120px-plus.png";
8-
}
8+
static const String octocat1 = "assets/images/octocat_1.png";
9+
static const String octocat2 = "assets/images/octocat_2.png";
10+
static const String octocat3 = "assets/images/octocat_3.png";
11+
static const String octocat4 = "assets/images/octocat_4.png";
12+
static const String octocat5 = "assets/images/octocat_5.png";
13+
static const String octocat6 = "assets/images/octocat_6.png";
14+
static const String octocat7 = "assets/images/octocat_7.png";
15+
static const String octocat8 = "assets/images/octocat_8.png";
16+
static const String octocat9 = "assets/images/octocat_9.png";
17+
static const String octocat10 = "assets/images/octocat_10.png";
18+
static const String octocat11 = "assets/images/octocat_11.png";
19+
static const String octocat12 = "assets/images/octocat_12.png";
20+
}

0 commit comments

Comments
 (0)