-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
28 changed files
with
684 additions
and
935 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
app/src/main/java/com/ztftrue/music/sqlData/IntArrayConverters.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
app/src/main/java/com/ztftrue/music/ui/home/BaseLayout.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| package com.ztftrue.music.ui.home | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.key | ||
| import androidx.media3.common.util.UnstableApi | ||
| import androidx.navigation.NavHostController | ||
| import androidx.navigation.compose.NavHost | ||
| import androidx.navigation.compose.composable | ||
| import androidx.navigation.compose.rememberNavController | ||
| import com.ztftrue.music.MainActivity | ||
| import com.ztftrue.music.MusicViewModel | ||
| import com.ztftrue.music.Router | ||
| import com.ztftrue.music.ui.other.EditTrackPage | ||
| import com.ztftrue.music.ui.other.SearchPage | ||
| import com.ztftrue.music.ui.other.SettingsPage | ||
| import com.ztftrue.music.ui.other.TracksSelectPage | ||
| import com.ztftrue.music.ui.play.PlayingPage | ||
| import com.ztftrue.music.ui.public.QueuePage | ||
| import com.ztftrue.music.ui.public.TracksListPage | ||
| import com.ztftrue.music.utils.stringToEnumForPlayListType | ||
|
|
||
| @androidx.annotation.OptIn(UnstableApi::class) | ||
| @Composable | ||
| fun BaseLayout( | ||
| musicViewModel: MusicViewModel, | ||
| activity: MainActivity | ||
| ) { | ||
| val navController: NavHostController = rememberNavController() | ||
| musicViewModel.navController = navController | ||
| NavHost( | ||
| navController = navController, startDestination = Router.MainView.route, | ||
| ) { | ||
| composable(route = Router.MainView.route) { | ||
| key(Unit) { | ||
| if(musicViewModel.mainTabList.isNotEmpty()){ | ||
| MainView(musicViewModel, activity, navController) | ||
| } | ||
| } | ||
| } | ||
| composable( | ||
| route = Router.MusicPlayerView.route, | ||
| ) { _ -> | ||
| key(Unit) { | ||
| PlayingPage(navController, viewModel = musicViewModel) | ||
| } | ||
| } | ||
| composable( | ||
| route = Router.PlayListView.withArgs("{id}", "{itemType}"), arguments = listOf(), | ||
| ) { backStackEntry -> | ||
| val arg = backStackEntry.arguments | ||
| key(Unit) { | ||
| if (arg != null) { | ||
| TracksListPage( | ||
| musicViewModel = musicViewModel, | ||
| navController, | ||
| stringToEnumForPlayListType(arg.getString("itemType") ?: ""), | ||
| arg.getString("id")?.toLong() ?: 0 | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| composable( | ||
| route = Router.TracksSelectPage.withArgs("{id}", "{name}"), arguments = listOf(), | ||
| ) { backStackEntry -> | ||
| val arg = backStackEntry.arguments | ||
| key(Unit) { | ||
| if (arg != null) { | ||
| TracksSelectPage( | ||
| musicViewModel = musicViewModel, | ||
| navController, | ||
| arg.getString("name"), | ||
| arg.getString("id")?.toLong() | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| composable( | ||
| route = Router.EditTrackPage.withArgs("{id}"), arguments = listOf(), | ||
| ) { backStackEntry -> | ||
| val arg = backStackEntry.arguments | ||
| key(Unit) { | ||
| if (arg != null) { | ||
| val id = arg.getString("id")?.toLong() | ||
| if (id != null) { | ||
| EditTrackPage( | ||
| musicViewModel = musicViewModel, | ||
| navController, | ||
| id | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| composable( | ||
| route = Router.SettingsPage.route, arguments = listOf(), | ||
| ) { _ -> | ||
| key(Unit) { | ||
| SettingsPage( | ||
| musicViewModel = musicViewModel, | ||
| navController, | ||
| ) | ||
| } | ||
| } | ||
| composable( | ||
| route = Router.QueuePage.route, arguments = listOf(), | ||
| ) { _ -> | ||
| key(Unit) { | ||
| QueuePage( | ||
| musicViewModel = musicViewModel, | ||
| navController, | ||
| ) | ||
| } | ||
| } | ||
| composable( | ||
| route = Router.SearchPage.route, arguments = listOf(), | ||
| ) { _ -> | ||
| key(Unit) { | ||
| SearchPage( | ||
| musicViewModel = musicViewModel, | ||
| navController, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.