Skip to content

Rename project to MediaMaestro #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ body:
attributes:
label: Is there an existing issue for this?
description: >
Please search to see if an
[issue](https://github.com/SRGSSR/androidx-mediarouter-compose/issues)
Please search to see if an [issue](https://github.com/SRGSSR/MediaMaestro/issues)
already exists for the bug you encountered.
options:
- label: I have searched existing issues and found no similar bug report.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: GitHub Discussions
url: https://github.com/SRGSSR/androidx-mediarouter-compose/discussions
url: https://github.com/SRGSSR/MediaMaestro/discussions
about: Ask for questions and discuss with other members of the community
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ body:
attributes:
label: Is there an existing request for this?
description: >
Please search to see if a
[request](https://github.com/SRGSSR/androidx-mediarouter-compose/issues)
Please search to see if a [request](https://github.com/SRGSSR/MediaMaestro/issues)
already exists for the feature you want.
options:
- label: I have searched existing requests and found no similar ideas.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Publish to GitHub Packages
run: ./gradlew publish
- name: Create GitHub Release
run: gh release create ${{ env.VERSION_NAME }} --draft --generate-notes mediarouter-compose/build/outputs/aar/mediarouter-compose-release.aar
run: gh release create ${{ env.VERSION_NAME }} --draft --generate-notes media-maestro/build/outputs/aar/media-maestro-release.aar
- name: Generate Dokka documentation
run: ./gradlew :dokkaGenerate
- name: Deploy Dokka documentation
Expand Down
21 changes: 8 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# ![MediaMaestro](.idea/icon.svg) MediaMaestro

[![Last release](https://img.shields.io/github/v/release/SRGSSR/androidx-mediarouter-compose?label=Release&include_prereleases)](https://github.com/SRGSSR/androidx-mediarouter-compose/releases)
[![Android min SDK](https://img.shields.io/badge/Android-21%2B-34A853)](https://github.com/SRGSSR/androidx-mediarouter-compose)
[![Build status](https://img.shields.io/github/actions/workflow/status/SRGSSR/androidx-mediarouter-compose/quality.yml?label=Build)](https://github.com/SRGSSR/androidx-mediarouter-compose/actions/workflows/quality.yml)
[![License](https://img.shields.io/github/license/SRGSSR/androidx-mediarouter-compose?label=License)](https://github.com/SRGSSR/androidx-mediarouter-compose/blob/main/LICENSE)
[![Last release](https://img.shields.io/github/v/release/SRGSSR/MediaMaestro?label=Release&include_prereleases)](https://github.com/SRGSSR/MediaMaestro/releases)
[![Android min SDK](https://img.shields.io/badge/Android-21%2B-34A853)](https://github.com/SRGSSR/MediaMaestro)
[![Build status](https://img.shields.io/github/actions/workflow/status/SRGSSR/MediaMaestro/quality.yml?label=Build)](https://github.com/SRGSSR/MediaMaestro/actions/workflows/quality.yml)
[![License](https://img.shields.io/github/license/SRGSSR/MediaMaestro?label=License)](https://github.com/SRGSSR/MediaMaestro/blob/main/LICENSE)

Simplify media routing in your [Compose][compose] app with this native Material
3 [MediaRouter][androidx-mediarouter] library. Enjoy easy integration, a pure Compose-friendly
Expand All @@ -19,8 +19,7 @@ creating seamless media experiences for your users.

## Getting started

Please check the [documentation][androidx-mediarouter-compose-doc] to know how to use AndroidX
MediaRouter Compose in your project.
Please check the [documentation][media-maestro-doc] to know how to use MediaMaestro in your project.

## Release

Expand All @@ -32,11 +31,7 @@ the `x.y.z` pattern is pushed.
See the [license][license] file for more information.

[androidx-mediarouter]: https://developer.android.com/media/routing/mediarouter

[androidx-mediarouter-compose-doc]: https://srgssr.github.io/androidx-mediarouter-compose

[compose]: https://developer.android.com/compose

[license]: https://github.com/SRGSSR/androidx-mediarouter-compose/blob/main/LICENSE

[new-issue]: https://github.com/SRGSSR/androidx-mediarouter-compose/issues/new/choose
[license]: https://github.com/SRGSSR/MediaMaestro/blob/main/LICENSE
[media-maestro-doc]: https://srgssr.github.io/MediaMaestro
[new-issue]: https://github.com/SRGSSR/MediaMaestro/issues/new/choose
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ allprojects {
afterEvaluate {
if (pluginManager.hasPlugin("org.jetbrains.dokka")) {
dokka {
moduleName = if (path == ":") "AndroidX MediaRouter Compose" else name
moduleName = if (path == ":") "MediaMaestro" else name
moduleVersion = providers.environmentVariable("VERSION_NAME").orElse("main")

pluginsConfiguration.html {
customStyleSheets.from(layout.settingsDirectory.file("config/dokka/androidx-mediarouter-compose.css"))
customStyleSheets.from(layout.settingsDirectory.file("config/dokka/media-maestro.css"))
footerMessage = "© SRG SSR"
}

Expand All @@ -51,7 +51,7 @@ allprojects {

sourceLink {
localDirectory.set(layout.projectDirectory.dir("src"))
remoteUrl("https://github.com/SRGSSR/androidx-mediarouter-compose/tree/${moduleVersion.get()}/${project.name}/src")
remoteUrl("https://github.com/SRGSSR/MediaMaestro/tree/${moduleVersion.get()}/${project.name}/src")
}
}
}
Expand All @@ -66,9 +66,9 @@ subprojects {
apiValidation {
ignoredProjects.add("demo")
// See https://github.com/Kotlin/binary-compatibility-validator/issues/74
ignoredClasses.add("ch.srgssr.androidx.mediarouter.compose.ComposableSingletons\$CastIconKt")
ignoredClasses.add("ch.srgssr.androidx.mediarouter.compose.ComposableSingletons\$MediaRouteChooserDialogKt")
ignoredClasses.add("ch.srgssr.androidx.mediarouter.compose.ComposableSingletons\$MediaRouteControllerDialogKt")
ignoredClasses.add("ch.srgssr.media.maestro.ComposableSingletons\$CastIconKt")
ignoredClasses.add("ch.srgssr.media.maestro.ComposableSingletons\$MediaRouteChooserDialogKt")
ignoredClasses.add("ch.srgssr.media.maestro.ComposableSingletons\$MediaRouteControllerDialogKt")
}

dokka {
Expand Down Expand Up @@ -98,7 +98,7 @@ dependencyAnalysis {
}

dependencies {
dokka(project(":mediarouter-compose"))
dokka(project(":media-maestro"))

kover(project(":mediarouter-compose"))
kover(project(":media-maestro"))
}
6 changes: 3 additions & 3 deletions demo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ plugins {
}

android {
namespace = "ch.srgssr.androidx.mediarouter.compose.demo"
namespace = "ch.srgssr.media.maestro.demo"
compileSdk = 35

defaultConfig {
applicationId = "ch.srgssr.androidx.mediarouter.compose.demo"
applicationId = "ch.srgssr.media.maestro.demo"
minSdk = 21
targetSdk = 36
versionCode = 1
Expand Down Expand Up @@ -54,7 +54,7 @@ android {
}

dependencies {
implementation(project(":mediarouter-compose"))
implementation(project(":media-maestro"))
implementation(libs.androidx.activity)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.annotation.experimental)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose.demo
package ch.srgssr.media.maestro.demo

import android.os.Bundle
import androidx.activity.compose.setContent
Expand Down Expand Up @@ -42,7 +42,7 @@ import androidx.media3.ui.PlayerView
import androidx.mediarouter.app.MediaRouteButton
import androidx.mediarouter.media.MediaControlIntent
import androidx.mediarouter.media.MediaRouteSelector
import ch.srgssr.androidx.mediarouter.compose.MediaRouteButton
import ch.srgssr.media.maestro.MediaRouteButton

class MainActivity : FragmentActivity() {
private val mainViewModel by viewModels<MainViewModel>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose.demo
package ch.srgssr.media.maestro.demo

import android.app.Application
import android.media.MediaMetadata.METADATA_KEY_ART_URI
Expand Down Expand Up @@ -35,7 +35,7 @@ import android.media.MediaMetadata as PlatformMediaMetadata
@OptIn(UnstableApi::class)
class MainViewModel(application: Application) : AndroidViewModel(application) {
private val playerListener = PlayerListener()
private val mediaSession = MediaSession(application, "androidx-mediarouter-compose-demo")
private val mediaSession = MediaSession(application, "media-maestro-demo")
private val localPlayer = ExoPlayer.Builder(application).build()
private val castPlayer = CastPlayer(CastContext.getSharedInstance(application))
private val currentPlayer =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose.demo
package ch.srgssr.media.maestro.demo

import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
Expand Down
14 changes: 7 additions & 7 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ This way you can avoid creating an entire pull request we will never be able to

Templates are available when you want to contribute:

* [Issues](https://github.com/SRGSSR/androidx-mediarouter-compose/issues/new/choose): Please follow
our issue template. You can omit information which does not make sense but, in general, the more
details you can provide, the better. This ensures we can quickly reproduce the problem you are
facing, increasing the likelihood we can fix it.
* [Pull requests](https://github.com/SRGSSR/androidx-mediarouter-compose/compare): Please follow our
code conventions, test your code well, and write unit tests when this makes sense. We will review
your work and, if successful, merge it back into the main development branch.
* [Issues](https://github.com/SRGSSR/MediaMaestro/issues/new/choose): Please follow our issue
template. You can omit information which does not make sense but, in general, the more details you
can provide, the better. This ensures we can quickly reproduce the problem you are facing,
increasing the likelihood we can fix it.
* [Pull requests](https://github.com/SRGSSR/MediaMaestro/compare): Please follow our code
conventions, test your code well, and write unit tests when this makes sense. We will review your
work and, if successful, merge it back into the main development branch.

## Code conventions

Expand Down
10 changes: 5 additions & 5 deletions docs/androidx-mediarouter-compose.md → docs/MediaMaestro.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## AndroidX MediaRouter Compose
## MediaMaestro

Simplify media routing in your [Compose][compose] app with this native Material
3 [MediaRouter][androidx-mediarouter] library. Enjoy easy integration, a pure Compose-friendly
Expand All @@ -15,13 +15,13 @@ GitHub's [documentation][using-github-package] to add the repository to your pro
```kotlin
repositories {
maven {
url = uri("https://maven.pkg.github.com/SRGSSR/androidx-mediarouter-compose")
url = uri("https://maven.pkg.github.com/SRGSSR/MediaMaestro")
credentials {
username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
}
content {
includeGroup("ch.srgssr.androidx.mediarouter")
includeGroup("ch.srgssr.media.maestro")
}
}
}
Expand All @@ -32,10 +32,10 @@ repositories {
In your module `build.gradle(.kts)` file, add the following dependency:

```kotlin
implementation("ch.srgssr.androidx.mediarouter:mediarouter-compose:<version>")
implementation("ch.srgssr.media.maestro:media-maestro:<version>")
```

[androidx-mediarouter]: https://developer.android.com/media/routing/mediarouter
[compose]: https://developer.android.com/compose
[github-package]: https://github.com/orgs/SRGSSR/packages?repo_name=androidx-mediarouter-compose
[github-package]: https://github.com/orgs/SRGSSR/packages?repo_name=MediaMaestro
[using-github-package]: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#using-a-published-package
7 changes: 7 additions & 0 deletions docs/media-maestro.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Module media-maestro

This module provides Compose components to integrate Media Routing in your application.

# Package ch.srgssr.media.maestro

This package contains Compose components to integrate Media Routing in your application.
7 changes: 0 additions & 7 deletions docs/mediarouter-compose.md

This file was deleted.

23 changes: 23 additions & 0 deletions media-maestro/api/media-maestro.api
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
public final class ch/srgssr/media/maestro/DialogType : java/lang/Enum {
public static final field Chooser Lch/srgssr/media/maestro/DialogType;
public static final field Controller Lch/srgssr/media/maestro/DialogType;
public static final field DynamicChooser Lch/srgssr/media/maestro/DialogType;
public static final field DynamicController Lch/srgssr/media/maestro/DialogType;
public static final field None Lch/srgssr/media/maestro/DialogType;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Lch/srgssr/media/maestro/DialogType;
public static fun values ()[Lch/srgssr/media/maestro/DialogType;
}

public final class ch/srgssr/media/maestro/MediaRouteButtonKt {
public static final fun MediaRouteButton (Landroidx/compose/ui/Modifier;Landroidx/mediarouter/media/MediaRouteSelector;Landroidx/compose/material3/IconButtonColors;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
}

public final class ch/srgssr/media/maestro/MediaRouteChooserDialogKt {
public static final fun MediaRouteChooserDialog (Landroidx/mediarouter/media/MediaRouteSelector;Landroidx/compose/ui/Modifier;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)V
}

public final class ch/srgssr/media/maestro/MediaRouteControllerDialogKt {
public static final fun MediaRouteControllerDialog (Landroidx/mediarouter/media/MediaRouteSelector;Landroidx/compose/ui/Modifier;ZLkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
}

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ plugins {

android {
experimentalProperties["android.experimental.enableScreenshotTest"] = true
namespace = "ch.srgssr.androidx.mediarouter.compose"
namespace = "ch.srgssr.media.maestro"
compileSdk = 35

defaultConfig {
Expand Down Expand Up @@ -150,7 +150,7 @@ dependencies {
publishing {
publications {
register<MavenPublication>("GitHubPackages") {
group = "ch.srgssr.androidx.mediarouter"
group = "ch.srgssr.media.maestro"
version = providers.environmentVariable("VERSION_NAME").getOrElse("dev")

artifact(dokkaHtmlJar)
Expand All @@ -165,7 +165,7 @@ publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/SRGSSR/androidx-mediarouter-compose")
url = uri("https://maven.pkg.github.com/SRGSSR/MediaMaestro")

val gitHubUser = providers.gradleProperty("gpr.user")
.orElse(providers.environmentVariable("USERNAME"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose
package ch.srgssr.media.maestro

import androidx.annotation.StringRes
import androidx.mediarouter.R
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose
package ch.srgssr.media.maestro

import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.InfiniteTransition
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose
package ch.srgssr.media.maestro

import android.content.Context
import android.content.pm.PackageManager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose
package ch.srgssr.media.maestro

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose
package ch.srgssr.media.maestro

import androidx.annotation.VisibleForTesting
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -61,15 +61,15 @@ public fun MediaRouteButton(
onDismissRequest = onDismissRequest,
)
},
// TODO Implement the correct dialog (see https://github.com/SRGSSR/androidx-mediarouter-compose/issues/18)
// TODO Implement the correct dialog (see https://github.com/SRGSSR/MediaMaestro/issues/18)
mediaRouteDynamicChooserDialog: @Composable (onDismissRequest: () -> Unit) -> Unit = mediaRouteChooserDialog,
mediaRouteControllerDialog: @Composable (onDismissRequest: () -> Unit) -> Unit = { onDismissRequest ->
MediaRouteControllerDialog(
routeSelector = routeSelector,
onDismissRequest = onDismissRequest,
)
},
// TODO Implement the correct dialog (see https://github.com/SRGSSR/androidx-mediarouter-compose/issues/19)
// TODO Implement the correct dialog (see https://github.com/SRGSSR/MediaMaestro/issues/19)
mediaRouteDynamicControllerDialog: @Composable (onDismissRequest: () -> Unit) -> Unit = mediaRouteControllerDialog,
onDialogTypeChange: (dialogType: DialogType) -> Unit = {},
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* License information is available from the LICENSE file.
*/

package ch.srgssr.androidx.mediarouter.compose
package ch.srgssr.media.maestro

import android.app.Application
import androidx.lifecycle.SavedStateHandle
Expand Down
Loading