Rename Repository => GitJournalRepo

Repository is too vague of a word and it gets me confused with the Git
Repository. Also shorterned Repository to Repo. It's easier to read and
write.

lib/app.dart

@@ -61,7 +61,7 @@ class JournalApp extends StatefulWidget {
       child: Consumer<RepositoryManager>(
         builder: (_, repoManager, __) => ChangeNotifierProvider.value(
           value: repoManager.currentRepo,
-          child: Consumer<Repository>(
+          child: Consumer<GitJournalRepo>(
             builder: (_, repo, __) => ChangeNotifierProvider<Settings>.value(
               value: repo.settings,
               child: ChangeNotifierProvider<NotesFolderFS>.value(
@@ -280,7 +280,7 @@ class _JournalAppState extends State<JournalApp> {
 
   @override
   Widget build(BuildContext context) {
-    var stateContainer = Provider.of<Repository>(context);
+    var stateContainer = Provider.of<GitJournalRepo>(context);
     var settings = Provider.of<Settings>(context);
     var appSettings = Provider.of<AppSettings>(context);
     var router = AppRouter(settings: settings, appSettings: appSettings);

lib/app_router.dart

@@ -41,7 +41,7 @@ class AppRouter {
 
   Route<dynamic> generateRoute(
     RouteSettings routeSettings,
-    Repository repository,
+    GitJournalRepo repository,
     String sharedText,
     List<String> sharedImages,
     Function callbackIfUsedShared,
@@ -79,7 +79,7 @@ class AppRouter {
 
   Widget _screenForRoute(
     String route,
-    Repository repository,
+    GitJournalRepo repository,
     Settings settings,
     String sharedText,
     List<String> sharedImages,

lib/folder_views/common.dart

@@ -94,7 +94,7 @@ void openNoteEditor(
   if (showUndoSnackBar != null) {
     Log.d("Showing an undo snackbar");
 
-    var stateContainer = Provider.of<Repository>(context, listen: false);
+    var stateContainer = Provider.of<GitJournalRepo>(context, listen: false);
     var snackBar = buildUndoDeleteSnackbar(stateContainer, note);
     Scaffold.of(context)
       ..removeCurrentSnackBar()

lib/folder_views/list_view.dart

@@ -155,7 +155,8 @@ class _FolderListViewState extends State<FolderListView> {
         onDismissed: (direction) {
           deletedViaDismissed.add(note.filePath);
 
-          var stateContainer = Provider.of<Repository>(context, listen: false);
+          var stateContainer =
+              Provider.of<GitJournalRepo>(context, listen: false);
           stateContainer.removeNote(note);
 
           var snackBar = buildUndoDeleteSnackbar(stateContainer, note);

lib/repository.dart

@@ -33,7 +33,7 @@ enum SyncStatus {
   Error,
 }
 
-class Repository with ChangeNotifier {
+class GitJournalRepo with ChangeNotifier {
   final Settings settings;
 
   final _opLock = Lock();
@@ -60,7 +60,7 @@ class Repository with ChangeNotifier {
 
   bool remoteGitRepoConfigured = false;
 
-  static Future<Repository> load({
+  static Future<GitJournalRepo> load({
     @required String gitBaseDir,
     @required String cacheDir,
     @required SharedPreferences pref,
@@ -108,7 +108,7 @@ class Repository with ChangeNotifier {
       }
     }
 
-    return Repository._internal(
+    return GitJournalRepo._internal(
       repoPath: repoPath,
       gitBaseDirectory: gitBaseDir,
       cacheDir: cacheDir,
@@ -118,7 +118,7 @@ class Repository with ChangeNotifier {
     );
   }
 
-  Repository._internal({
+  GitJournalRepo._internal({
     @required this.id,
     @required this.repoPath,
     @required this.gitBaseDirectory,
@@ -492,7 +492,7 @@ Future<void> _copyDirectory(String source, String destination) async {
 /// Add a GitIgnore file if no file is present. This way we always at least have
 /// one commit. It makes doing a git pull and push easier
 Future<void> _addFileInRepo({
-  @required Repository repo,
+  @required GitJournalRepo repo,
   @required Settings settings,
 }) async {
   var repoPath = repo.repoPath;

lib/repository_manager.dart

@@ -32,7 +32,8 @@ class RepositoryManager with ChangeNotifier {
   List<String> repoIds;
   String currentId;
 
-  Repository _repo;
+  GitJournalRepo _repo;
+  RepositoryInfo _repoInfo;
 
   final String gitBaseDir;
   final String cacheDir;
@@ -46,9 +47,10 @@ class RepositoryManager with ChangeNotifier {
     // From the pref load all the RepositoryInfos
   }
 
-  Repository get currentRepo => _repo;
+  GitJournalRepo get currentRepo => _repo;
+  RepositoryInfo get currentRepoInfo => _repoInfo;
 
-  Future<Repository> buildActiveRepository() async {
+  Future<GitJournalRepo> buildActiveRepository() async {
     if (_repo != null) {
       return _repo;
     }
@@ -57,7 +59,7 @@ class RepositoryManager with ChangeNotifier {
     var repoCacheDir = p.join(cacheDir, currentId);
     await Directory(repoCacheDir).create(recursive: true);
 
-    _repo = await Repository.load(
+    _repo = await GitJournalRepo.load(
       gitBaseDir: gitBaseDir,
       cacheDir: repoCacheDir,
       pref: pref,
@@ -68,6 +70,11 @@ class RepositoryManager with ChangeNotifier {
     return _repo;
   }
 
+  Future<void> buildRepoInfoList() async {
+    // Add the latest folder, sort
+    // No need to do anything else
+  }
+
   // call notifyObservers();
   // --> After that what?
 

lib/screens/filesystem_screen.dart

@@ -74,7 +74,7 @@ class _FileSystemScreenState extends State<FileSystemScreen> {
       ),
     );
     if (newFileName is String) {
-      var container = Provider.of<Repository>(context, listen: false);
+      var container = Provider.of<GitJournalRepo>(context, listen: false);
       container.renameFile(oldPath, newFileName);
     }
   }

lib/screens/folder_listing.dart

@@ -86,7 +86,8 @@ class _FolderListingScreenState extends State<FolderListingScreen> {
               ),
             );
             if (folderName is String) {
-              var container = Provider.of<Repository>(context, listen: false);
+              var container =
+                  Provider.of<GitJournalRepo>(context, listen: false);
               container.renameFolder(selectedFolder, folderName);
             }
           } else if (value == "Create") {
@@ -95,7 +96,8 @@ class _FolderListingScreenState extends State<FolderListingScreen> {
               builder: (_) => CreateFolderAlertDialog(),
             );
             if (folderName is String) {
-              var container = Provider.of<Repository>(context, listen: false);
+              var container =
+                  Provider.of<GitJournalRepo>(context, listen: false);
               container.createFolder(selectedFolder, folderName);
             }
           } else if (value == "Delete") {
@@ -105,7 +107,8 @@ class _FolderListingScreenState extends State<FolderListingScreen> {
                 builder: (_) => DeleteFolderErrorDialog(),
               );
             } else {
-              var container = Provider.of<Repository>(context, listen: false);
+              var container =
+                  Provider.of<GitJournalRepo>(context, listen: false);
               container.removeFolder(selectedFolder);
             }
           }
@@ -153,7 +156,7 @@ class CreateFolderButton extends StatelessWidget {
           builder: (_) => CreateFolderAlertDialog(),
         );
         if (folderName is String) {
-          var container = Provider.of<Repository>(context, listen: false);
+          var container = Provider.of<GitJournalRepo>(context, listen: false);
           final notesFolder =
               Provider.of<NotesFolderFS>(context, listen: false);
 

lib/screens/folder_view.dart

@@ -160,7 +160,7 @@ class _FolderViewState extends State<FolderView> {
 
   void _syncRepo(BuildContext context) async {
     try {
-      var container = Provider.of<Repository>(context, listen: false);
+      var container = Provider.of<GitJournalRepo>(context, listen: false);
       await container.syncNotes();
     } on GitException catch (e) {
       showSnackbar(
@@ -234,7 +234,7 @@ class _FolderViewState extends State<FolderView> {
       var settings = Provider.of<Settings>(context, listen: false);
       config.saveToSettings(settings);
 
-      var container = Provider.of<Repository>(context, listen: false);
+      var container = Provider.of<GitJournalRepo>(context, listen: false);
       container.saveFolderConfig(sortedNotesFolder.config);
 
       setState(() {
@@ -259,7 +259,7 @@ class _FolderViewState extends State<FolderView> {
           var settings = Provider.of<Settings>(context, listen: false);
           config.saveToSettings(settings);
 
-          var container = Provider.of<Repository>(context, listen: false);
+          var container = Provider.of<GitJournalRepo>(context, listen: false);
           container.saveFolderConfig(sortedNotesFolder.config);
         };
 
@@ -275,7 +275,7 @@ class _FolderViewState extends State<FolderView> {
           var settings = Provider.of<Settings>(context, listen: false);
           config.saveToSettings(settings);
 
-          var container = Provider.of<Repository>(context, listen: false);
+          var container = Provider.of<GitJournalRepo>(context, listen: false);
           container.saveFolderConfig(sortedNotesFolder.config);
         };
 
@@ -407,13 +407,13 @@ class _FolderViewState extends State<FolderView> {
       var settings = Provider.of<Settings>(context, listen: false);
       config.saveToSettings(settings);
 
-      var container = Provider.of<Repository>(context, listen: false);
+      var container = Provider.of<GitJournalRepo>(context, listen: false);
       container.saveFolderConfig(widget.notesFolder.config);
     }
   }
 
   List<Widget> _buildNoteActions() {
-    final repo = Provider.of<Repository>(context);
+    final repo = Provider.of<GitJournalRepo>(context);
 
     var extraActions = PopupMenuButton<DropDownChoices>(
       key: const ValueKey("PopupMenu"),
@@ -494,7 +494,7 @@ class _FolderViewState extends State<FolderView> {
       );
     }
     if (shouldDelete == true) {
-      var stateContainer = Provider.of<Repository>(context, listen: false);
+      var stateContainer = Provider.of<GitJournalRepo>(context, listen: false);
       stateContainer.removeNote(note);
     }
 

lib/screens/note_editor.dart

@@ -283,7 +283,7 @@ class NoteEditorState extends State<NoteEditor> with WidgetsBindingObserver {
         });
         return;
       }
-      var container = Provider.of<Repository>(context, listen: false);
+      var container = Provider.of<GitJournalRepo>(context, listen: false);
       container.renameNote(note, fileName);
     }
   }
@@ -318,7 +318,7 @@ class NoteEditorState extends State<NoteEditor> with WidgetsBindingObserver {
       return;
     }
 
-    var stateContainer = Provider.of<Repository>(context, listen: false);
+    var stateContainer = Provider.of<GitJournalRepo>(context, listen: false);
     stateContainer.removeNote(note);
   }
 
@@ -353,7 +353,7 @@ class NoteEditorState extends State<NoteEditor> with WidgetsBindingObserver {
 
     Log.d("Note modified - saving");
     try {
-      var stateContainer = Provider.of<Repository>(context, listen: false);
+      var stateContainer = Provider.of<GitJournalRepo>(context, listen: false);
       _isNewNote
           ? await stateContainer.addNote(note)
           : await stateContainer.updateNote(note);
@@ -396,14 +396,15 @@ class NoteEditorState extends State<NoteEditor> with WidgetsBindingObserver {
         note.parent = destFolder;
         setState(() {});
       } else {
-        var stateContainer = Provider.of<Repository>(context, listen: false);
+        var stateContainer =
+            Provider.of<GitJournalRepo>(context, listen: false);
         stateContainer.moveNote(note, destFolder);
       }
     }
   }
 
   void _discardChangesSelected(Note note) async {
-    var stateContainer = Provider.of<Repository>(context, listen: false);
+    var stateContainer = Provider.of<GitJournalRepo>(context, listen: false);
     stateContainer.discardChanges(note);
 
     Navigator.pop(context);

lib/screens/settings_git_remote.dart

@@ -34,7 +34,7 @@ class _GitRemoteSettingsScreenState extends State<GitRemoteSettingsScreen> {
   Widget build(BuildContext context) {
     var textTheme = Theme.of(context).textTheme;
     var settings = Provider.of<Settings>(context);
-    var repo = Provider.of<Repository>(context);
+    var repo = Provider.of<GitJournalRepo>(context);
 
     if (remoteHost == null) {
       remoteHost = "";
@@ -186,7 +186,7 @@ class _GitRemoteSettingsScreenState extends State<GitRemoteSettingsScreen> {
       return;
     }
 
-    var repo = Provider.of<Repository>(context, listen: false);
+    var repo = Provider.of<GitJournalRepo>(context, listen: false);
     var gitDir = repo.gitBaseDirectory;
 
     // Figure out the next available folder

lib/screens/settings_screen.dart

@@ -68,7 +68,7 @@ class SettingsListState extends State<SettingsList> {
   Widget build(BuildContext context) {
     var settings = Provider.of<Settings>(context);
     var appSettings = Provider.of<AppSettings>(context);
-    final repo = Provider.of<Repository>(context);
+    final repo = Provider.of<GitJournalRepo>(context);
 
     var saveGitAuthor = (String gitAuthor) {
       settings.gitAuthor = gitAuthor;

lib/setup/screens.dart

@@ -421,7 +421,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
   }
 
   Future<void> _removeRemote() async {
-    var repo = Provider.of<Repository>(context, listen: false);
+    var repo = Provider.of<GitJournalRepo>(context, listen: false);
     var basePath = repo.gitBaseDirectory;
 
     var repoPath = p.join(basePath, widget.repoFolderName);
@@ -527,7 +527,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
       return;
     }
 
-    var repo = Provider.of<Repository>(context, listen: false);
+    var repo = Provider.of<GitJournalRepo>(context, listen: false);
     var basePath = repo.gitBaseDirectory;
 
     var settings = Provider.of<Settings>(context, listen: false);

lib/utils.dart

@@ -27,7 +27,8 @@ Future<String> getVersionString() async {
   return versionText;
 }
 
-SnackBar buildUndoDeleteSnackbar(Repository stateContainer, Note deletedNote) {
+SnackBar buildUndoDeleteSnackbar(
+    GitJournalRepo stateContainer, Note deletedNote) {
   return SnackBar(
     content: Text(tr('widgets.FolderView.noteDeleted')),
     action: SnackBarAction(

lib/widgets/app_drawer.dart

@@ -94,7 +94,7 @@ class _AppDrawerState extends State<AppDrawer>
   @override
   Widget build(BuildContext context) {
     Widget setupGitButton;
-    var repo = Provider.of<Repository>(context);
+    var repo = Provider.of<GitJournalRepo>(context);
     var appSettings = Provider.of<AppSettings>(context);
     var textStyle = Theme.of(context).textTheme.bodyText1;
     var currentRoute = ModalRoute.of(context).settings.name;

lib/widgets/app_drawer_header.dart

@@ -168,7 +168,7 @@ class __CurrentRepoState extends State<_CurrentRepo>
       return;
     }
 
-    var repo = context.watch<Repository>();
+    var repo = context.watch<GitJournalRepo>();
     var repoPath = await repo.settings.buildRepoPath(repo.gitBaseDirectory);
     _repoFolderName = p.basename(repoPath);