Merge branch 'release/1.0.4'

.vscode/launch.json

@@ -0,0 +1,46 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+  
+    {
+      "name": "yx_icon_fonts_flutter",
+      "request": "launch",
+      "type": "dart"
+    },
+    {
+      "name": "yx_icon_fonts_flutter (profile mode)",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "profile"
+    },
+    {
+      "name": "yx_icon_fonts_flutter (release mode)",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "release"
+    },
+    {
+      "name": "example",
+      "cwd": "example",
+      "request": "launch",
+      "type": "dart"
+    },
+    {
+      "name": "example (profile mode)",
+      "cwd": "example",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "profile"
+    },
+    {
+      "name": "example (release mode)",
+      "cwd": "example",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "release"
+    }
+  ]
+}

example/.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "8defaa71a77c16e8547abdbfad2053ce3a6e2d5b"
+  revision: "be698c48a6750c8cb8e61c740ca9991bb947aba2"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
+      create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
+      base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2
-    - platform: ios
+    - platform: android
-      create_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
+      create_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2
-      base_revision: 8defaa71a77c16e8547abdbfad2053ce3a6e2d5b
+      base_revision: be698c48a6750c8cb8e61c740ca9991bb947aba2
 
   # User provided section
 

example/android/.gitignore

@@ -0,0 +1,14 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+.cxx/
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks

example/android/app/build.gradle.kts

@@ -0,0 +1,44 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.example.yx_icon_fonts_example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.example.yx_icon_fonts_example"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}

example/android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>

example/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,45 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="yx_icon_fonts_example"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:taskAffinity=""
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+</manifest>

example/android/app/src/main/kotlin/com/example/yx_icon_fonts_example/MainActivity.kt

@@ -0,0 +1,5 @@
+package com.example.yx_icon_fonts_example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity : FlutterActivity()

example/android/app/src/main/res/drawable-v21/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

example/android/app/src/main/res/drawable/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

example/android/app/src/main/res/values-night/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

example/android/app/src/main/res/values/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

example/android/app/src/profile/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>

example/android/build.gradle.kts

@@ -0,0 +1,21 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

example/android/gradle.properties

@@ -0,0 +1,3 @@
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
+android.useAndroidX=true
+android.enableJetifier=true

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip

example/android/settings.gradle.kts

@@ -0,0 +1,25 @@
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.7.3" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+}
+
+include(":app")

example/lib/icons.dart

@@ -4,6 +4,23 @@ import 'package:yx_icon_fonts_example/example_icon.dart';
 // 此文件由脚本自动生成！
 
 final icons = <ExampleIcon>[
+  // 其他图标
+  ExampleIcon(YXIconFonts.iconVoicepause, 'icon voicepause'),
+  ExampleIcon(YXIconFonts.iconVoice, 'icon voice'),
+  ExampleIcon(YXIconFonts.Subtract, 'Subtract'),
+  ExampleIcon(YXIconFonts.icon24Search, 'icon 24 search'),
+  ExampleIcon(YXIconFonts.icon24Up, 'icon 24 up'),
+
+  // 编辑相关图标
+  ExampleIcon(YXIconFonts.icon44Edit, 'icon 44 edit'),
+  ExampleIcon(YXIconFonts.icon36Editline, 'icon 36 editline'),
+  ExampleIcon(YXIconFonts.icon24Edit, 'icon 24 edit'),
+
+  // 删除相关图标
+  ExampleIcon(YXIconFonts.icon44Delete, 'icon 44 delete'),
+  ExampleIcon(YXIconFonts.icon36Delete, 'icon 36 delete'),
+  ExampleIcon(YXIconFonts.icon24Delete, 'icon 24 delete'),
+
   // 个人中心相关图标
   ExampleIcon(YXIconFonts.icon44MeQuit, 'icon 44 me quit'),
   ExampleIcon(YXIconFonts.icon44MePassword, 'icon 44 me password'),
@@ -14,10 +31,6 @@ final icons = <ExampleIcon>[
   ExampleIcon(YXIconFonts.icon44MeSafe, 'icon 44 me safe'),
   ExampleIcon(YXIconFonts.icon44MePhone, 'icon 44 me phone'),
 
-  // 其他图标
-  ExampleIcon(YXIconFonts.icon24Search, 'icon 24 search'),
-  ExampleIcon(YXIconFonts.icon24Up, 'icon 24 up'),
-
   // 消息相关图标
   ExampleIcon(YXIconFonts.iconMsgContacts, 'icon msg contacts'),
   ExampleIcon(YXIconFonts.iconMsgViedo, 'icon msg viedo'),
@@ -37,11 +50,6 @@ final icons = <ExampleIcon>[
   ExampleIcon(YXIconFonts.icon24Arrowleft, 'icon 24 arrowleft'),
   ExampleIcon(YXIconFonts.icon24Arrowdown, 'icon 24 arrowdown'),
 
-  // 编辑相关图标
-  ExampleIcon(YXIconFonts.icon44Edit, 'icon 44 edit'),
-  ExampleIcon(YXIconFonts.icon36Editline, 'icon 36 editline'),
-  ExampleIcon(YXIconFonts.icon24Edit, 'icon 24 edit'),
-
   // 特殊字符图标
   ExampleIcon(YXIconFonts.icon24, 'icon 24 -'),
 
@@ -68,11 +76,6 @@ final icons = <ExampleIcon>[
   // 复制相关图标
   ExampleIcon(YXIconFonts.icon24Copy, 'icon 24 copy'),
 
-  // 删除相关图标
-  ExampleIcon(YXIconFonts.icon44Delete, 'icon 44 delete'),
-  ExampleIcon(YXIconFonts.icon36Delete, 'icon 36 delete'),
-  ExampleIcon(YXIconFonts.icon24Delete, 'icon 24 delete'),
-
   // 日历相关图标
   ExampleIcon(YXIconFonts.icon44Calendar, 'icon 44 calendar'),
 

example/pubspec.lock

@@ -206,7 +206,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.1"
+    version: "1.0.4"
 sdks:
   dart: ">=3.7.0-0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"

iconfont.json

@@ -5,6 +5,41 @@
   "css_prefix_text": "",
   "description": "学习官OA系统图标",
   "glyphs": [
+    {
+      "icon_id": "45492400",
+      "name": "icon_voicepause",
+      "font_class": "icon_voicepause",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "45492399",
+      "name": "icon_voice",
+      "font_class": "icon_voice",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "45263171",
+      "name": "Subtract",
+      "font_class": "Subtract",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "45214203",
+      "name": "icon_44_edit",
+      "font_class": "icon_44_edit",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "45214202",
+      "name": "icon_44_delete",
+      "font_class": "icon_44_delete",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
     {
       "icon_id": "45160662",
       "name": "icon_44_me_quit",
@@ -82,13 +117,6 @@
       "unicode": "e61d",
       "unicode_decimal": 58909
     },
-    {
-      "icon_id": "44625451",
-      "name": "icon_44_edit",
-      "font_class": "icon_44_edit",
-      "unicode": "e638",
-      "unicode_decimal": 58936
-    },
     {
       "icon_id": "44625452",
       "name": "icon_44_me_password",
@@ -194,13 +222,6 @@
       "unicode": "e62e",
       "unicode_decimal": 58926
     },
-    {
-      "icon_id": "44625449",
-      "name": "icon_44_delete",
-      "font_class": "icon_44_delete",
-      "unicode": "e62f",
-      "unicode_decimal": 58927
-    },
     {
       "icon_id": "44625444",
       "name": "icon_32_quit",

lib/src/yx_icon_fonts_data.dart

@@ -9,6 +9,31 @@ class YXIconFonts {
   // 私有构造函数，防止实例化
   YXIconFonts._();
 
+  /// icon_voicepause 图标
+  /// 
+  /// Unicode: e64b
+  static const IconData iconVoicepause = YXIconData(0xe64b);
+
+  /// icon_voice 图标
+  /// 
+  /// Unicode: e64c
+  static const IconData iconVoice = YXIconData(0xe64c);
+
+  /// Subtract 图标
+  /// 
+  /// Unicode: e64a
+  static const IconData Subtract = YXIconData(0xe64a);
+
+  /// icon_44_edit 图标
+  /// 
+  /// Unicode: e648
+  static const IconData icon44Edit = YXIconData(0xe648);
+
+  /// icon_44_delete 图标
+  /// 
+  /// Unicode: e649
+  static const IconData icon44Delete = YXIconData(0xe649);
+
   /// icon_44_me_quit 图标
   /// 
   /// Unicode: e647
@@ -64,11 +89,6 @@ class YXIconFonts {
   /// Unicode: e61d
   static const IconData icon32Arrowright = YXIconData(0xe61d);
 
-  /// icon_44_edit 图标
-  /// 
-  /// Unicode: e638
-  static const IconData icon44Edit = YXIconData(0xe638);
-
   /// icon_44_me_password 图标
   /// 
   /// Unicode: e639
@@ -144,11 +164,6 @@ class YXIconFonts {
   /// Unicode: e62e
   static const IconData icon24Copy = YXIconData(0xe62e);
 
-  /// icon_44_delete 图标
-  /// 
-  /// Unicode: e62f
-  static const IconData icon44Delete = YXIconData(0xe62f);
-
   /// icon_32_quit 图标
   /// 
   /// Unicode: e630

pubspec.yaml

@@ -1,7 +1,7 @@
 name: yx_icon_fonts
 description: 学习官OA系统图标字体库，基于iconfont.ttf和iconfont.json生成
-version: 1.0.2
+version: 1.0.4
-homepage: https://github.com/your-username/yx_icon_fonts
+homepage: https://gitea.23544.com/wangyang/yx_icon_fonts_flutter
 
 environment:
   sdk: '>=3.0.0 <4.0.0'