flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-30 19:36:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Perform the 'git merge' in the 'cloning ..' screen

Browse Source 
This step can take a lot of time, and I would prefer if the user didn't
see a blank screen after cloning for a short while.
This commit is contained in:
Vishesh Handa
2020-12-26 17:18:11 +01:00
parent 75733c9246
commit 360ece0de7
2 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/repository.dart
View File

@ -408,8 +408,8 @@ class Repository with ChangeNotifier {
}); });
} }
void completeGitHostSetup(String repoFolderName, String remoteName) { Future<void> completeGitHostSetup(
() async { String repoFolderName, String remoteName) async {
var repoPath = p.join(gitBaseDirectory, repoFolderName); var repoPath = p.join(gitBaseDirectory, repoFolderName);
Log.i("completeGitHostSetup repoPath: $repoPath"); Log.i("completeGitHostSetup repoPath: $repoPath");
@ -470,7 +470,6 @@ class Repository with ChangeNotifier {
_syncNotes(); _syncNotes();
notifyListeners(); notifyListeners();
}();
} }
Future _persistConfig() async { Future _persistConfig() async {

4
lib/setup/screens.dart
View File

@ -31,7 +31,7 @@ import 'package:gitjournal/utils/logger.dart';
class GitHostSetupScreen extends StatefulWidget { class GitHostSetupScreen extends StatefulWidget {
final String repoFolderName; final String repoFolderName;
final String remoteName; final String remoteName;
final Func2<String, String, void> onCompletedFunction; final Func2<String, String, Future<void>> onCompletedFunction;
GitHostSetupScreen({ GitHostSetupScreen({
@required this.repoFolderName, @required this.repoFolderName,
@ -555,8 +555,8 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
Event.GitHostSetupComplete, Event.GitHostSetupComplete,
parameters: _buildOnboardingAnalytics(), parameters: _buildOnboardingAnalytics(),
); );
await widget.onCompletedFunction(widget.repoFolderName, widget.remoteName);
Navigator.pop(context); Navigator.pop(context);
widget.onCompletedFunction(widget.repoFolderName, widget.remoteName);
} }
Future<void> _completeAutoConfigure() async { Future<void> _completeAutoConfigure() async {