Skip to content

Commit a129686

Browse files
authored
Rename project to MediaMaestro (#105)
* Rename project to `MediaMaestro` * Fix merge
1 parent 08db1c1 commit a129686

File tree

154 files changed

+126
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+126
-133
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ body:
88
attributes:
99
label: Is there an existing issue for this?
1010
description: >
11-
Please search to see if an
12-
[issue](https://github.com/SRGSSR/androidx-mediarouter-compose/issues)
11+
Please search to see if an [issue](https://github.com/SRGSSR/MediaMaestro/issues)
1312
already exists for the bug you encountered.
1413
options:
1514
- label: I have searched existing issues and found no similar bug report.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: GitHub Discussions
4-
url: https://github.com/SRGSSR/androidx-mediarouter-compose/discussions
4+
url: https://github.com/SRGSSR/MediaMaestro/discussions
55
about: Ask for questions and discuss with other members of the community

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ body:
88
attributes:
99
label: Is there an existing request for this?
1010
description: >
11-
Please search to see if a
12-
[request](https://github.com/SRGSSR/androidx-mediarouter-compose/issues)
11+
Please search to see if a [request](https://github.com/SRGSSR/MediaMaestro/issues)
1312
already exists for the feature you want.
1413
options:
1514
- label: I have searched existing requests and found no similar ideas.

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Publish to GitHub Packages
2828
run: ./gradlew publish
2929
- name: Create GitHub Release
30-
run: gh release create ${{ env.VERSION_NAME }} --draft --generate-notes mediarouter-compose/build/outputs/aar/mediarouter-compose-release.aar
30+
run: gh release create ${{ env.VERSION_NAME }} --draft --generate-notes media-maestro/build/outputs/aar/media-maestro-release.aar
3131
- name: Generate Dokka documentation
3232
run: ./gradlew :dokkaGenerate
3333
- name: Deploy Dokka documentation

README.md

Lines changed: 8 additions & 13 deletions

build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ allprojects {
3333
afterEvaluate {
3434
if (pluginManager.hasPlugin("org.jetbrains.dokka")) {
3535
dokka {
36-
moduleName = if (path == ":") "AndroidX MediaRouter Compose" else name
36+
moduleName = if (path == ":") "MediaMaestro" else name
3737
moduleVersion = providers.environmentVariable("VERSION_NAME").orElse("main")
3838

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

@@ -51,7 +51,7 @@ allprojects {
5151

5252
sourceLink {
5353
localDirectory.set(layout.projectDirectory.dir("src"))
54-
remoteUrl("https://github.com/SRGSSR/androidx-mediarouter-compose/tree/${moduleVersion.get()}/${project.name}/src")
54+
remoteUrl("https://github.com/SRGSSR/MediaMaestro/tree/${moduleVersion.get()}/${project.name}/src")
5555
}
5656
}
5757
}
@@ -66,9 +66,9 @@ subprojects {
6666
apiValidation {
6767
ignoredProjects.add("demo")
6868
// See https://github.com/Kotlin/binary-compatibility-validator/issues/74
69-
ignoredClasses.add("ch.srgssr.androidx.mediarouter.compose.ComposableSingletons\$CastIconKt")
70-
ignoredClasses.add("ch.srgssr.androidx.mediarouter.compose.ComposableSingletons\$MediaRouteChooserDialogKt")
71-
ignoredClasses.add("ch.srgssr.androidx.mediarouter.compose.ComposableSingletons\$MediaRouteControllerDialogKt")
69+
ignoredClasses.add("ch.srgssr.media.maestro.ComposableSingletons\$CastIconKt")
70+
ignoredClasses.add("ch.srgssr.media.maestro.ComposableSingletons\$MediaRouteChooserDialogKt")
71+
ignoredClasses.add("ch.srgssr.media.maestro.ComposableSingletons\$MediaRouteControllerDialogKt")
7272
}
7373

7474
dokka {
@@ -98,7 +98,7 @@ dependencyAnalysis {
9898
}
9999

100100
dependencies {
101-
dokka(project(":mediarouter-compose"))
101+
dokka(project(":media-maestro"))
102102

103-
kover(project(":mediarouter-compose"))
103+
kover(project(":media-maestro"))
104104
}

demo/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ plugins {
1010
}
1111

1212
android {
13-
namespace = "ch.srgssr.androidx.mediarouter.compose.demo"
13+
namespace = "ch.srgssr.media.maestro.demo"
1414
compileSdk = 35
1515

1616
defaultConfig {
17-
applicationId = "ch.srgssr.androidx.mediarouter.compose.demo"
17+
applicationId = "ch.srgssr.media.maestro.demo"
1818
minSdk = 21
1919
targetSdk = 36
2020
versionCode = 1
@@ -54,7 +54,7 @@ android {
5454
}
5555

5656
dependencies {
57-
implementation(project(":mediarouter-compose"))
57+
implementation(project(":media-maestro"))
5858
implementation(libs.androidx.activity)
5959
implementation(libs.androidx.activity.compose)
6060
implementation(libs.androidx.annotation.experimental)

demo/src/main/java/ch/srgssr/androidx/mediarouter/compose/demo/MainActivity.kt renamed to demo/src/main/java/ch/srgssr/media/maestro/demo/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose.demo
6+
package ch.srgssr.media.maestro.demo
77

88
import android.os.Bundle
99
import androidx.activity.compose.setContent
@@ -41,7 +41,7 @@ import androidx.media3.exoplayer.ExoPlayer
4141
import androidx.media3.ui.PlayerView
4242
import androidx.mediarouter.app.MediaRouteButton
4343
import androidx.mediarouter.media.MediaRouteSelector
44-
import ch.srgssr.androidx.mediarouter.compose.MediaRouteButton
44+
import ch.srgssr.media.maestro.MediaRouteButton
4545

4646
class MainActivity : FragmentActivity() {
4747
private val mainViewModel by viewModels<MainViewModel>()

demo/src/main/java/ch/srgssr/androidx/mediarouter/compose/demo/MainViewModel.kt renamed to demo/src/main/java/ch/srgssr/media/maestro/demo/MainViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose.demo
6+
package ch.srgssr.media.maestro.demo
77

88
import android.app.Application
99
import android.media.MediaMetadata.METADATA_KEY_ART_URI
@@ -38,7 +38,7 @@ import android.media.MediaMetadata as PlatformMediaMetadata
3838
class MainViewModel(application: Application) : AndroidViewModel(application) {
3939
private val playerListener = PlayerListener()
4040
private val castContext = CastContext.getSharedInstance(application)
41-
private val mediaSession = MediaSession(application, "androidx-mediarouter-compose-demo")
41+
private val mediaSession = MediaSession(application, "media-maestro-demo")
4242
private val localPlayer = ExoPlayer.Builder(application).build()
4343
private val castPlayer = CastPlayer(castContext)
4444
private val currentPlayer =

demo/src/main/java/ch/srgssr/androidx/mediarouter/compose/demo/Theme.kt renamed to demo/src/main/java/ch/srgssr/media/maestro/demo/Theme.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose.demo
6+
package ch.srgssr.media.maestro.demo
77

88
import androidx.compose.foundation.isSystemInDarkTheme
99
import androidx.compose.material3.MaterialTheme

docs/CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions

docs/androidx-mediarouter-compose.md renamed to docs/MediaMaestro.md

Lines changed: 5 additions & 5 deletions

docs/media-maestro.md

Lines changed: 7 additions & 0 deletions

docs/mediarouter-compose.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

media-maestro/api/media-maestro.api

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
public final class ch/srgssr/media/maestro/DialogType : java/lang/Enum {
2+
public static final field Chooser Lch/srgssr/media/maestro/DialogType;
3+
public static final field Controller Lch/srgssr/media/maestro/DialogType;
4+
public static final field DynamicChooser Lch/srgssr/media/maestro/DialogType;
5+
public static final field DynamicController Lch/srgssr/media/maestro/DialogType;
6+
public static final field None Lch/srgssr/media/maestro/DialogType;
7+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
8+
public static fun valueOf (Ljava/lang/String;)Lch/srgssr/media/maestro/DialogType;
9+
public static fun values ()[Lch/srgssr/media/maestro/DialogType;
10+
}
11+
12+
public final class ch/srgssr/media/maestro/MediaRouteButtonKt {
13+
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
14+
}
15+
16+
public final class ch/srgssr/media/maestro/MediaRouteChooserDialogKt {
17+
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
18+
}
19+
20+
public final class ch/srgssr/media/maestro/MediaRouteControllerDialogKt {
21+
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
22+
}
23+

mediarouter-compose/build.gradle.kts renamed to media-maestro/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818

1919
android {
2020
experimentalProperties["android.experimental.enableScreenshotTest"] = true
21-
namespace = "ch.srgssr.androidx.mediarouter.compose"
21+
namespace = "ch.srgssr.media.maestro"
2222
compileSdk = 35
2323

2424
defaultConfig {
@@ -150,7 +150,7 @@ dependencies {
150150
publishing {
151151
publications {
152152
register<MavenPublication>("GitHubPackages") {
153-
group = "ch.srgssr.androidx.mediarouter"
153+
group = "ch.srgssr.media.maestro"
154154
version = providers.environmentVariable("VERSION_NAME").getOrElse("dev")
155155

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

170170
val gitHubUser = providers.gradleProperty("gpr.user")
171171
.orElse(providers.environmentVariable("USERNAME"))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose
6+
package ch.srgssr.media.maestro
77

88
import androidx.annotation.StringRes
99
import androidx.mediarouter.R
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose
6+
package ch.srgssr.media.maestro
77

88
import androidx.compose.animation.animateColorAsState
99
import androidx.compose.animation.core.InfiniteTransition
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose
6+
package ch.srgssr.media.maestro
77

88
import android.content.Context
99
import android.content.pm.PackageManager
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose
6+
package ch.srgssr.media.maestro
77

88
import androidx.compose.foundation.layout.Arrangement
99
import androidx.compose.foundation.layout.Column
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose
6+
package ch.srgssr.media.maestro
77

88
import androidx.annotation.VisibleForTesting
99
import androidx.compose.material3.IconButton
@@ -61,15 +61,15 @@ public fun MediaRouteButton(
6161
onDismissRequest = onDismissRequest,
6262
)
6363
},
64-
// TODO Implement the correct dialog (see https://github.com/SRGSSR/androidx-mediarouter-compose/issues/18)
64+
// TODO Implement the correct dialog (see https://github.com/SRGSSR/MediaMaestro/issues/18)
6565
mediaRouteDynamicChooserDialog: @Composable (onDismissRequest: () -> Unit) -> Unit = mediaRouteChooserDialog,
6666
mediaRouteControllerDialog: @Composable (onDismissRequest: () -> Unit) -> Unit = { onDismissRequest ->
6767
MediaRouteControllerDialog(
6868
routeSelector = routeSelector,
6969
onDismissRequest = onDismissRequest,
7070
)
7171
},
72-
// TODO Implement the correct dialog (see https://github.com/SRGSSR/androidx-mediarouter-compose/issues/19)
72+
// TODO Implement the correct dialog (see https://github.com/SRGSSR/MediaMaestro/issues/19)
7373
mediaRouteDynamicControllerDialog: @Composable (onDismissRequest: () -> Unit) -> Unit = mediaRouteControllerDialog,
7474
onDialogTypeChange: (dialogType: DialogType) -> Unit = {},
7575
) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* License information is available from the LICENSE file.
44
*/
55

6-
package ch.srgssr.androidx.mediarouter.compose
6+
package ch.srgssr.media.maestro
77

88
import android.app.Application
99
import androidx.lifecycle.SavedStateHandle

0 commit comments

Comments
 (0)