[native] enh: Remember sort option & sort folders first

fixes #1346

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

src/ui/store/definitions.js

@@ -36,6 +36,7 @@ export const actions = {
   REQUEST_NETWORK_PERMISSIONS: 'REQUEST_NETWORK_PERMISSIONS',
   COUNT_BOOKMARK_CLICK: 'COUNT_BOOKMARK_CLICK',
   REQUEST_HISTORY_PERMISSIONS: 'REQUEST_HISTORY_PERMISSIONS',
+  SET_SORTBY: 'SET_SORTBY',
 }
 
 export const mutations = {

src/ui/store/native/actions.js

@@ -265,5 +265,9 @@ export const actionsDefinition = {
   },
   async [actions.STOP_LOGIN_FLOW]({commit}) {
     commit(mutations.SET_LOGIN_FLOW_STATE, false)
+  },
+  async [actions.SET_SORTBY]({state}, {accountId, sortBy}) {
+    const account = await Account.get(accountId)
+    await account.setData({...account.getData(), sortBy})
   }
 }

src/ui/views/native/Tree.vue

@@ -392,10 +392,10 @@ export default {
             if (item.url) {
               return new URL(item.url).hostname
             } else {
-              return '0' // folders to the top
+              return '0000000' // folders to the top
             }
           }
-          return item[this.sortBy].toLowerCase()
+          return item.type === 'folder' ? '0000000' : item[this.sortBy].toLowerCase()
         }])
       } else {
         return items
@@ -421,6 +421,7 @@ export default {
   watch: {
     async $route() {
       await this.$store.dispatch(actions.LOAD_TREE, this.$route.params.accountId)
+      this.sortBy = this.$store.state.accounts[this.id].data.sortBy || 'index'
     },
     async syncing(current, previous) {
       if (!current && previous) {
@@ -433,9 +434,13 @@ export default {
         await this.$store.dispatch(actions.LOAD_TREE, this.$route.params.accountId)
       }
     },
+    async sortBy(current) {
+      await this.$store.dispatch(actions.SET_SORTBY, {accountId: this.$route.params.accountId, sortBy: current})
+    }
   },
   mounted() {
     this.$store.dispatch(actions.LOAD_TREE, this.$route.params.accountId)
+    this.sortBy = this.$store.state.accounts[this.id].data.sortBy || 'index'
     App.addListener('resume', () => this.$store.dispatch(actions.LOAD_TREE_FROM_DISK, this.$route.params.accountId))
   },
   backButton() {