From 5123938e53722da4f4622d6e74c3c72fe3bcadc2 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Mon, 18 May 2020 18:13:21 +0200
Subject: [PATCH] Setup: Rename screen to Loading/Error screen
It's all that it does. This way we can re-use this screen in other
places.
---
lib/setup/{clone.dart => loading_error.dart} | 10 ++++++----
lib/setup/screens.dart | 10 ++++++++--
2 files changed, 14 insertions(+), 6 deletions(-)
rename lib/setup/{clone.dart => loading_error.dart} (54%)
diff --git a/lib/setup/clone.dart b/lib/setup/loading_error.dart
similarity index 54%
rename from lib/setup/clone.dart
rename to lib/setup/loading_error.dart
index 26ca41fa..ece45bb2 100644
--- a/lib/setup/clone.dart
+++ b/lib/setup/loading_error.dart
@@ -3,17 +3,19 @@ import 'package:flutter/material.dart';
import 'error.dart';
import 'loading.dart';
-class GitHostSetupGitClone extends StatelessWidget {
+class GitHostSetupLoadingErrorPage extends StatelessWidget {
final String errorMessage;
+ final String loadingMessage;
- GitHostSetupGitClone({
- this.errorMessage,
+ GitHostSetupLoadingErrorPage({
+ @required this.errorMessage,
+ @required this.loadingMessage,
});
@override
Widget build(BuildContext context) {
if (errorMessage == null || errorMessage.isEmpty) {
- return GitHostSetupLoadingPage("Cloning ...");
+ return GitHostSetupLoadingPage(loadingMessage);
}
return GitHostSetupErrorPage(errorMessage);
diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index f5c85b0e..121ff29d 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -246,7 +246,10 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
if (pos == 4) {
if (_pageChoice[0] == PageChoice0.CustomProvider) {
- return GitHostSetupGitClone(errorMessage: gitCloneErrorMessage);
+ return GitHostSetupLoadingErrorPage(
+ loadingMessage: "Cloning ...",
+ errorMessage: gitCloneErrorMessage,
+ );
}
if (_pageChoice[1] == PageChoice1.Manual) {
@@ -302,7 +305,10 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
}
if (pos == 5) {
- return GitHostSetupGitClone(errorMessage: gitCloneErrorMessage);
+ return GitHostSetupLoadingErrorPage(
+ loadingMessage: "Cloning ...",
+ errorMessage: gitCloneErrorMessage,
+ );
}
assert(_pageChoice[0] != PageChoice0.CustomProvider);