refactor: v3.0.0

.github/workflows/master.yml → .github/workflows/main.yml

@@ -2,9 +2,9 @@ name: build
 
 on:
   push:
-    branches: [ master, f-ci-action ]
+    branches: [ main, f-ci-action ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -25,8 +25,9 @@ jobs:
           channel: 'stable'
       - run: dart --version
       - run: flutter --version
-      - name: build flutter_des_example
+      - name: build flutter_des
         working-directory: example
         run: |
           flutter build apk --target-platform android-arm64
           flutter build ios --release --no-codesign
+          flutter build macos --release

.github/workflows/publish.yaml

@@ -0,0 +1,14 @@
+name: Publish to pub.dev
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+
+jobs:
+  publish:
+    permissions:
+      id-token: write # Required for authentication using OIDC
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
+    # with:
+    #   working-directory: path/to/package/within/repository

.gitignore

@@ -1,13 +1,29 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
 .DS_Store
-.dart_tool/
-
-.packages
-.pub/
-
-build/
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
 *.ipr
 *.iws
-.idea/
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+build/

.metadata

@@ -4,7 +4,33 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 8661d8aecd626f7f57ccbcb735553edc05a2e713
-  channel: stable
+  revision: "dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668"
+  channel: "stable"
 
 project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+      base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+    - platform: android
+      create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+      base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+    - platform: ios
+      create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+      base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+    - platform: macos
+      create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+      base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.0
+
+* refactor code
+
 ## 2.3.0
 
 * Upgrade Flutter 3.24

README.md

@@ -4,7 +4,7 @@
 
 # flutter_des
 
-Java, android, ios, get the same result by DES encryption and decryption.
+Java, Android, iOS, macOS, get the same result by DES encryption and decryption.
 
 <div >
   <p>
@@ -36,7 +36,7 @@ dependencies:
 import 'package:flutter_des/flutter_des.dart';
 
 void example() async {
-  const string = "Java, android, ios, get the same result by DES encryption and decryption.";
+  const string = "Java, Android, iOS, macOS, get the same result by DES encryption and decryption.";
   const key = "u1BvOHzUOcklgNpn1MaWvdn9DT4LyzSX";
   const iv = "12345678";
 

analysis_options.yaml

@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

android/.gitignore

@@ -6,3 +6,4 @@
 .DS_Store
 /build
 /captures
+.cxx

android/build.gradle

@@ -1,5 +1,5 @@
-group 'octmon.flutter_des'
-version '1.0'
+group = "com.octmon.flutter_des"
+version = "1.0"
 
 buildscript {
     repositories {
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath("com.android.tools.build:gradle:8.1.0")
     }
 }
 
@@ -19,25 +19,36 @@ rootProject.allprojects {
     }
 }
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
 
 android {
-    namespace = "octmon.flutter_des"
-    compileSdkVersion 30
+    if (project.android.hasProperty("namespace")) {
+        namespace = "com.octmon.flutter_des"
+    }
+
+    compileSdk = 34
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdk = 21
+    }
+
+    dependencies {
+        testImplementation("junit:junit:4.13.2")
+        testImplementation("org.mockito:mockito-core:5.0.0")
     }
-}
 
-configurations.all {
-    resolutionStrategy {
-        force 'androidx.core:core:1.6.0'
-        force 'androidx.core:core-ktx:1.6.0'
+    testOptions {
+        unitTests.all {
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
     }
 }

android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="octmon.flutter_des">
+  package="com.octmon.flutter_des">
 </manifest>

android/src/main/java/octmon/flutter_des/FlutterDesPlugin.java → android/src/main/java/com/octmon/flutter_des/FlutterDesPlugin.java

@@ -1,4 +1,4 @@
-package octmon.flutter_des;
+package com.octmon.flutter_des;
 
 import androidx.annotation.NonNull;
 
@@ -76,7 +76,7 @@ private static String decryptFromHex(String encryptHexStr, String secretKey, Str
     if(encryptHexStr == null || iv == null)
       return null;
     try {
-        return decrypt(hex2byte(encryptHexStr.getBytes()), secretKey, iv);
+      return decrypt(hex2byte(encryptHexStr.getBytes()), secretKey, iv);
     } catch (Exception e){
       e.printStackTrace();
       return "";

android/src/test/java/com/octmon/flutter_des/FlutterDesPluginTest.java

@@ -0,0 +1,29 @@
+package com.octmon.flutter_des;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import org.junit.Test;
+
+/**
+ * This demonstrates a simple unit test of the Java portion of this plugin's implementation.
+ *
+ * Once you have built the plugin's example app, you can run these tests from the command
+ * line by running `./gradlew testDebugUnitTest` in the `example/android/` directory, or
+ * you can run them directly from IDEs that support JUnit such as Android Studio.
+ */
+
+public class FlutterDesPluginTest {
+  @Test
+  public void onMethodCall_getPlatformVersion_returnsExpectedValue() {
+    FlutterDesPlugin plugin = new FlutterDesPlugin();
+
+    final MethodCall call = new MethodCall("getPlatformVersion", null);
+    MethodChannel.Result mockResult = mock(MethodChannel.Result.class);
+    plugin.onMethodCall(call, mockResult);
+
+    verify(mockResult).success("Android " + android.os.Build.VERSION.RELEASE);
+  }
+}

example/README.md

@@ -8,9 +8,9 @@ This project is a starting point for a Flutter application.
 
 A few resources to get you started if this is your first Flutter project:
 
-- [Lab: Write your first Flutter app](https://flutter.io/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.io/docs/cookbook)
+- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
 
-For help getting started with Flutter, view our 
-[online documentation](https://flutter.io/docs), which offers tutorials, 
+For help getting started with Flutter development, view the
+[online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.

example/android/app/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "octmon.example"
+    namespace = "com.octmon.flutter_des_example"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "octmon.example"
+        applicationId = "com.octmon.flutter_des_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

example/android/app/src/main/java/com/octmon/flutter_des_example/MainActivity.java

@@ -0,0 +1,6 @@
+package com.octmon.flutter_des_example;
+
+import io.flutter.embedding.android.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
+}

example/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
+</adaptive-icon>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#ffffff</color>
+</resources>