From 6fe2a6541c1d623813a2f3eb1767562b7c62e65f Mon Sep 17 00:00:00 2001
From: Rongjian Zhang <pd4d10@gmail.com>
Date: Sun, 14 Feb 2021 10:27:34 +0800
Subject: [PATCH] refactor: add prefix to distinguish int value

---
 lib/models/auth.dart  | 7 ++++---
 lib/models/theme.dart | 4 ++--
 lib/utils/utils.dart  | 4 ++--
 pubspec.lock          | 2 +-
 pubspec.yaml          | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/models/auth.dart b/lib/models/auth.dart
index a8c2fd7..1db9318 100644
--- a/lib/models/auth.dart
+++ b/lib/models/auth.dart
@@ -631,12 +631,13 @@ class AuthModel with ChangeNotifier {
       _accounts = (json.decode(str ?? '[]') as List)
           .map((item) => Account.fromJson(item))
           .toList();
-      activeAccountIndex = prefs.getInt(StorageKeys.defaultAccount);
+      activeAccountIndex = prefs.getInt(StorageKeys.iDefaultAccount);
 
-      if (activeAccount != null)
+      if (activeAccount != null) {
         _activeTab = prefs.getInt(
                 StorageKeys.getDefaultStartTabKey(activeAccount.platform)) ??
             0;
+      }
     } catch (err) {
       Fimber.e('prefs getAccount failed', ex: err);
       _accounts = [];
@@ -653,7 +654,7 @@ class AuthModel with ChangeNotifier {
 
   Future<void> setDefaultAccount(int v) async {
     final prefs = await SharedPreferences.getInstance();
-    await prefs.setInt(StorageKeys.defaultAccount, v);
+    await prefs.setInt(StorageKeys.iDefaultAccount, v);
     Fimber.d('write default account: $v');
     notifyListeners();
   }
diff --git a/lib/models/theme.dart b/lib/models/theme.dart
index f67f3ad..62ca5e0 100644
--- a/lib/models/theme.dart
+++ b/lib/models/theme.dart
@@ -175,7 +175,7 @@ class ThemeModel with ChangeNotifier {
   Future<void> setMarkdown(int v) async {
     _markdown = v;
     final prefs = await SharedPreferences.getInstance();
-    await prefs.setInt(StorageKeys.markdown, v);
+    await prefs.setInt(StorageKeys.iMarkdown, v);
     Fimber.d('write markdown engine: $v');
     notifyListeners();
   }
@@ -245,7 +245,7 @@ class ThemeModel with ChangeNotifier {
     if (AppBrightnessType.values.contains(b)) {
       _brightnessValue = b;
     }
-    final m = prefs.getInt(StorageKeys.markdown);
+    final m = prefs.getInt(StorageKeys.iMarkdown);
     if (AppMarkdownType.values.contains(m)) {
       _markdown = m;
     }
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index f07c67b..ebf2177 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -26,9 +26,9 @@ class StorageKeys {
   static const codeThemeDark = 'code-theme-dark';
   static const iCodeFontSize = 'code-font-size';
   static const codeFontFamily = 'code-font-family';
-  static const markdown = 'markdown';
+  static const iMarkdown = 'markdown';
+  static const iDefaultAccount = 'default-account';
   static const locale = 'locale';
-  static const defaultAccount = 'default-account';
 
   static getDefaultStartTabKey(String platform) =>
       'default-start-tab-$platform';
diff --git a/pubspec.lock b/pubspec.lock
index 28f85ec..a2801ff 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -323,7 +323,7 @@ packages:
       name: flutter_vector_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1"
+    version: "0.3.0"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index 2dd7203..940fb79 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -26,7 +26,7 @@ dependencies:
   flutter_highlight: ^0.6.0
   flutter_markdown: ^0.4.4
   flutter_svg: ^0.19.0
-  flutter_vector_icons: ^0.2.1
+  flutter_vector_icons: ^0.3.0
   github: ^7.0.4
   github_trending: ^1.0.0
   gql_http_link: ^0.3.2