From 0a24c86682204c2dd8fdf4c823d243bc586815bd Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Fri, 30 Aug 2024 02:01:08 +0800 Subject: [PATCH] :truck: Update package name & label --- ios/Runner.xcodeproj/project.pbxproj | 16 +++--- lib/widgets/player/bottom_player.dart | 74 +++++++++++++------------- macos/Runner.xcodeproj/project.pbxproj | 10 ++-- macos/Runner/Configs/AppInfo.xcconfig | 4 +- windows/runner/Runner.rc | 4 +- 5 files changed, 57 insertions(+), 51 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 33a5f5c..684734b 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -161,7 +161,6 @@ 1CF40EE9C145DC3FDC6C41BF /* Pods-RunnerTests.release.xcconfig */, DAFDCBCA918FE99EC399DF6B /* Pods-RunnerTests.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -474,11 +473,12 @@ DEVELOPMENT_TEAM = W7HPZ53V6B; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = RhythmBox; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -495,7 +495,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -513,7 +513,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -529,7 +529,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -657,11 +657,12 @@ DEVELOPMENT_TEAM = W7HPZ53V6B; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = RhythmBox; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -680,11 +681,12 @@ DEVELOPMENT_TEAM = W7HPZ53V6B; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = RhythmBox; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/lib/widgets/player/bottom_player.dart b/lib/widgets/player/bottom_player.dart index 4a99f01..4f74e56 100644 --- a/lib/widgets/player/bottom_player.dart +++ b/lib/widgets/player/bottom_player.dart @@ -94,43 +94,45 @@ class _BottomPlayerState extends State @override Widget build(BuildContext context) { - final controls = Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MediaQuery.of(context).size.width >= 720 - ? MainAxisAlignment.center - : MainAxisAlignment.end, - children: [ - if (MediaQuery.of(context).size.width >= 720) - IconButton( - icon: const Icon(Icons.skip_previous), - onPressed: - _isFetchingActiveTrack ? null : audioPlayer.skipToPrevious, - ) - else - IconButton( - icon: const Icon(Icons.skip_next), - onPressed: _isFetchingActiveTrack ? null : audioPlayer.skipToNext, - ), - IconButton.filled( - icon: _isFetchingActiveTrack - ? const SizedBox( - height: 20, - width: 20, - child: CircularProgressIndicator( - strokeWidth: 3, + final controls = Obx( + () => Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MediaQuery.of(context).size.width >= 720 + ? MainAxisAlignment.center + : MainAxisAlignment.end, + children: [ + if (MediaQuery.of(context).size.width >= 720) + IconButton( + icon: const Icon(Icons.skip_previous), + onPressed: + _isFetchingActiveTrack ? null : audioPlayer.skipToPrevious, + ) + else + IconButton( + icon: const Icon(Icons.skip_next), + onPressed: _isFetchingActiveTrack ? null : audioPlayer.skipToNext, + ), + IconButton.filled( + icon: _isFetchingActiveTrack + ? const SizedBox( + height: 20, + width: 20, + child: CircularProgressIndicator( + strokeWidth: 3, + ), + ) + : Icon( + !_isPlaying ? Icons.play_arrow : Icons.pause, ), - ) - : Icon( - !_isPlaying ? Icons.play_arrow : Icons.pause, - ), - onPressed: _isFetchingActiveTrack ? null : _togglePlayState, - ), - if (MediaQuery.of(context).size.width >= 720) - IconButton( - icon: const Icon(Icons.skip_next), - onPressed: _isFetchingActiveTrack ? null : audioPlayer.skipToNext, - ) - ], + onPressed: _isFetchingActiveTrack ? null : _togglePlayState, + ), + if (MediaQuery.of(context).size.width >= 720) + IconButton( + icon: const Icon(Icons.skip_next), + onPressed: _isFetchingActiveTrack ? null : audioPlayer.skipToNext, + ) + ], + ), ); return SizeTransition( diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 6d2c7b5..e7854e7 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -120,7 +120,6 @@ F89453F80F705EA3CC90967E /* Pods-RunnerTests.release.xcconfig */, 9432957068C77D7544947DE0 /* Pods-RunnerTests.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -479,7 +478,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rhythm_box.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/rhythm_box"; @@ -494,7 +493,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rhythm_box.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/rhythm_box"; @@ -509,7 +508,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rhythm_box.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/rhythm_box"; @@ -575,6 +574,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = RhythmBox; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -707,6 +707,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = RhythmBox; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -727,6 +728,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = RhythmBox; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 460c069..da23de1 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -8,7 +8,7 @@ PRODUCT_NAME = rhythm_box // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.rhythmBox +PRODUCT_BUNDLE_IDENTIFIER = dev.solsynth.rhythmBox // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2024 dev.solsynth. All rights reserved. diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 9ea9857..42919bd 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -89,11 +89,11 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "com.example" "\0" + VALUE "CompanyName", "dev.solsynth" "\0" VALUE "FileDescription", "rhythm_box" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "rhythm_box" "\0" - VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 dev.solsynth. All rights reserved." "\0" VALUE "OriginalFilename", "rhythm_box.exe" "\0" VALUE "ProductName", "rhythm_box" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0"