Merge pull request cypherstack#543 from cypherstack/add-ecash

Add ecash and themes upgrade
fossephate · May 20, 2023 · 818cb56 · 818cb56
2 parents 43b4ffb + 69a850b
commit 818cb56
Show file tree

Hide file tree

Showing 46 changed files with 9,677 additions and 2,015 deletions.
diff --git a/assets/default_themes/dark.zip b/assets/default_themes/dark.zip
diff --git a/assets/default_themes/light.zip b/assets/default_themes/light.zip
diff --git a/assets/svg/anonymize.svg b/assets/svg/anonymize.svg
diff --git a/lib/main.dart b/lib/main.dart
@@ -188,33 +188,8 @@ void main() async {
   await MainDB.instance.initMainDB();
   ThemeService.instance.init(MainDB.instance);
 
-  // install default themes
-  if (!(await ThemeService.instance.verifyInstalled(themeId: "light"))) {
-    Logging.instance.log(
-      "Installing default light theme...",
-      level: LogLevel.Info,
-    );
-    final lightZip = await rootBundle.load("assets/default_themes/light.zip");
-    await ThemeService.instance
-        .install(themeArchiveData: lightZip.buffer.asUint8List());
-    Logging.instance.log(
-      "Installing default light theme... finished",
-      level: LogLevel.Info,
-    );
-  }
-  if (!(await ThemeService.instance.verifyInstalled(themeId: "dark"))) {
-    Logging.instance.log(
-      "Installing default dark theme... ",
-      level: LogLevel.Info,
-    );
-    final darkZip = await rootBundle.load("assets/default_themes/dark.zip");
-    await ThemeService.instance
-        .install(themeArchiveData: darkZip.buffer.asUint8List());
-    Logging.instance.log(
-      "Installing default dark theme... finished",
-      level: LogLevel.Info,
-    );
-  }
+  // check and update or install default themes
+  await ThemeService.instance.checkDefaultThemesOnStartup();
 
   runApp(const ProviderScope(child: MyApp()));
 }