Skip to content

Commit f6fc63f

Browse files
committed
Refactor home to library
1 parent ae41864 commit f6fc63f

File tree

10 files changed

+282
-230
lines changed

10 files changed

+282
-230
lines changed

Jetcaster/wear/src/main/java/com/example/jetcaster/WearApp.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ import androidx.lifecycle.viewmodel.compose.viewModel
2424
import androidx.wear.compose.navigation.composable
2525
import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
2626
import androidx.wear.compose.navigation.rememberSwipeDismissableNavHostState
27+
import com.example.jetcaster.latest_episodes.LatestEpisodesScreen
28+
import com.example.jetcaster.podcasts.PodcastsScreen
29+
import com.example.jetcaster.queue.QueueScreen
2730
import com.example.jetcaster.theme.WearAppTheme
2831
import com.example.jetcaster.ui.Episode
2932
import com.example.jetcaster.ui.JetcasterNavController.navigateToEpisode
@@ -38,10 +41,7 @@ import com.example.jetcaster.ui.PodcastDetails
3841
import com.example.jetcaster.ui.UpNext
3942
import com.example.jetcaster.ui.YourPodcasts
4043
import com.example.jetcaster.ui.episode.EpisodeScreen
41-
import com.example.jetcaster.ui.home.HomeScreen
42-
import com.example.jetcaster.ui.library.LatestEpisodesScreen
43-
import com.example.jetcaster.ui.library.PodcastsScreen
44-
import com.example.jetcaster.ui.library.QueueScreen
44+
import com.example.jetcaster.ui.library.LibraryScreen
4545
import com.example.jetcaster.ui.player.PlaybackSpeedScreen
4646
import com.example.jetcaster.ui.player.PlayerScreen
4747
import com.example.jetcaster.ui.podcast.PodcastDetailsScreen
@@ -78,10 +78,10 @@ fun WearApp() {
7878
)
7979
},
8080
libraryScreen = {
81-
HomeScreen(
81+
LibraryScreen(
8282
onLatestEpisodeClick = { navController.navigateToLatestEpisode() },
8383
onYourPodcastClick = { navController.navigateToYourPodcast() },
84-
onUpNextClick = { navController.navigateToUpNext() }
84+
onUpNextClick = { navController.navigateToUpNext() },
8585
)
8686
},
8787
categoryEntityScreen = { _, _ -> },

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/library/LatestEpisodeViewModel.kt renamed to Jetcaster/wear/src/main/java/com/example/jetcaster/latest_episodes/LatestEpisodeViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.jetcaster.ui.library
17+
package com.example.jetcaster.latest_episodes
1818

1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.viewModelScope

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/library/LatestEpisodesScreen.kt renamed to Jetcaster/wear/src/main/java/com/example/jetcaster/latest_episodes/LatestEpisodesScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.jetcaster.ui.library
17+
package com.example.jetcaster.latest_episodes
1818

1919
import androidx.compose.foundation.layout.padding
2020
import androidx.compose.material.icons.Icons

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/library/PodcastsScreen.kt renamed to Jetcaster/wear/src/main/java/com/example/jetcaster/podcasts/PodcastsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.jetcaster.ui.library
17+
package com.example.jetcaster.podcasts
1818

1919
import androidx.compose.foundation.layout.Column
2020
import androidx.compose.foundation.layout.Row

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/library/PodcastsViewModel.kt renamed to Jetcaster/wear/src/main/java/com/example/jetcaster/podcasts/PodcastsViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.jetcaster.ui.library
17+
package com.example.jetcaster.podcasts
1818

1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.viewModelScope

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/library/QueueScreen.kt renamed to Jetcaster/wear/src/main/java/com/example/jetcaster/queue/QueueScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.jetcaster.ui.library
17+
package com.example.jetcaster.queue
1818

1919
import androidx.compose.foundation.layout.Arrangement
2020
import androidx.compose.foundation.layout.Row

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/library/QueueViewModel.kt renamed to Jetcaster/wear/src/main/java/com/example/jetcaster/queue/QueueViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.example.jetcaster.ui.library
17+
package com.example.jetcaster.queue
1818

1919
import androidx.lifecycle.ViewModel
2020
import androidx.lifecycle.viewModelScope

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt

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

0 commit comments

Comments
 (0)