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

Settings: Rename internalRepoFolderName to folderName

Browse Source
This commit is contained in:
Vishesh Handa
2020-10-17 12:28:14 +02:00
parent bad1a03812
commit 81bd1322a6
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/app.dart
View File

@ -69,20 +69,14 @@ class JournalApp extends StatefulWidget {
await settings.migrate(pref, appState.gitBaseDirectory); await settings.migrate(pref, appState.gitBaseDirectory);
var gitRepoDir = var gitRepoDir = p.join(appState.gitBaseDirectory, settings.folderName);
p.join(appState.gitBaseDirectory, settings.internalRepoFolderName);
var repoDirStat = File(gitRepoDir).statSync(); var repoDirStat = File(gitRepoDir).statSync();
if (repoDirStat.type != FileSystemEntityType.directory) { if (repoDirStat.type != FileSystemEntityType.directory) {
settings.internalRepoFolderName = "journal"; settings.folderName = "journal";
var repoPath = p.join( Log.i("Calling GitInit at: $gitRepoDir");
appState.gitBaseDirectory, await GitRepository.init(gitRepoDir);
settings.internalRepoFolderName,
);
Log.i("Calling GitInit at: $repoPath");
await GitRepository.init(repoPath);
settings.save(); settings.save();
} else { } else {
@ -405,7 +399,7 @@ class _JournalAppState extends State<JournalApp> {
return SettingsScreen(); return SettingsScreen();
case '/setupRemoteGit': case '/setupRemoteGit':
return GitHostSetupScreen( return GitHostSetupScreen(
repoFolderName: settings.internalRepoFolderName, repoFolderName: settings.folderName,
remoteName: "origin", remoteName: "origin",
onCompletedFunction: stateContainer.completeGitHostSetup, onCompletedFunction: stateContainer.completeGitHostSetup,
); );

13
lib/settings.dart
View File

@ -59,7 +59,7 @@ class Settings extends ChangeNotifier {
bool bottomMenuBar = true; bool bottomMenuBar = true;
String internalRepoFolderName = "journal"; String folderName = "journal";
bool storeInternally = true; bool storeInternally = true;
String storageLocation = ""; String storageLocation = "";
@ -128,8 +128,7 @@ class Settings extends ChangeNotifier {
pref.getStringList("inlineTagPrefixes")?.toSet() ?? inlineTagPrefixes; pref.getStringList("inlineTagPrefixes")?.toSet() ?? inlineTagPrefixes;
// From AppState // From AppState
internalRepoFolderName = folderName = pref.getString("remoteGitRepoPath") ?? folderName;
pref.getString("remoteGitRepoPath") ?? internalRepoFolderName;
bottomMenuBar = pref.getBool("bottomMenuBar") ?? bottomMenuBar; bottomMenuBar = pref.getBool("bottomMenuBar") ?? bottomMenuBar;
storeInternally = pref.getBool("storeInternally") ?? storeInternally; storeInternally = pref.getBool("storeInternally") ?? storeInternally;
@ -216,7 +215,7 @@ class Settings extends ChangeNotifier {
pref.setInt("settingsVersion", version); pref.setInt("settingsVersion", version);
pref.setString("remoteGitRepoPath", internalRepoFolderName); pref.setString("remoteGitRepoPath", folderName);
notifyListeners(); notifyListeners();
} }
@ -294,7 +293,7 @@ class Settings extends ChangeNotifier {
'swipeToDelete': swipeToDelete.toString(), 'swipeToDelete': swipeToDelete.toString(),
'inlineTagPrefixes': inlineTagPrefixes.join(' '), 'inlineTagPrefixes': inlineTagPrefixes.join(' '),
'emojiParser': emojiParser.toString(), 'emojiParser': emojiParser.toString(),
'remoteGitRepoPath': internalRepoFolderName.toString(), 'folderName': folderName.toString(),
'bottomMenuBar': bottomMenuBar.toString(), 'bottomMenuBar': bottomMenuBar.toString(),
'storeInternally': storeInternally.toString(), 'storeInternally': storeInternally.toString(),
'storageLocation': storageLocation, 'storageLocation': storageLocation,
@ -325,11 +324,11 @@ class Settings extends ChangeNotifier {
var newName = p.join(gitBaseDir, "journal"); var newName = p.join(gitBaseDir, "journal");
await Directory(oldName).rename(newName); await Directory(oldName).rename(newName);
internalRepoFolderName = "journal"; folderName = "journal";
version = 1; version = 1;
pref.setInt("settingsVersion", version); pref.setInt("settingsVersion", version);
pref.setString('remoteGitRepoPath', internalRepoFolderName); pref.setString('remoteGitRepoPath', folderName);
return; return;
} }
} }

2
lib/setup/screens.dart
View File

@ -483,7 +483,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
var basePath = stateContainer.appState.gitBaseDirectory; var basePath = stateContainer.appState.gitBaseDirectory;
var settings = Provider.of<Settings>(context, listen: false); var settings = Provider.of<Settings>(context, listen: false);
var repoName = settings.internalRepoFolderName; var repoName = settings.folderName;
var repoPath = p.join(basePath, repoName); var repoPath = p.join(basePath, repoName);
Log.i("RepoPath: $repoPath"); Log.i("RepoPath: $repoPath");

4
lib/state_container.dart
View File

@ -43,7 +43,7 @@ class StateContainer with ChangeNotifier {
@required this.gitBaseDirectory, @required this.gitBaseDirectory,
@required this.cacheDirectory, @required this.cacheDirectory,
}) { }) {
var folderName = settings.internalRepoFolderName; var folderName = settings.folderName;
repoPath = settings.storeInternally repoPath = settings.storeInternally
? p.join(gitBaseDirectory, folderName) ? p.join(gitBaseDirectory, folderName)
: p.join(settings.storageLocation, folderName); : p.join(settings.storageLocation, folderName);
@ -358,7 +358,7 @@ class StateContainer with ChangeNotifier {
} }
Future<void> moveRepoToPath() async { Future<void> moveRepoToPath() async {
var folderName = settings.internalRepoFolderName; var folderName = settings.folderName;
var newRepoPath = settings.storeInternally var newRepoPath = settings.storeInternally
? p.join(gitBaseDirectory, folderName) ? p.join(gitBaseDirectory, folderName)
: p.join(settings.storageLocation, folderName); : p.join(settings.storageLocation, folderName);