From 22c457b0f1abede9c466570d62b3f09d20b4f495 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Wed, 13 Feb 2019 20:54:15 +0100
Subject: [PATCH] GitHostSetup: Do not manually count the number of pages

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.
---
 lib/screens/githostsetup_screens.dart | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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