1
0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-07-15 07:56:11 +08:00

Rename OnBoarding to GitHostSetup

It was either GitHost or GitRemote.
This commit is contained in:
Vishesh Handa
2019-01-25 11:52:41 +01:00
parent c5135ff822
commit 285a900e76
6 changed files with 62 additions and 62 deletions

@ -1,13 +1,13 @@
import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:firebase_analytics/observer.dart';
import 'package:flutter/material.dart';
import 'package:journal/screens/home_screen.dart';
import 'package:journal/screens/settings_screen.dart';
import 'package:journal/screens/onboarding_screens.dart';
import 'package:journal/state_container.dart';
import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:firebase_analytics/observer.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'screens/githostsetup_screens.dart';
class JournalApp extends StatelessWidget {
static FirebaseAnalytics analytics = FirebaseAnalytics();
static FirebaseAnalyticsObserver observer =
@ -25,7 +25,7 @@ class JournalApp extends StatelessWidget {
Widget build(BuildContext context) {
var stateContainer = StateContainer.of(context);
var onCompleted = () {
stateContainer.completeOnBoarding();
stateContainer.completeGitHostSetup();
};
return new MaterialApp(
@ -42,7 +42,7 @@ class JournalApp extends StatelessWidget {
routes: {
'/': (context) => HomeScreen(),
'/settings': (context) => SettingsScreen(),
'/setupRemoteGit': (context) => OnBoardingScreen(onCompleted),
'/setupRemoteGit': (context) => GitHostSetupScreen(onCompleted),
},
debugShowCheckedModeBanner: false,
//debugShowMaterialGrid: true,

@ -2,22 +2,22 @@ import 'package:flutter/material.dart';
import 'package:journal/apis/git.dart';
import 'package:journal/apis/githost_factory.dart';
class OnBoardingAutoConfigure extends StatefulWidget {
class GitHostSetupAutoConfigure extends StatefulWidget {
final GitHostType gitHostType;
final Function onDone;
OnBoardingAutoConfigure({
GitHostSetupAutoConfigure({
@required this.gitHostType,
@required this.onDone,
});
@override
OnBoardingAutoConfigureState createState() {
return new OnBoardingAutoConfigureState();
GitHostSetupAutoConfigureState createState() {
return new GitHostSetupAutoConfigureState();
}
}
class OnBoardingAutoConfigureState extends State<OnBoardingAutoConfigure> {
class GitHostSetupAutoConfigureState extends State<GitHostSetupAutoConfigure> {
GitHost gitHost;
@override

@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
class OnBoardingGitClone extends StatelessWidget {
class GitHostSetupGitClone extends StatelessWidget {
final String errorMessage;
OnBoardingGitClone({
GitHostSetupGitClone({
this.errorMessage,
});

@ -6,25 +6,26 @@ import 'package:flutter/services.dart';
import 'package:journal/analytics.dart';
import 'package:journal/apis/git.dart';
import 'package:journal/apis/githost_factory.dart';
import 'package:journal/screens/onboarding_autoconfigure.dart';
import 'package:journal/screens/onboarding_git_clone.dart';
import 'package:journal/screens/onboarding_git_url.dart';
import 'package:journal/state_container.dart';
import 'package:path/path.dart' as p;
import 'package:url_launcher/url_launcher.dart';
class OnBoardingScreen extends StatefulWidget {
final Function onBoardingCompletedFunction;
import 'githostsetup_autoconfigure.dart';
import 'githostsetup_clone.dart';
import 'githostsetup_url.dart';
OnBoardingScreen(this.onBoardingCompletedFunction);
class GitHostSetupScreen extends StatefulWidget {
final Function onCompletedFunction;
GitHostSetupScreen(this.onCompletedFunction);
@override
OnBoardingScreenState createState() {
return new OnBoardingScreenState();
GitHostSetupScreenState createState() {
return new GitHostSetupScreenState();
}
}
class OnBoardingScreenState extends State<OnBoardingScreen> {
class GitHostSetupScreenState extends State<GitHostSetupScreen> {
var _createNewRepo = false;
var _pageInitalScreenDone = false;
@ -69,7 +70,7 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
controller: pageController,
itemBuilder: (BuildContext context, int pos) {
if (pos == 0) {
return OnBoardingInitialChoice(
return GitHostSetupInitialChoice(
onCreateNewRepo: () {
setState(() {
_createNewRepo = true;
@ -96,7 +97,7 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
}
if (pos == 1 && _createNewRepo) {
return OnBoardingCreateRepo(
return GitHostSetupCreateRepo(
onDone: (GitHostType gitHostType, bool autoConfigure) {
if (!autoConfigure) {
_launchCreateRepoPage(gitHostType);
@ -119,7 +120,7 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
}
if (pos == 2 && _createNewRepo && _autoConfigureStarted) {
return OnBoardingAutoConfigure(
return GitHostSetupAutoConfigure(
gitHostType: _gitHostType,
onDone: (String gitCloneUrl) {
setState(() {
@ -139,11 +140,11 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
}
if (pos == 3 && _createNewRepo && _autoConfigureDone) {
return OnBoardingGitClone(errorMessage: gitCloneErrorMessage);
return GitHostSetupGitClone(errorMessage: gitCloneErrorMessage);
}
if ((pos == 2 && _createNewRepo) || pos == 1) {
return OnBoardingGitUrl(doneFunction: (String sshUrl) {
return GitHostSetupUrl(doneFunction: (String sshUrl) {
setPageInputUrlDone();
pageController.nextPage(
duration: Duration(milliseconds: 200),
@ -162,7 +163,7 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
});
}
if ((pos == 3 && _createNewRepo) || pos == 2) {
return OnBoardingSshKey(
return GitHostSetupSshKey(
doneFunction: () {
setPageSshKeyDone();
pageController.nextPage(
@ -186,12 +187,13 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
}
if ((pos == 4 && _createNewRepo) || pos == 3) {
return OnBoardingGitClone(errorMessage: gitCloneErrorMessage);
return GitHostSetupGitClone(errorMessage: gitCloneErrorMessage);
}
},
itemCount: pageCount,
onPageChanged: (int pageNum) {
print("PageView onPageChanged: " + pageNum.toString());
/*
String pageName = "";
switch (pageNum) {
case 0:
@ -213,6 +215,7 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
'page_name': pageName,
},
);
*/
setState(() {
_currentPageIndex = pageNum;
@ -349,7 +352,7 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
parameters: <String, dynamic>{},
);
Navigator.pop(context);
this.widget.onBoardingCompletedFunction();
this.widget.onCompletedFunction();
}
}
@ -365,11 +368,11 @@ class OnBoardingScreenState extends State<OnBoardingScreen> {
}
}
class OnBoardingInitialChoice extends StatelessWidget {
class GitHostSetupInitialChoice extends StatelessWidget {
final Function onCreateNewRepo;
final Function onExistingRepo;
OnBoardingInitialChoice({
GitHostSetupInitialChoice({
@required this.onCreateNewRepo,
@required this.onExistingRepo,
});
@ -407,12 +410,12 @@ class OnBoardingInitialChoice extends StatelessWidget {
style: Theme.of(context).textTheme.headline,
),
SizedBox(height: 8.0),
OnBoardingButton(
GitHostSetupButton(
text: "Create a New Repo",
onPressed: onCreateNewRepo,
),
SizedBox(height: 8.0),
OnBoardingButton(
GitHostSetupButton(
text: "I already have one",
onPressed: onExistingRepo,
),
@ -424,11 +427,11 @@ class OnBoardingInitialChoice extends StatelessWidget {
}
}
class OnBoardingCreateRepo extends StatelessWidget {
class GitHostSetupCreateRepo extends StatelessWidget {
final Function onDone;
final _configureKey = new GlobalKey();
OnBoardingCreateRepo({@required this.onDone});
GitHostSetupCreateRepo({@required this.onDone});
@override
Widget build(BuildContext context) {
@ -442,7 +445,7 @@ class OnBoardingCreateRepo extends StatelessWidget {
style: Theme.of(context).textTheme.headline,
),
SizedBox(height: 16.0),
OnBoardingButton(
GitHostSetupButton(
text: "GitHub",
iconUrl: 'assets/icon/github-icon.png',
onPressed: () {
@ -451,7 +454,7 @@ class OnBoardingCreateRepo extends StatelessWidget {
},
),
SizedBox(height: 8.0),
OnBoardingButton(
GitHostSetupButton(
text: "GitLab",
iconUrl: 'assets/icon/gitlab-icon.png',
onPressed: () async {
@ -483,7 +486,7 @@ class OnBoardingCreateRepo extends StatelessWidget {
}
}
class OnBoardingSshKey extends StatelessWidget {
class GitHostSetupSshKey extends StatelessWidget {
final Function doneFunction;
final Function copyKeyFunction;
final String publicKey;
@ -491,7 +494,7 @@ class OnBoardingSshKey extends StatelessWidget {
final Function openDeployKeyPage;
final bool canOpenDeployKeyPage;
OnBoardingSshKey({
GitHostSetupSshKey({
@required this.doneFunction,
@required this.copyKeyFunction,
@required this.openDeployKeyPage,
@ -509,7 +512,7 @@ class OnBoardingSshKey extends StatelessWidget {
copyAndDepoyWidget = Container();
cloneButton = Container();
} else {
cloneButton = OnBoardingButton(
cloneButton = GitHostSetupButton(
text: "Clone Repo",
onPressed: this.doneFunction,
);
@ -544,7 +547,7 @@ class OnBoardingSshKey extends StatelessWidget {
],
);
} else {
copyAndDepoyWidget = OnBoardingButton(
copyAndDepoyWidget = GitHostSetupButton(
text: "Copy Key",
onPressed: this.copyKeyFunction,
);

@ -1,20 +1,19 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:journal/analytics.dart';
class OnBoardingGitUrl extends StatefulWidget {
class GitHostSetupUrl extends StatefulWidget {
final Function doneFunction;
OnBoardingGitUrl({@required this.doneFunction});
GitHostSetupUrl({@required this.doneFunction});
@override
OnBoardingGitUrlState createState() {
return new OnBoardingGitUrlState();
GitHostSetupUrlState createState() {
return new GitHostSetupUrlState();
}
}
class OnBoardingGitUrlState extends State<OnBoardingGitUrl> {
class GitHostSetupUrlState extends State<GitHostSetupUrl> {
final GlobalKey<FormFieldState<String>> sshUrlKey =
GlobalKey<FormFieldState<String>>();
@ -80,7 +79,7 @@ class OnBoardingGitUrlState extends State<OnBoardingGitUrl> {
child: inputForm,
),
SizedBox(height: 8.0),
OnBoardingButton(
GitHostSetupButton(
text: "Next",
onPressed: formSubmitted,
),
@ -89,12 +88,12 @@ class OnBoardingGitUrlState extends State<OnBoardingGitUrl> {
}
}
class OnBoardingButton extends StatelessWidget {
class GitHostSetupButton extends StatelessWidget {
final Function onPressed;
final String text;
final String iconUrl;
OnBoardingButton({
GitHostSetupButton({
@required this.text,
@required this.onPressed,
this.iconUrl,
@ -133,9 +132,9 @@ class OnBoardingButton extends StatelessWidget {
}
void _onPressedWithAnalytics() {
print("onboarding_button_click " + text);
print("githostsetup_button_click " + text);
getAnalytics().logEvent(
name: "onboarding_button_click",
name: "githostsetup_button_click",
parameters: <String, dynamic>{
'text': text,
'icon_url': iconUrl == null ? "" : iconUrl,

@ -3,17 +3,15 @@ import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:journal/apis/git_migration.dart';
import 'package:journal/appstate.dart';
import 'package:journal/datetime_utils.dart';
import 'package:journal/note.dart';
import 'package:journal/storage/git_storage.dart';
import 'package:journal/storage/notes_repository.dart';
import 'package:path/path.dart' as p;
import 'package:shared_preferences/shared_preferences.dart';
import 'package:journal/appstate.dart';
import 'package:journal/note.dart';
import 'package:journal/storage/notes_repository.dart';
import 'package:journal/storage/git_storage.dart';
import 'package:journal/datetime_utils.dart';
import 'package:journal/apis/git_migration.dart';
class StateContainer extends StatefulWidget {
final Widget child;
final bool localGitRepoConfigured;
@ -185,7 +183,7 @@ class StateContainerState extends State<StateContainer> {
});
}
void completeOnBoarding() {
void completeGitHostSetup() {
setState(() async {
this.appState.remoteGitRepoConfigured = true;
this.appState.remoteGitRepoPath = "journal";