Merge pull request #384 from whyboris/minor-fixes

remember scroll offset when returning to root in folder view

Author: whyboris

.gitignore

@@ -1,46 +1,14 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+/node_modules
 
-# compiled output
 /dist
 /release
 /tmp
 /out-tsc
 /app-builds
-main.js
-main-extract.js
-main-filenames.js
-main-globals.js
-main-rescan.js
-main-support.js
-utility.js
-src/**/*.js
-*.js.map
-
-# TS to JS
-/interfaces/*.js
-
-# dependencies
-/node_modules
-
-# IDEs and editors
-/.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
 
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-npm-debug.log
+*.js
+*.js.map
+*.log
 
-# System Files
 .DS_Store
 Thumbs.db

.vscode/extensions.json

@@ -1,9 +1,8 @@
 {
   "recommendations": [
-    "angular.ng-template",
+    "Angular.ng-template",
     "coenraads.bracket-pair-colorizer",
     "editorconfig.editorconfig",
     "ms-vscode.vscode-typescript-tslint-plugin",
-    "shinnn.stylelint",
   ]
 }

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
   "files.exclude": {
     "*.js": true,
+    "**/*.js": true,
     "**/dist": true,
     "**/node_modules": true,
     "**/release": true,

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Boris
+Copyright (c) 2020 Boris
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.br.md

@@ -36,10 +36,10 @@ As principais dependências utilizadas:
 
 | Library     | Version | Date        | Comment |
 | -------     | ------- | ----        | ------- |
-| Angular     | v8.2.3  | August 2019 |         |
-| Angular-CLI | v8.2.3  | August 2019 |         |
-| Electron    | v6.0.6  | August 2019 | (internally uses Node v12.4.0 and Chromium 76) |
-| Electron Builder | v21.2.0 | August 2019 |     |
+| Angular     | v9.0.1  | February 2020 |         |
+| Angular-CLI | v9.0.2  | February 2020 |         |
+| Electron    | v8.0.1  | February 2020 | (internally uses Node v12.13.0 and Chromium 80) |
+| Electron Builder | v22.3.2 | February 2020 |     |
 
 O programa funcionar com as últimas versões do Node e NPM (Junho de 2019). Note que você vai precisar instalar o [Angular CLI](https://cli.angular.io) para rodar o projeto (`npm install -g @angular/cli`).
 

electron-builder.json

@@ -1,23 +1,18 @@
 {
   "productName": "Video Hub App 2",
   "appId": "com.videohubapp.videohubapp2",
-  "copyright": "Copyright © 2019 Boris Yakubchik",
+  "copyright": "Copyright © 2020 Boris Yakubchik",
   "directories": {
     "output": "release/"
   },
   "files": [
     "**/*",
     "!**/*.ts",
-    "!*.code-workspace",
     "!LICENSE.md",
     "!package.json",
     "!package-lock.json",
     "!src/",
-    "!e2e/",
-    "!hooks/",
     "!angular.json",
-    "!_config.yml",
-    "!karma.conf.js",
     "!tsconfig.json",
     "!tslint.json"
   ],

src/app/common/colors.ts

@@ -1,15 +1,15 @@
 export enum Colors {
   autoFileTags =       '#a8bffb',
   autoFolderTags =     '#fec02f',
-  manualTags =         '#63ff61',
+  manualTags =         '#f1ceb8', // same as `manual-tag-color` (see variables.scss)
   // don't alphabetize below
   // this is the order in which filters appear
   folderUnion =        '#FFD672',
   folderIntersection = '#ffe5a5',
-  fileUnion =          '#6e96ff',
+  fileUnion =          '#97b3fc', // like `fileIntersection` but darker
   fileIntersection =   '#b1c6fd',
   exclude =            '#FF8888',
-  tagUnion =           '#6e96ff',
-  tagIntersection =    '#b1c6fd',
+  tagUnion =           '#ecbb9d', // like `tagIntersection` but darker
+  tagIntersection =    '#f1ceb8', // same as `manual-tag-color` (see variables.scss)
   tagExclusion =       '#FF8888',
 }

src/app/components/home.component.html

@@ -648,7 +648,7 @@
       class="breadcrumbs"
       @breadcrumbsAppear
     >
-      <app-icon class="breadcrumb-folder-icon" [icon]="'icon-folder-blank'" (click)="folderViewNavigationPath = ''"></app-icon>
+      <app-icon class="breadcrumb-folder-icon" [icon]="'icon-folder-blank'" (click)="breadcrumbHomeIconClick()"></app-icon>
       <span
         *ngFor="let item of folderViewNavigationPath.split('/'); index as idx"
         (click)="handleBbreadcrumbClicked(idx)"

src/app/components/home.component.ts

@@ -288,6 +288,9 @@ export class HomeComponent implements OnInit, AfterViewInit {
 
   deletePipeHack: boolean = false; // to force deletePipe to update
 
+  // crappy hack to remember where to navigate to when in folder view and returning back to root
+  folderNavigationScrollOffset: number = 0;
+
   // ========================================================================
   // Please add new variables below if they don't fit into any other section
   // ------------------------------------------------------------------------
@@ -1081,12 +1084,17 @@ export class HomeComponent implements OnInit, AfterViewInit {
   }
 
   /**
-   * Handle clicking on FOLDER in gallery, or the folder icon in breadcrumbs
+   * Handle clicking on FOLDER in gallery, or the folder icon in breadcrumbs, or the `UP` folder
    * @param filter
    */
   handleFolderIconClicked(filter: string): void {
+    if (this.folderNavigationScrollOffset === 0) {
+      this.folderNavigationScrollOffset = this.virtualScroller.viewPortInfo.scrollStartPosition;
+    }
+
     this.folderViewNavigationPath = filter;
-    this.scrollToTop();
+
+    this.scrollAppropriately(filter);
   }
 
   /**
@@ -1098,6 +1106,31 @@ export class HomeComponent implements OnInit, AfterViewInit {
     this.scrollToTop();
   }
 
+  /**
+   * Scroll appropriately after navigating back to root folder
+   *
+   * Rather hacky thing, but works in the basic case
+   * Fails if user enters folder, changes some search or sort filter, and navigates back
+   */
+  scrollAppropriately(filter: string) {
+    if (filter === '') {
+      // TODO -- change `1` to `0` once the bug is fixed:
+      // https://github.com/rintoj/ngx-virtual-scroller/issues/420
+      this.virtualScroller.scrollToPosition(this.folderNavigationScrollOffset, 1);
+      this.folderNavigationScrollOffset = 0;
+    } else {
+      this.scrollToTop();
+    }
+  }
+
+  /**
+   * Go back to root and scroll to last-seen location
+   */
+  breadcrumbHomeIconClick(): void {
+    this.folderViewNavigationPath = '';
+    this.scrollAppropriately('');
+  }
+
   /**
    * Open folder that contains the (current) clicked file
    */