Rename packages and files

JolandaVerhoef · Oct 29, 2024 · d8f918c · d8f918c
1 parent 6ef36de
commit d8f918c
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/...edia_ui/components/MediaControlButtons.kt → ...dia3/ui/components/MediaControlButtons.kt b/...edia_ui/components/MediaControlButtons.kt → ...dia3/ui/components/MediaControlButtons.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.horologist.media.media_ui.components
+package com.google.android.horologist.media3.ui.components
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
@@ -24,8 +24,8 @@ import androidx.compose.ui.unit.dp
 import androidx.media3.common.Player
 import androidx.wear.compose.material.ButtonColors
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
-import com.google.android.horologist.media.media_ui.components.controls.SeekToNextButton
-import com.google.android.horologist.media.media_ui.components.controls.SeekToPreviousButton
+import com.google.android.horologist.media3.ui.components.controls.SeekToNextButton
+import com.google.android.horologist.media3.ui.components.controls.SeekToPreviousButton
 import com.google.android.horologist.media.ui.components.ControlButtonLayout
 import com.google.android.horologist.media.ui.components.controls.MediaButtonDefaults
 import com.google.android.horologist.media.ui.util.isLargeScreen

diff --git a/...a/media_ui/components/MediaInfoDisplay.kt → .../media3/ui/components/MediaInfoDisplay.kt b/...a/media_ui/components/MediaInfoDisplay.kt → .../media3/ui/components/MediaInfoDisplay.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.horologist.media.media_ui.components
+package com.google.android.horologist.media3.ui.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

diff --git a/...ia/media_ui/components/PlayPauseButton.kt → ...t/media3/ui/components/PlayPauseButton.kt b/...ia/media_ui/components/PlayPauseButton.kt → ...t/media3/ui/components/PlayPauseButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.horologist.media.media_ui.components
+package com.google.android.horologist.media3.ui.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

diff --git a/...i/components/controls/SeekToNextButton.kt → ...i/components/controls/SeekToNextButton.kt b/...i/components/controls/SeekToNextButton.kt → ...i/components/controls/SeekToNextButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.horologist.media.media_ui.components.controls
+package com.google.android.horologist.media3.ui.components.controls
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

diff --git a/...mponents/controls/SeekToPreviousButton.kt → ...mponents/controls/SeekToPreviousButton.kt b/...mponents/controls/SeekToPreviousButton.kt → ...mponents/controls/SeekToPreviousButton.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.horologist.media.media_ui.components.controls
+package com.google.android.horologist.media3.ui.components.controls
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

diff --git a/...a/media_ui/screens/player/PlayerScreen.kt → .../media3/ui/screens/player/PlayerScreen.kt b/...a/media_ui/screens/player/PlayerScreen.kt → .../media3/ui/screens/player/PlayerScreen.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.android.horologist.media.media_ui.screens.player
+package com.google.android.horologist.media3.ui.screens.player
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.media3.common.Player
 import androidx.wear.compose.material.MaterialTheme
 import com.google.android.horologist.images.coil.CoilPaintable
-import com.google.android.horologist.media.media_ui.components.MediaControlButtons
-import com.google.android.horologist.media.media_ui.components.MediaInfoDisplay
+import com.google.android.horologist.media3.ui.components.MediaControlButtons
+import com.google.android.horologist.media3.ui.components.MediaInfoDisplay
 import com.google.android.horologist.media.ui.components.background.ArtworkColorBackground
 import com.google.android.horologist.media.ui.screens.player.PlayerScreen
 

diff --git a/media/sample/src/main/java/com/google/android/horologist/mediasample/ui/app/UampWearApp.kt b/media/sample/src/main/java/com/google/android/horologist/mediasample/ui/app/UampWearApp.kt
@@ -58,7 +58,7 @@ import com.google.android.horologist.mediasample.ui.navigation.UampNavigationScr
 import com.google.android.horologist.mediasample.ui.navigation.UampNavigationScreen.GoogleSignInScreen
 import com.google.android.horologist.mediasample.ui.navigation.UampNavigationScreen.GoogleSignOutScreen
 import com.google.android.horologist.mediasample.ui.navigation.UampNavigationScreen.Samples
-import com.google.android.horologist.mediasample.ui.newhotness.NewHotnessPlayerScreen
+import com.google.android.horologist.mediasample.ui.experimentaluimode.ExperimentalUiModePlayerScreen
 import com.google.android.horologist.mediasample.ui.player.UampMediaPlayerScreen
 import com.google.android.horologist.mediasample.ui.playlists.UampPlaylistsScreen
 import com.google.android.horologist.mediasample.ui.playlists.UampPlaylistsScreenViewModel
@@ -83,9 +83,9 @@ fun UampWearApp(
         MediaPlayerScaffold(
             playerScreen = {
                 if(appState.experimentalUiMode == true) {
-                    NewHotnessPlayerScreen(
+                    ExperimentalUiModePlayerScreen(
                         modifier = Modifier.fillMaxSize(),
-                        newHotnessPlayerScreenViewModel = hiltViewModel(),
+                        experimentalUiModePlayerScreenViewModel = hiltViewModel(),
                     )
                 } else {
                 UampMediaPlayerScreen(

diff --git a/...e/ui/newhotness/NewHotnessPlayerScreen.kt → ...luimode/ExperimentalUiModePlayerScreen.kt b/...e/ui/newhotness/NewHotnessPlayerScreen.kt → ...luimode/ExperimentalUiModePlayerScreen.kt
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package com.google.android.horologist.mediasample.ui.newhotness
+package com.google.android.horologist.mediasample.ui.experimentaluimode
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.google.android.horologist.media.media_ui.screens.player.PlayerScreen
+import com.google.android.horologist.media3.ui.screens.player.PlayerScreen
 
 @Composable
-fun NewHotnessPlayerScreen(
+fun ExperimentalUiModePlayerScreen(
     modifier: Modifier = Modifier,
-    newHotnessPlayerScreenViewModel: NewHotnessPlayerScreenViewModel = hiltViewModel(),
+    experimentalUiModePlayerScreenViewModel: ExperimentalUiModePlayerScreenViewModel = hiltViewModel(),
 ) {
-    val player by newHotnessPlayerScreenViewModel.player.collectAsStateWithLifecycle()
+    val player by experimentalUiModePlayerScreenViewModel.player.collectAsStateWithLifecycle()
 
     PlayerScreen(player, modifier)
 }
diff --git a/...otness/NewHotnessPlayerScreenViewModel.kt → ...xperimentalUiModePlayerScreenViewModel.kt b/...otness/NewHotnessPlayerScreenViewModel.kt → ...xperimentalUiModePlayerScreenViewModel.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.google.android.horologist.mediasample.ui.newhotness
+package com.google.android.horologist.mediasample.ui.experimentaluimode
 
 import androidx.lifecycle.ViewModel
 import com.google.android.horologist.media.data.repository.PlayerRepositoryImpl
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class NewHotnessPlayerScreenViewModel
+class ExperimentalUiModePlayerScreenViewModel
     @Inject
     constructor(
         playerRepository: PlayerRepositoryImpl,