flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-07-01 04:07:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

GitHostSetup: Do not manually count the number of pages

Browse Source 
It's error prone.

The '+ 2' seems cryptic - +1 is because the variable is a 'count' and
not 'index'. Another '+1' because we now have one more page.
This commit is contained in:
Vishesh Handa
2019-02-13 20:54:15 +01:00
parent 0a6d6f63ee
commit 22c457b0f1
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/screens/githostsetup_screens.dart
View File

@ -60,14 +60,14 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
onCreateNewRepo: () { onCreateNewRepo: () {
setState(() { setState(() {
_pageChoice[0] = PageChoice0.CreateRepo; _pageChoice[0] = PageChoice0.CreateRepo;
_pageCount = 2; _pageCount = pos + 2;
_nextPage(); _nextPage();
}); });
}, },
onExistingRepo: () { onExistingRepo: () {
setState(() { setState(() {
_pageChoice[0] = PageChoice0.UseExisting; _pageChoice[0] = PageChoice0.UseExisting;
_pageCount = 2; _pageCount = pos + 2;
_nextPage(); _nextPage();
}); });
}, },
@ -81,8 +81,9 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
return GitHostChoicePage( return GitHostChoicePage(
onDone: (GitHostType gitHostType) { onDone: (GitHostType gitHostType) {
setState(() { setState(() {
_pageCount = 3;
_gitHostType = gitHostType; _gitHostType = gitHostType;
_pageCount = pos + 2;
_nextPage(); _nextPage();
}); });
}, },
@ -90,9 +91,9 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
} else if (_pageChoice[0] == PageChoice0.UseExisting) { } else if (_pageChoice[0] == PageChoice0.UseExisting) {
return GitHostSetupUrl(doneFunction: (String sshUrl) { return GitHostSetupUrl(doneFunction: (String sshUrl) {
setState(() { setState(() {
_pageCount = 3;
_gitCloneUrl = sshUrl; _gitCloneUrl = sshUrl;
_pageCount = pos + 2;
_nextPage(); _nextPage();
_generateSshKey(); _generateSshKey();
}); });
@ -105,8 +106,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
return GitHostSetupSshKey( return GitHostSetupSshKey(
doneFunction: () { doneFunction: () {
setState(() { setState(() {
_pageCount = 4; _pageCount = pos + 2;
_nextPage(); _nextPage();
_startGitClone(context); _startGitClone(context);
}); });
@ -122,13 +122,13 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
onDone: (GitHostSetupType setupType) { onDone: (GitHostSetupType setupType) {
if (setupType == GitHostSetupType.Manual) { if (setupType == GitHostSetupType.Manual) {
setState(() { setState(() {
_pageCount = 4; _pageCount = pos + 2;
_pageChoice[2] = PageChoice2.Manual; _pageChoice[2] = PageChoice2.Manual;
_nextPage(); _nextPage();
}); });
} else if (setupType == GitHostSetupType.Auto) { } else if (setupType == GitHostSetupType.Auto) {
setState(() { setState(() {
_pageCount = 4; _pageCount = pos + 2;
_pageChoice[2] = PageChoice2.Auto; _pageChoice[2] = PageChoice2.Auto;
_nextPage(); _nextPage();
}); });
@ -148,7 +148,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
onDone: (String gitCloneUrl) { onDone: (String gitCloneUrl) {
setState(() { setState(() {
_gitCloneUrl = gitCloneUrl; _gitCloneUrl = gitCloneUrl;
_pageCount = 5; _pageCount = pos + 2;
_nextPage(); _nextPage();
_startGitClone(context); _startGitClone(context);
@ -158,7 +158,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
} else if (_pageChoice[2] == PageChoice2.Manual) { } else if (_pageChoice[2] == PageChoice2.Manual) {
return GitHostSetupUrl(doneFunction: (String sshUrl) { return GitHostSetupUrl(doneFunction: (String sshUrl) {
setState(() { setState(() {
_pageCount = 5; _pageCount = pos + 2;
_gitCloneUrl = sshUrl; _gitCloneUrl = sshUrl;
_nextPage(); _nextPage();