From 108821871de4f98337b4aff9f037ec87045698eb Mon Sep 17 00:00:00 2001 From: Ryan Heise Date: Thu, 28 Nov 2019 17:55:32 +1100 Subject: [PATCH] Rename project to just_audio --- .idea/modules.xml | 6 +++--- .idea/workspace.xml | 4 ++-- README.md | 2 +- android/build.gradle | 2 +- android/settings.gradle | 2 +- android/src/main/AndroidManifest.xml | 2 +- .../{audio_player => just_audio}/AudioPlayer.java | 6 +++--- .../JustAudioPlugin.java} | 12 ++++++------ example/README.md | 4 ++-- example/android/app/build.gradle | 2 +- example/android/app/src/debug/AndroidManifest.xml | 2 +- example/android/app/src/main/AndroidManifest.xml | 4 ++-- .../MainActivity.java | 2 +- example/android/app/src/profile/AndroidManifest.xml | 2 +- example/ios/Runner/Info.plist | 2 +- example/lib/main.dart | 2 +- example/pubspec.lock | 2 +- example/pubspec.yaml | 6 +++--- example/test/widget_test.dart | 2 +- ios/Classes/AudioPlayerPlugin.h | 4 ---- ios/Classes/JustAudioPlugin.h | 4 ++++ .../{AudioPlayerPlugin.m => JustAudioPlugin.m} | 8 ++++---- ios/{audio_player.podspec => just_audio.podspec} | 2 +- audio_player.iml => just_audio.iml | 0 lib/{audio_player.dart => just_audio.dart} | 8 ++++---- pubspec.yaml | 6 +++--- .../{audio_player_test.dart => just_audio_test.dart} | 4 ++-- 27 files changed, 51 insertions(+), 51 deletions(-) rename android/src/main/java/com/ryanheise/{audio_player => just_audio}/AudioPlayer.java (98%) rename android/src/main/java/com/ryanheise/{audio_player/AudioPlayerPlugin.java => just_audio/JustAudioPlugin.java} (72%) rename example/android/app/src/main/java/com/ryanheise/{audio_player_example => just_audio_example}/MainActivity.java (88%) delete mode 100644 ios/Classes/AudioPlayerPlugin.h create mode 100644 ios/Classes/JustAudioPlugin.h rename ios/Classes/{AudioPlayerPlugin.m => JustAudioPlugin.m} (75%) rename ios/{audio_player.podspec => just_audio.podspec} (94%) rename audio_player.iml => just_audio.iml (100%) rename lib/{audio_player.dart => just_audio.dart} (96%) rename test/{audio_player_test.dart => just_audio_test.dart} (77%) diff --git a/.idea/modules.xml b/.idea/modules.xml index b5e1a91..21ff740 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4967ac2..b40f72d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,8 @@ - - + + diff --git a/README.md b/README.md index c842fac..e8fc8eb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# audio_player +# just_audio A new Flutter audio player plugin designed to support background playback with [audio_service](https://pub.dev/packages/audio_service) diff --git a/android/build.gradle b/android/build.gradle index fc7a502..d7c7f4b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,4 @@ -group 'com.ryanheise.audio_player' +group 'com.ryanheise.just_audio' version '1.0' buildscript { diff --git a/android/settings.gradle b/android/settings.gradle index 1845997..c17dc37 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1 @@ -rootProject.name = 'audio_player' +rootProject.name = 'just_audio' diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index ab6c81e..e83e841 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="com.ryanheise.just_audio"> diff --git a/android/src/main/java/com/ryanheise/audio_player/AudioPlayer.java b/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java similarity index 98% rename from android/src/main/java/com/ryanheise/audio_player/AudioPlayer.java rename to android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java index d7514b9..6c07348 100644 --- a/android/src/main/java/com/ryanheise/audio_player/AudioPlayer.java +++ b/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java @@ -1,4 +1,4 @@ -package com.ryanheise.audio_player; +package com.ryanheise.just_audio; import android.media.MediaPlayer; import android.media.MediaTimestamp; @@ -45,9 +45,9 @@ public class AudioPlayer implements MethodCallHandler, MediaPlayer.OnCompletionL public AudioPlayer(final Registrar registrar, final long id) { this.registrar = registrar; this.id = id; - methodChannel = new MethodChannel(registrar.messenger(), "com.ryanheise.audio_player.methods." + id); + methodChannel = new MethodChannel(registrar.messenger(), "com.ryanheise.just_audio.methods." + id); methodChannel.setMethodCallHandler(this); - eventChannel = new EventChannel(registrar.messenger(), "com.ryanheise.audio_player.events." + id); + eventChannel = new EventChannel(registrar.messenger(), "com.ryanheise.just_audio.events." + id); eventChannel.setStreamHandler(new EventChannel.StreamHandler() { @Override public void onListen(final Object arguments, final EventSink eventSink) { diff --git a/android/src/main/java/com/ryanheise/audio_player/AudioPlayerPlugin.java b/android/src/main/java/com/ryanheise/just_audio/JustAudioPlugin.java similarity index 72% rename from android/src/main/java/com/ryanheise/audio_player/AudioPlayerPlugin.java rename to android/src/main/java/com/ryanheise/just_audio/JustAudioPlugin.java index 7c5023a..aff1f75 100644 --- a/android/src/main/java/com/ryanheise/audio_player/AudioPlayerPlugin.java +++ b/android/src/main/java/com/ryanheise/just_audio/JustAudioPlugin.java @@ -1,4 +1,4 @@ -package com.ryanheise.audio_player; +package com.ryanheise.just_audio; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; @@ -6,17 +6,17 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; import io.flutter.plugin.common.PluginRegistry.Registrar; -/** AudioPlayerPlugin */ -public class AudioPlayerPlugin implements MethodCallHandler { +/** JustAudioPlugin */ +public class JustAudioPlugin implements MethodCallHandler { /** Plugin registration. */ public static void registerWith(Registrar registrar) { - final MethodChannel channel = new MethodChannel(registrar.messenger(), "com.ryanheise.audio_player.methods"); - channel.setMethodCallHandler(new AudioPlayerPlugin(registrar)); + final MethodChannel channel = new MethodChannel(registrar.messenger(), "com.ryanheise.just_audio.methods"); + channel.setMethodCallHandler(new JustAudioPlugin(registrar)); } private Registrar registrar; - public AudioPlayerPlugin(Registrar registrar) { + public JustAudioPlugin(Registrar registrar) { this.registrar = registrar; } diff --git a/example/README.md b/example/README.md index b19a908..009ea35 100644 --- a/example/README.md +++ b/example/README.md @@ -1,6 +1,6 @@ -# audio_player_example +# just_audio_example -Demonstrates how to use the audio_player plugin. +Demonstrates how to use the just_audio plugin. ## Getting Started diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 0de67d8..da95139 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.ryanheise.audio_player_example" + applicationId "com.ryanheise.just_audio_example" minSdkVersion 16 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml index 7003cdc..df636f4 100644 --- a/example/android/app/src/debug/AndroidManifest.xml +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.ryanheise.just_audio_example"> diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 7563435..a67d6e1 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.ryanheise.just_audio_example"> + package="com.ryanheise.just_audio_example"> diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index b4c6522..9324af6 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - audio_player_example + just_audio_example CFBundlePackageType APPL CFBundleShortVersionString diff --git a/example/lib/main.dart b/example/lib/main.dart index 6d2ea54..692ac0f 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'dart:async'; import 'package:flutter/services.dart'; -import 'package:audio_player/audio_player.dart'; +import 'package:just_audio/just_audio.dart'; void main() => runApp(MyApp()); diff --git a/example/pubspec.lock b/example/pubspec.lock index 91377e9..5015dad 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -8,7 +8,7 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.3.0" - audio_player: + just_audio: dependency: "direct dev" description: path: ".." diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 39e9d17..fec03ab 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,5 +1,5 @@ -name: audio_player_example -description: Demonstrates how to use the audio_player plugin. +name: just_audio_example +description: Demonstrates how to use the just_audio plugin. publish_to: 'none' dependencies: @@ -14,7 +14,7 @@ dev_dependencies: flutter_test: sdk: flutter - audio_player: + just_audio: path: ../ # For information on the generic Dart part of this file, see the diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart index 2ee55f2..0cc2e4f 100644 --- a/example/test/widget_test.dart +++ b/example/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:audio_player_example/main.dart'; +import 'package:just_audio_example/main.dart'; void main() { testWidgets('Verify Platform version', (WidgetTester tester) async { diff --git a/ios/Classes/AudioPlayerPlugin.h b/ios/Classes/AudioPlayerPlugin.h deleted file mode 100644 index 08043a0..0000000 --- a/ios/Classes/AudioPlayerPlugin.h +++ /dev/null @@ -1,4 +0,0 @@ -#import - -@interface AudioPlayerPlugin : NSObject -@end diff --git a/ios/Classes/JustAudioPlugin.h b/ios/Classes/JustAudioPlugin.h new file mode 100644 index 0000000..a694322 --- /dev/null +++ b/ios/Classes/JustAudioPlugin.h @@ -0,0 +1,4 @@ +#import + +@interface JustAudioPlugin : NSObject +@end diff --git a/ios/Classes/AudioPlayerPlugin.m b/ios/Classes/JustAudioPlugin.m similarity index 75% rename from ios/Classes/AudioPlayerPlugin.m rename to ios/Classes/JustAudioPlugin.m index 5489d30..0299970 100644 --- a/ios/Classes/AudioPlayerPlugin.m +++ b/ios/Classes/JustAudioPlugin.m @@ -1,11 +1,11 @@ -#import "AudioPlayerPlugin.h" +#import "JustAudioPlugin.h" -@implementation AudioPlayerPlugin +@implementation JustAudioPlugin + (void)registerWithRegistrar:(NSObject*)registrar { FlutterMethodChannel* channel = [FlutterMethodChannel - methodChannelWithName:@"audio_player" + methodChannelWithName:@"just_audio" binaryMessenger:[registrar messenger]]; - AudioPlayerPlugin* instance = [[AudioPlayerPlugin alloc] init]; + JustAudioPlugin* instance = [[JustAudioPlugin alloc] init]; [registrar addMethodCallDelegate:instance channel:channel]; } diff --git a/ios/audio_player.podspec b/ios/just_audio.podspec similarity index 94% rename from ios/audio_player.podspec rename to ios/just_audio.podspec index 2a41dac..c13beb3 100644 --- a/ios/audio_player.podspec +++ b/ios/just_audio.podspec @@ -2,7 +2,7 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'audio_player' + s.name = 'just_audio' s.version = '0.0.1' s.summary = 'A new flutter plugin project.' s.description = <<-DESC diff --git a/audio_player.iml b/just_audio.iml similarity index 100% rename from audio_player.iml rename to just_audio.iml diff --git a/lib/audio_player.dart b/lib/just_audio.dart similarity index 96% rename from lib/audio_player.dart rename to lib/just_audio.dart index b2ca1d6..c260ecb 100644 --- a/lib/audio_player.dart +++ b/lib/just_audio.dart @@ -45,11 +45,11 @@ import 'package:rxdart/rxdart.dart'; /// whatever state the player was in prior to the seek request. class AudioPlayer { static final _mainChannel = - MethodChannel('com.ryanheise.audio_player.methods'); + MethodChannel('com.ryanheise.just_audio.methods'); static Future _createChannel(int id) async { await _mainChannel.invokeMethod('init', id); - return MethodChannel('com.ryanheise.audio_player.methods.$id'); + return MethodChannel('com.ryanheise.just_audio.methods.$id'); } final Future _channel; @@ -75,7 +75,7 @@ class AudioPlayer { AudioPlayer._internal(DateTime.now().microsecondsSinceEpoch); AudioPlayer._internal(this._id) : _channel = _createChannel(_id) { - _eventChannelStream = EventChannel('com.ryanheise.audio_player.events.$_id') + _eventChannelStream = EventChannel('com.ryanheise.just_audio.events.$_id') .receiveBroadcastStream() .map((data) => _audioPlayerState = AudioPlayerState( state: AudioPlaybackState.values[data[0]], @@ -136,7 +136,7 @@ class AudioPlayer { return await setFilePath(file.path); } - Future get _cacheFile async => File(p.join((await getTemporaryDirectory()).path, 'audio_player_asset_cache', '$_id')); + Future get _cacheFile async => File(p.join((await getTemporaryDirectory()).path, 'just_audio_asset_cache', '$_id')); /// Plays the currently loaded media from the current position. It is legal /// to invoke this method only from one of the following states: diff --git a/pubspec.yaml b/pubspec.yaml index 9ae7c73..0719398 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: audio_player +name: just_audio description: Flutter plugin to play audio from streams, files and assets. Works with audio_service to play audio in the background. version: 0.0.1 author: Ryan Heise @@ -28,8 +28,8 @@ flutter: # be modified. They are used by the tooling to maintain consistency when # adding or updating assets for this project. plugin: - androidPackage: com.ryanheise.audio_player - pluginClass: AudioPlayerPlugin + androidPackage: com.ryanheise.just_audio + pluginClass: JustAudioPlugin # To add assets to your plugin package, add an assets section, like this: # assets: diff --git a/test/audio_player_test.dart b/test/just_audio_test.dart similarity index 77% rename from test/audio_player_test.dart rename to test/just_audio_test.dart index a51c5cf..6e18607 100644 --- a/test/audio_player_test.dart +++ b/test/just_audio_test.dart @@ -1,9 +1,9 @@ import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:audio_player/audio_player.dart'; +import 'package:just_audio/just_audio.dart'; void main() { - const MethodChannel channel = MethodChannel('audio_player'); + const MethodChannel channel = MethodChannel('just_audio'); setUp(() { channel.setMockMethodCallHandler((MethodCall methodCall) async {