From 5f27bc09ddbe5cb6c1192ab7132caeeb14295648 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 31 Jan 2021 00:54:13 +0800
Subject: [PATCH] optimize ui

---
 src/Mobile.vue                         |  4 +++
 src/views/mobile/transactions/List.vue | 47 +++++++++++++++-----------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/Mobile.vue b/src/Mobile.vue
index 75b59ee4..265e417b 100644
--- a/src/Mobile.vue
+++ b/src/Mobile.vue
@@ -238,6 +238,10 @@ i.icon.la, i.icon.las, i.icon.lab {
     color: rgba(255, 255, 255, 0.2);
 }
 
+.accordion-item.list-item-checked > .item-link > .item-content .item-title {
+    font-weight: bold;
+}
+
 .list .item-content .list-item-checked-icon {
     font-size: 20px;
     color: var(--f7-radio-active-color, var(--f7-theme-color));
diff --git a/src/views/mobile/transactions/List.vue b/src/views/mobile/transactions/List.vue
index 5f3dd978..dc75ad7c 100644
--- a/src/views/mobile/transactions/List.vue
+++ b/src/views/mobile/transactions/List.vue
@@ -282,10 +282,18 @@
                     <f7-icon slot="media" f7="rectangle_badge_checkmark"></f7-icon>
                     <f7-icon slot="after" class="list-item-checked-icon" f7="checkmark_alt" v-if="query.categoryId === '0'"></f7-icon>
                 </f7-list-item>
+            </f7-list>
+            <f7-list accordion-list
+                     class="no-margin-vertical"
+                     v-for="(categories, categoryType) in allPrimaryCategories"
+                     v-show="!query.type || parseInt(categoryType) === query.type - 1"
+                     :key="categoryType"
+            >
+                <f7-list-item divider :title="(parseInt(categoryType) + 1) | typeName('Type') | localized"></f7-list-item>
                 <f7-list-item accordion-item
-                              v-for="category in allPrimaryCategories"
-                              v-show="!query.type || category.type === query.type - 1"
+                              v-for="category in categories"
                               :key="category.id"
+                              :class="category | categoryListItemCheckedClass(query.categoryId)"
                               :title="category.name"
                 >
                     <f7-icon slot="media"
@@ -407,23 +415,7 @@ export default {
             return this.$store.state.allTransactionCategoriesMap;
         },
         allPrimaryCategories() {
-            const primaryCategories = [];
-
-            for (let categoryId in this.$store.state.allTransactionCategoriesMap) {
-                if (!Object.prototype.hasOwnProperty.call(this.$store.state.allTransactionCategoriesMap, categoryId)) {
-                    continue;
-                }
-
-                const category = this.$store.state.allTransactionCategoriesMap[categoryId];
-
-                if (category.parentId !== '0') {
-                    continue;
-                }
-
-                primaryCategories.push(category);
-            }
-
-            return primaryCategories;
+            return this.$store.state.allTransactionCategories;
         },
         allDateRanges() {
             return this.$constants.datetime.allDateRanges;
@@ -747,6 +739,23 @@ export default {
 
             return defaultName;
         },
+        categoryListItemCheckedClass(category, queryCategoryId) {
+            if (category.id === queryCategoryId) {
+                return {
+                    'list-item-checked': true
+                };
+            }
+
+            for (let i = 0; i < category.subCategories.length; i++) {
+                if (category.subCategories[i].id === queryCategoryId) {
+                    return {
+                        'list-item-checked': true
+                    };
+                }
+            }
+
+            return [];
+        },
         income(value, incomplete) {
             return '+' + value + (incomplete ? '+' : '');
         },