ux: home 'Import music' opens import dialog directly instead of navigating to Library
This commit is contained in:
parent
c0aea3eabc
commit
153a132656
288 changed files with 136 additions and 56 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -425,33 +425,33 @@ public final class DaggerRadAmpApp_HiltComponents_SingletonC {
|
||||||
|
|
||||||
@IdentifierNameString
|
@IdentifierNameString
|
||||||
private static final class LazyClassKeyProvider {
|
private static final class LazyClassKeyProvider {
|
||||||
static String com_rada_ui_streams_StreamsViewModel = "com.rada.ui.streams.StreamsViewModel";
|
static String com_rada_ui_playlists_PlaylistManagerViewModel = "com.rada.ui.playlists.PlaylistManagerViewModel";
|
||||||
|
|
||||||
static String com_rada_ui_library_LibraryViewModel = "com.rada.ui.library.LibraryViewModel";
|
static String com_rada_ui_library_LibraryViewModel = "com.rada.ui.library.LibraryViewModel";
|
||||||
|
|
||||||
static String com_rada_ui_player_PlayerViewModel = "com.rada.ui.player.PlayerViewModel";
|
static String com_rada_ui_streams_StreamsViewModel = "com.rada.ui.streams.StreamsViewModel";
|
||||||
|
|
||||||
static String com_rada_ui_playlists_PlaylistManagerViewModel = "com.rada.ui.playlists.PlaylistManagerViewModel";
|
|
||||||
|
|
||||||
static String com_rada_ui_player_NowPlayingViewModel = "com.rada.ui.player.NowPlayingViewModel";
|
static String com_rada_ui_player_NowPlayingViewModel = "com.rada.ui.player.NowPlayingViewModel";
|
||||||
|
|
||||||
|
static String com_rada_ui_player_PlayerViewModel = "com.rada.ui.player.PlayerViewModel";
|
||||||
|
|
||||||
static String com_rada_ui_stations_StationBrowserViewModel = "com.rada.ui.stations.StationBrowserViewModel";
|
static String com_rada_ui_stations_StationBrowserViewModel = "com.rada.ui.stations.StationBrowserViewModel";
|
||||||
|
|
||||||
@KeepFieldType
|
|
||||||
StreamsViewModel com_rada_ui_streams_StreamsViewModel2;
|
|
||||||
|
|
||||||
@KeepFieldType
|
|
||||||
LibraryViewModel com_rada_ui_library_LibraryViewModel2;
|
|
||||||
|
|
||||||
@KeepFieldType
|
|
||||||
PlayerViewModel com_rada_ui_player_PlayerViewModel2;
|
|
||||||
|
|
||||||
@KeepFieldType
|
@KeepFieldType
|
||||||
PlaylistManagerViewModel com_rada_ui_playlists_PlaylistManagerViewModel2;
|
PlaylistManagerViewModel com_rada_ui_playlists_PlaylistManagerViewModel2;
|
||||||
|
|
||||||
|
@KeepFieldType
|
||||||
|
LibraryViewModel com_rada_ui_library_LibraryViewModel2;
|
||||||
|
|
||||||
|
@KeepFieldType
|
||||||
|
StreamsViewModel com_rada_ui_streams_StreamsViewModel2;
|
||||||
|
|
||||||
@KeepFieldType
|
@KeepFieldType
|
||||||
NowPlayingViewModel com_rada_ui_player_NowPlayingViewModel2;
|
NowPlayingViewModel com_rada_ui_player_NowPlayingViewModel2;
|
||||||
|
|
||||||
|
@KeepFieldType
|
||||||
|
PlayerViewModel com_rada_ui_player_PlayerViewModel2;
|
||||||
|
|
||||||
@KeepFieldType
|
@KeepFieldType
|
||||||
StationBrowserViewModel com_rada_ui_stations_StationBrowserViewModel2;
|
StationBrowserViewModel com_rada_ui_stations_StationBrowserViewModel2;
|
||||||
}
|
}
|
||||||
|
|
@ -509,26 +509,26 @@ public final class DaggerRadAmpApp_HiltComponents_SingletonC {
|
||||||
|
|
||||||
@IdentifierNameString
|
@IdentifierNameString
|
||||||
private static final class LazyClassKeyProvider {
|
private static final class LazyClassKeyProvider {
|
||||||
static String com_rada_ui_stations_StationBrowserViewModel = "com.rada.ui.stations.StationBrowserViewModel";
|
|
||||||
|
|
||||||
static String com_rada_ui_library_LibraryViewModel = "com.rada.ui.library.LibraryViewModel";
|
static String com_rada_ui_library_LibraryViewModel = "com.rada.ui.library.LibraryViewModel";
|
||||||
|
|
||||||
static String com_rada_ui_streams_StreamsViewModel = "com.rada.ui.streams.StreamsViewModel";
|
static String com_rada_ui_stations_StationBrowserViewModel = "com.rada.ui.stations.StationBrowserViewModel";
|
||||||
|
|
||||||
|
static String com_rada_ui_playlists_PlaylistManagerViewModel = "com.rada.ui.playlists.PlaylistManagerViewModel";
|
||||||
|
|
||||||
static String com_rada_ui_player_PlayerViewModel = "com.rada.ui.player.PlayerViewModel";
|
static String com_rada_ui_player_PlayerViewModel = "com.rada.ui.player.PlayerViewModel";
|
||||||
|
|
||||||
static String com_rada_ui_player_NowPlayingViewModel = "com.rada.ui.player.NowPlayingViewModel";
|
static String com_rada_ui_player_NowPlayingViewModel = "com.rada.ui.player.NowPlayingViewModel";
|
||||||
|
|
||||||
static String com_rada_ui_playlists_PlaylistManagerViewModel = "com.rada.ui.playlists.PlaylistManagerViewModel";
|
static String com_rada_ui_streams_StreamsViewModel = "com.rada.ui.streams.StreamsViewModel";
|
||||||
|
|
||||||
@KeepFieldType
|
|
||||||
StationBrowserViewModel com_rada_ui_stations_StationBrowserViewModel2;
|
|
||||||
|
|
||||||
@KeepFieldType
|
@KeepFieldType
|
||||||
LibraryViewModel com_rada_ui_library_LibraryViewModel2;
|
LibraryViewModel com_rada_ui_library_LibraryViewModel2;
|
||||||
|
|
||||||
@KeepFieldType
|
@KeepFieldType
|
||||||
StreamsViewModel com_rada_ui_streams_StreamsViewModel2;
|
StationBrowserViewModel com_rada_ui_stations_StationBrowserViewModel2;
|
||||||
|
|
||||||
|
@KeepFieldType
|
||||||
|
PlaylistManagerViewModel com_rada_ui_playlists_PlaylistManagerViewModel2;
|
||||||
|
|
||||||
@KeepFieldType
|
@KeepFieldType
|
||||||
PlayerViewModel com_rada_ui_player_PlayerViewModel2;
|
PlayerViewModel com_rada_ui_player_PlayerViewModel2;
|
||||||
|
|
@ -537,7 +537,7 @@ public final class DaggerRadAmpApp_HiltComponents_SingletonC {
|
||||||
NowPlayingViewModel com_rada_ui_player_NowPlayingViewModel2;
|
NowPlayingViewModel com_rada_ui_player_NowPlayingViewModel2;
|
||||||
|
|
||||||
@KeepFieldType
|
@KeepFieldType
|
||||||
PlaylistManagerViewModel com_rada_ui_playlists_PlaylistManagerViewModel2;
|
StreamsViewModel com_rada_ui_streams_StreamsViewModel2;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SwitchingProvider<T> implements Provider<T> {
|
private static final class SwitchingProvider<T> implements Provider<T> {
|
||||||
|
|
@ -568,7 +568,7 @@ public final class DaggerRadAmpApp_HiltComponents_SingletonC {
|
||||||
return (T) new NowPlayingViewModel(singletonCImpl.providePlaybackManagerProvider.get());
|
return (T) new NowPlayingViewModel(singletonCImpl.providePlaybackManagerProvider.get());
|
||||||
|
|
||||||
case 2: // com.rada.ui.player.PlayerViewModel
|
case 2: // com.rada.ui.player.PlayerViewModel
|
||||||
return (T) new PlayerViewModel(singletonCImpl.providePlaybackManagerProvider.get(), singletonCImpl.provideStationRepositoryProvider.get(), singletonCImpl.providePlaylistRepositoryProvider.get());
|
return (T) new PlayerViewModel(singletonCImpl.providePlaybackManagerProvider.get(), singletonCImpl.provideStationRepositoryProvider.get(), singletonCImpl.providePlaylistRepositoryProvider.get(), singletonCImpl.songImporterProvider.get());
|
||||||
|
|
||||||
case 3: // com.rada.ui.playlists.PlaylistManagerViewModel
|
case 3: // com.rada.ui.playlists.PlaylistManagerViewModel
|
||||||
return (T) new PlaylistManagerViewModel(singletonCImpl.providePlaylistRepositoryProvider.get());
|
return (T) new PlaylistManagerViewModel(singletonCImpl.providePlaylistRepositoryProvider.get());
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package com.rada.ui.player;
|
package com.rada.ui.player;
|
||||||
|
|
||||||
import com.rada.data.repository.PlaylistRepository;
|
import com.rada.data.repository.PlaylistRepository;
|
||||||
|
import com.rada.data.repository.SongImporter;
|
||||||
import com.rada.data.repository.StationRepository;
|
import com.rada.data.repository.StationRepository;
|
||||||
import com.rada.player.PlaybackManager;
|
import com.rada.player.PlaybackManager;
|
||||||
import dagger.internal.DaggerGenerated;
|
import dagger.internal.DaggerGenerated;
|
||||||
|
|
@ -32,27 +33,33 @@ public final class PlayerViewModel_Factory implements Factory<PlayerViewModel> {
|
||||||
|
|
||||||
private final Provider<PlaylistRepository> playlistRepositoryProvider;
|
private final Provider<PlaylistRepository> playlistRepositoryProvider;
|
||||||
|
|
||||||
|
private final Provider<SongImporter> songImporterProvider;
|
||||||
|
|
||||||
public PlayerViewModel_Factory(Provider<PlaybackManager> playbackManagerProvider,
|
public PlayerViewModel_Factory(Provider<PlaybackManager> playbackManagerProvider,
|
||||||
Provider<StationRepository> stationRepositoryProvider,
|
Provider<StationRepository> stationRepositoryProvider,
|
||||||
Provider<PlaylistRepository> playlistRepositoryProvider) {
|
Provider<PlaylistRepository> playlistRepositoryProvider,
|
||||||
|
Provider<SongImporter> songImporterProvider) {
|
||||||
this.playbackManagerProvider = playbackManagerProvider;
|
this.playbackManagerProvider = playbackManagerProvider;
|
||||||
this.stationRepositoryProvider = stationRepositoryProvider;
|
this.stationRepositoryProvider = stationRepositoryProvider;
|
||||||
this.playlistRepositoryProvider = playlistRepositoryProvider;
|
this.playlistRepositoryProvider = playlistRepositoryProvider;
|
||||||
|
this.songImporterProvider = songImporterProvider;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PlayerViewModel get() {
|
public PlayerViewModel get() {
|
||||||
return newInstance(playbackManagerProvider.get(), stationRepositoryProvider.get(), playlistRepositoryProvider.get());
|
return newInstance(playbackManagerProvider.get(), stationRepositoryProvider.get(), playlistRepositoryProvider.get(), songImporterProvider.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PlayerViewModel_Factory create(Provider<PlaybackManager> playbackManagerProvider,
|
public static PlayerViewModel_Factory create(Provider<PlaybackManager> playbackManagerProvider,
|
||||||
Provider<StationRepository> stationRepositoryProvider,
|
Provider<StationRepository> stationRepositoryProvider,
|
||||||
Provider<PlaylistRepository> playlistRepositoryProvider) {
|
Provider<PlaylistRepository> playlistRepositoryProvider,
|
||||||
return new PlayerViewModel_Factory(playbackManagerProvider, stationRepositoryProvider, playlistRepositoryProvider);
|
Provider<SongImporter> songImporterProvider) {
|
||||||
|
return new PlayerViewModel_Factory(playbackManagerProvider, stationRepositoryProvider, playlistRepositoryProvider, songImporterProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PlayerViewModel newInstance(PlaybackManager playbackManager,
|
public static PlayerViewModel newInstance(PlaybackManager playbackManager,
|
||||||
StationRepository stationRepository, PlaylistRepository playlistRepository) {
|
StationRepository stationRepository, PlaylistRepository playlistRepository,
|
||||||
return new PlayerViewModel(playbackManager, stationRepository, playlistRepository);
|
SongImporter songImporter) {
|
||||||
|
return new PlayerViewModel(playbackManager, stationRepository, playlistRepository, songImporter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
||||||
#Mon Sep 07 11:21:10 CDT 2026
|
#Mon Sep 07 11:26:17 CDT 2026
|
||||||
path.4=12/classes.dex
|
path.4=12/classes.dex
|
||||||
path.3=11/classes.dex
|
path.3=11/classes.dex
|
||||||
path.2=10/classes.dex
|
path.2=10/classes.dex
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue