From 782205ef278eaf5cc7b9d513daaffeb59665182e Mon Sep 17 00:00:00 2001
From: Levi <liwei2633@gmail.com>
Date: Sat, 25 Jan 2025 11:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=B9=B3=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/flutter/android/app/build.gradle                  |  2 +-
 ui/flutter/android/app/src/debug/AndroidManifest.xml |  2 +-
 ui/flutter/android/app/src/main/AndroidManifest.xml  |  2 +-
 .../kotlin/com/gopeed/{ => gopeed}/MainActivity.kt   |  2 +-
 .../android/app/src/profile/AndroidManifest.xml      |  2 +-
 ui/flutter/ios/Runner.xcodeproj/project.pbxproj      | 12 ++++++------
 ui/flutter/ios/Runner/Runner.entitlements            |  2 +-
 .../ios/ShareExtension/ShareExtension.entitlements   |  2 +-
 ui/flutter/macos/Runner/Configs/AppInfo.xcconfig     |  2 +-
 ui/flutter/pubspec.lock                              |  8 ++++++++
 ui/flutter/pubspec.yaml                              |  1 +
 11 files changed, 23 insertions(+), 14 deletions(-)
 rename ui/flutter/android/app/src/main/kotlin/com/gopeed/{ => gopeed}/MainActivity.kt (98%)

diff --git a/ui/flutter/android/app/build.gradle b/ui/flutter/android/app/build.gradle
index cb45fcc1..3485fb7a 100644
--- a/ui/flutter/android/app/build.gradle
+++ b/ui/flutter/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.gopeed"
+        applicationId "com.gopeed.gopeed"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion 21
diff --git a/ui/flutter/android/app/src/debug/AndroidManifest.xml b/ui/flutter/android/app/src/debug/AndroidManifest.xml
index 21e7544e..f18c9b7b 100644
--- a/ui/flutter/android/app/src/debug/AndroidManifest.xml
+++ b/ui/flutter/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gopeed">
+    package="com.gopeed.gopeed">
     <!-- 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.
diff --git a/ui/flutter/android/app/src/main/AndroidManifest.xml b/ui/flutter/android/app/src/main/AndroidManifest.xml
index 0485d35c..471b53c2 100644
--- a/ui/flutter/android/app/src/main/AndroidManifest.xml
+++ b/ui/flutter/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gopeed">
+    package="com.gopeed.gopeed">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
diff --git a/ui/flutter/android/app/src/main/kotlin/com/gopeed/MainActivity.kt b/ui/flutter/android/app/src/main/kotlin/com/gopeed/gopeed/MainActivity.kt
similarity index 98%
rename from ui/flutter/android/app/src/main/kotlin/com/gopeed/MainActivity.kt
rename to ui/flutter/android/app/src/main/kotlin/com/gopeed/gopeed/MainActivity.kt
index c3a78dc4..51a5eb01 100644
--- a/ui/flutter/android/app/src/main/kotlin/com/gopeed/MainActivity.kt
+++ b/ui/flutter/android/app/src/main/kotlin/com/gopeed/gopeed/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.gopeed
+package com.gopeed.gopeed
 
 import androidx.annotation.NonNull
 import com.gopeed.libgopeed.Libgopeed
diff --git a/ui/flutter/android/app/src/profile/AndroidManifest.xml b/ui/flutter/android/app/src/profile/AndroidManifest.xml
index 21e7544e..f18c9b7b 100644
--- a/ui/flutter/android/app/src/profile/AndroidManifest.xml
+++ b/ui/flutter/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gopeed">
+    package="com.gopeed.gopeed">
     <!-- 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.
diff --git a/ui/flutter/ios/Runner.xcodeproj/project.pbxproj b/ui/flutter/ios/Runner.xcodeproj/project.pbxproj
index 029b5307..dcced8b4 100644
--- a/ui/flutter/ios/Runner.xcodeproj/project.pbxproj
+++ b/ui/flutter/ios/Runner.xcodeproj/project.pbxproj
@@ -452,7 +452,7 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.ShareExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.gopeed.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
@@ -492,7 +492,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.ShareExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.gopeed.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -530,7 +530,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.ShareExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.gopeed.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -605,7 +605,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.gopeed;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -736,7 +736,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.gopeed;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -761,7 +761,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.gopeed;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/ui/flutter/ios/Runner/Runner.entitlements b/ui/flutter/ios/Runner/Runner.entitlements
index 4bfa1c5d..f8bb8d49 100644
--- a/ui/flutter/ios/Runner/Runner.entitlements
+++ b/ui/flutter/ios/Runner/Runner.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.gopeed</string>
+		<string>group.com.gopeed.gopeed</string>
 	</array>
 </dict>
 </plist>
diff --git a/ui/flutter/ios/ShareExtension/ShareExtension.entitlements b/ui/flutter/ios/ShareExtension/ShareExtension.entitlements
index 4bfa1c5d..f8bb8d49 100644
--- a/ui/flutter/ios/ShareExtension/ShareExtension.entitlements
+++ b/ui/flutter/ios/ShareExtension/ShareExtension.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.gopeed</string>
+		<string>group.com.gopeed.gopeed</string>
 	</array>
 </dict>
 </plist>
diff --git a/ui/flutter/macos/Runner/Configs/AppInfo.xcconfig b/ui/flutter/macos/Runner/Configs/AppInfo.xcconfig
index ff2af82a..ca1418e4 100644
--- a/ui/flutter/macos/Runner/Configs/AppInfo.xcconfig
+++ b/ui/flutter/macos/Runner/Configs/AppInfo.xcconfig
@@ -8,7 +8,7 @@
 PRODUCT_NAME = Gopeed
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.gopeed
+PRODUCT_BUNDLE_IDENTIFIER = com.gopeed.gopeed
 
 // The copyright displayed in application information
 PRODUCT_COPYRIGHT = Copyright © 2022 com.example. All rights reserved.
diff --git a/ui/flutter/pubspec.lock b/ui/flutter/pubspec.lock
index d4c99b74..be2d77da 100644
--- a/ui/flutter/pubspec.lock
+++ b/ui/flutter/pubspec.lock
@@ -174,6 +174,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.9.2"
+  change_app_package_name:
+    dependency: "direct dev"
+    description:
+      name: change_app_package_name
+      sha256: "1d6ca5fbaba7264f70857941543337b2efe48f19ae2eef29b89927541b52a787"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   characters:
     dependency: transitive
     description:
diff --git a/ui/flutter/pubspec.yaml b/ui/flutter/pubspec.yaml
index 6c40985d..eee506f5 100644
--- a/ui/flutter/pubspec.yaml
+++ b/ui/flutter/pubspec.yaml
@@ -93,6 +93,7 @@ dev_dependencies:
   build_runner: ^2.2.1
   json_serializable: ^6.3.2
   flutter_launcher_icons: ^0.13.1
+  change_app_package_name: ^1.4.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec