Skip to content

Refactor home to library #1359

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.

Sign up for GitHub

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 1 commit into from
Apr 25, 2024
Merged

Refactor home to library #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions Jetcaster/wear/src/main/java/com/example/jetcaster/WearApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.wear.compose.navigation.composable
import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
import androidx.wear.compose.navigation.rememberSwipeDismissableNavHostState
import com.example.jetcaster.latest_episodes.LatestEpisodesScreen
import com.example.jetcaster.podcasts.PodcastsScreen
import com.example.jetcaster.queue.QueueScreen
import com.example.jetcaster.theme.WearAppTheme
import com.example.jetcaster.ui.Episode
import com.example.jetcaster.ui.JetcasterNavController.navigateToEpisode
Expand All @@ -38,10 +41,7 @@ import com.example.jetcaster.ui.PodcastDetails
import com.example.jetcaster.ui.UpNext
import com.example.jetcaster.ui.YourPodcasts
import com.example.jetcaster.ui.episode.EpisodeScreen
import com.example.jetcaster.ui.home.HomeScreen
import com.example.jetcaster.ui.library.LatestEpisodesScreen
import com.example.jetcaster.ui.library.PodcastsScreen
import com.example.jetcaster.ui.library.QueueScreen
import com.example.jetcaster.ui.library.LibraryScreen
import com.example.jetcaster.ui.player.PlaybackSpeedScreen
import com.example.jetcaster.ui.player.PlayerScreen
import com.example.jetcaster.ui.podcast.PodcastDetailsScreen
Expand Down Expand Up @@ -78,10 +78,10 @@ fun WearApp() {
)
},
libraryScreen = {
HomeScreen(
LibraryScreen(
onLatestEpisodeClick = { navController.navigateToLatestEpisode() },
onYourPodcastClick = { navController.navigateToYourPodcast() },
onUpNextClick = { navController.navigateToUpNext() }
onUpNextClick = { navController.navigateToUpNext() },
)
},
categoryEntityScreen = { _, _ -> },
Expand Down
2 changes: 1 addition & 1 deletion ...ster/ui/library/LatestEpisodeViewModel.kt → ...latest_episodes/LatestEpisodeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.example.jetcaster.ui.library
package com.example.jetcaster.latest_episodes

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
2 changes: 1 addition & 1 deletion ...caster/ui/library/LatestEpisodesScreen.kt → ...r/latest_episodes/LatestEpisodesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.example.jetcaster.ui.library
package com.example.jetcaster.latest_episodes

import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
Expand Down
2 changes: 1 addition & 1 deletion ...le/jetcaster/ui/library/PodcastsScreen.kt → ...mple/jetcaster/podcasts/PodcastsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.example.jetcaster.ui.library
package com.example.jetcaster.podcasts

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down
2 changes: 1 addition & 1 deletion ...jetcaster/ui/library/PodcastsViewModel.kt → ...e/jetcaster/podcasts/PodcastsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.example.jetcaster.ui.library
package com.example.jetcaster.podcasts

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
2 changes: 1 addition & 1 deletion ...ample/jetcaster/ui/library/QueueScreen.kt → ...om/example/jetcaster/queue/QueueScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.example.jetcaster.ui.library
package com.example.jetcaster.queue

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
Expand Down
2 changes: 1 addition & 1 deletion ...le/jetcaster/ui/library/QueueViewModel.kt → ...example/jetcaster/queue/QueueViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.example.jetcaster.ui.library
package com.example.jetcaster.queue

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
144 changes: 0 additions & 144 deletions Jetcaster/wear/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt
View file
Open in desktop

This file was deleted.

Loading