Use binary icon format

Nobita270 · Jan 23, 2022 · a3dea3b · a3dea3b
1 parent 30a65d5
commit a3dea3b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/assets/icons/missing_icon_background.si b/assets/icons/missing_icon_background.si
diff --git a/assets/icons/missing_icon_foreground.si b/assets/icons/missing_icon_foreground.si
diff --git a/assets/icons/missing_icon_legacy.si b/assets/icons/missing_icon_legacy.si
diff --git a/lib/android/reader_apk.dart b/lib/android/reader_apk.dart
@@ -310,12 +310,12 @@ class ApkReader {
     if (inner != null) await inner;
     if (iconUpdThread != null) await iconUpdThread;
     if (data.legacyIcon)  data.execute(() async {if (GState.apkForegroundIcon.$ == null && GState.apkIcon.$ == null) {
-      final legacy = await ScalableImage.fromSvgAsset(rootBundle, "assets/icons/missing_icon_legacy.svg");
+      final legacy = await ScalableImage.fromSIAsset(rootBundle, "assets/icons/missing_icon_legacy.si");
       GState.apkIcon.update((p0) => (ScalableImageWidget(si: legacy)));
     }});
     else data.execute(() async {if (GState.apkForegroundIcon.$ == null && GState.apkIcon.$ == null) {
-      final fBackground = ScalableImage.fromAvdAsset(rootBundle, "assets/icons/missing_icon_background.xml");
-      final fForeground = ScalableImage.fromAvdAsset(rootBundle, "assets/icons/missing_icon_foreground.xml");
+      final fBackground = ScalableImage.fromSIAsset(rootBundle, "assets/icons/missing_icon_background.si");
+      final fForeground = ScalableImage.fromSIAsset(rootBundle, "assets/icons/missing_icon_foreground.si");
       final background = await fBackground;
       final foreground = await fForeground;
       GState.apkBackgroundIcon.update((p0) => (ScalableImageWidget(si: background)));

diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
@@ -74,12 +74,12 @@ class ScreenSettingsState extends State<ScreenSettings> {
   ScreenSettingsState({this.controller});
   final ScrollController? controller;
 
-  static late final _exBackground = _loadIcon("assets/icons/missing_icon_background.xml", true);
-  static late final _exForeground = _loadIcon("assets/icons/missing_icon_foreground.xml", true);
-  static late final _exLegacyIcon = _loadIcon("assets/icons/missing_icon_legacy.svg");
+  static late final _exBackground = _loadIcon("assets/icons/missing_icon_background.si");
+  static late final _exForeground = _loadIcon("assets/icons/missing_icon_foreground.si");
+  static late final _exLegacyIcon = _loadIcon("assets/icons/missing_icon_legacy.si");
 
-  static Future<ScalableImageWidget> _loadIcon(String asset, [bool isAvd = false]) async {
-    var scalable = isAvd ? ScalableImage.fromAvdAsset(rootBundle, asset) : ScalableImage.fromSvgAsset(rootBundle, asset);
+  static Future<ScalableImageWidget> _loadIcon(String asset) async {
+    var scalable = ScalableImage.fromSIAsset(rootBundle, asset);
     return ScalableImageWidget(si: await scalable);
   }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -46,9 +46,9 @@ flutter:
   generate: true
   uses-material-design: true
   assets:
-    - assets/icons/missing_icon_background.xml
-    - assets/icons/missing_icon_foreground.xml
-    - assets/icons/missing_icon_legacy.svg
+    - assets/icons/missing_icon_background.si
+    - assets/icons/missing_icon_foreground.si
+    - assets/icons/missing_icon_legacy.si
     - assets/images/logo.png
 
 flutter_native_splash: