From 36a3e2b4a45629490829a92aff73d6b84eb74dba Mon Sep 17 00:00:00 2001 From: Tristan Roux Date: Sat, 9 Feb 2019 18:26:50 +0100 Subject: [PATCH] Reworking autoplay. --- .../Resources/Portable Class/MusicPlayer.cs | 16 +- .../Resources/Portable Class/PagerFragment.cs | 4 +- MusicApp/Resources/Resource.Designer.cs | 438 +++++++++--------- MusicApp/Resources/values-fr/strings.xml | 5 +- MusicApp/Resources/values/strings.xml | 1 - 5 files changed, 241 insertions(+), 223 deletions(-) diff --git a/MusicApp/Resources/Portable Class/MusicPlayer.cs b/MusicApp/Resources/Portable Class/MusicPlayer.cs index 3131d0c..b94ad2c 100644 --- a/MusicApp/Resources/Portable Class/MusicPlayer.cs +++ b/MusicApp/Resources/Portable Class/MusicPlayer.cs @@ -336,13 +336,14 @@ namespace MusicApp.Resources.Portable_Class } autoPlay.Clear(); - GenerateAutoPlay(false); SaveQueueSlot(); Player.instance?.RefreshPlayer(); Home.instance?.AddQueue(); Queue.instance?.RefreshCurrent(); ParseNextSong(); + if (useAutoPlay) + GenerateAutoPlay(false); } public async void Play(Song song, long progress = -1, bool addToQueue = true) @@ -448,6 +449,8 @@ namespace MusicApp.Resources.Portable_Class Home.instance?.AddQueue(); Queue.instance?.RefreshCurrent(); ParseNextSong(); + if (useAutoPlay) + GenerateAutoPlay(false); } private static async Task ParseSong(Song song, int position = -1, bool startPlaybackWhenPosible = false) @@ -591,6 +594,7 @@ namespace MusicApp.Resources.Portable_Class ytPlaylistRequest.PlaylistId = video.GetVideoMixPlaylistId(); ytPlaylistRequest.MaxResults = 15; + List allSongs = new List(); var ytPlaylist = await ytPlaylistRequest.ExecuteAsync(); foreach (var item in ytPlaylist.Items) @@ -600,11 +604,15 @@ namespace MusicApp.Resources.Portable_Class Song song = new Song(item.Snippet.Title, item.Snippet.ChannelTitle, item.Snippet.Thumbnails.High.Url, item.ContentDetails.VideoId, -1, -1, item.ContentDetails.VideoId, true, false); if (!queue.Exists(x => x.YoutubeID == song.YoutubeID)) { - autoPlay.Add(song); + allSongs.Add(song); break; } } } + + Random r = new Random(); + allSongs = allSongs.OrderBy(x => r.Next()).ToList(); + autoPlay.AddRange(allSongs.GetRange(0, allSongs.Count > 5 ? 5 : allSongs.Count)); } else { @@ -643,8 +651,8 @@ namespace MusicApp.Resources.Portable_Class musicCursor.Close(); } Random r = new Random(); - List songList = allSongs.OrderBy(x => r.Next()).ToList(); - autoPlay.AddRange(songList.GetRange(0, songList.Count > 15 ? 15 : songList.Count)); + allSongs = allSongs.OrderBy(x => r.Next()).ToList(); + autoPlay.AddRange(allSongs.GetRange(0, allSongs.Count > 5 ? 5 : allSongs.Count)); } Random random = new Random(); diff --git a/MusicApp/Resources/Portable Class/PagerFragment.cs b/MusicApp/Resources/Portable Class/PagerFragment.cs index f2f83d7..68f5e58 100644 --- a/MusicApp/Resources/Portable Class/PagerFragment.cs +++ b/MusicApp/Resources/Portable Class/PagerFragment.cs @@ -76,7 +76,7 @@ namespace MusicApp.Resources.Portable_Class else if (type == 1) { tabs.AddTab(tabs.NewTab().SetText(Resources.GetString(Resource.String.all))); - tabs.AddTab(tabs.NewTab().SetText(Resources.GetString(Resource.String.tracks))); + tabs.AddTab(tabs.NewTab().SetText(Resources.GetString(Resource.String.songs))); tabs.AddTab(tabs.NewTab().SetText(Resources.GetString(Resource.String.playlists))); tabs.AddTab(tabs.NewTab().SetText(Resources.GetString(Resource.String.lives))); tabs.AddTab(tabs.NewTab().SetText(Resources.GetString(Resource.String.channels))); @@ -84,7 +84,7 @@ namespace MusicApp.Resources.Portable_Class ViewPagerAdapter adapter = new ViewPagerAdapter(ChildFragmentManager); Fragment[] fragment = YoutubeEngine.NewInstances(query); adapter.AddFragment(fragment[0], Resources.GetString(Resource.String.all)); - adapter.AddFragment(fragment[1], Resources.GetString(Resource.String.tracks)); + adapter.AddFragment(fragment[1], Resources.GetString(Resource.String.songs)); adapter.AddFragment(fragment[2], Resources.GetString(Resource.String.playlists)); adapter.AddFragment(fragment[3], Resources.GetString(Resource.String.lives)); adapter.AddFragment(fragment[4], Resources.GetString(Resource.String.channels)); diff --git a/MusicApp/Resources/Resource.Designer.cs b/MusicApp/Resources/Resource.Designer.cs index 7b79ab7..6a1afb5 100644 --- a/MusicApp/Resources/Resource.Designer.cs +++ b/MusicApp/Resources/Resource.Designer.cs @@ -7177,14 +7177,14 @@ namespace MusicApp // aapt resource value: 0x7f0c0072 public const int abc_toolbar_collapse_description = 2131492978; - // aapt resource value: 0x7f0c0124 - public const int add = 2131493156; + // aapt resource value: 0x7f0c0128 + public const int add = 2131493160; - // aapt resource value: 0x7f0c00fb - public const int add_playlist = 2131493115; + // aapt resource value: 0x7f0c00fa + public const int add_playlist = 2131493114; - // aapt resource value: 0x7f0c010a - public const int add_playlist_msg = 2131493130; + // aapt resource value: 0x7f0c0109 + public const int add_playlist_msg = 2131493129; // aapt resource value: 0x7f0c00dc public const int add_to_library = 2131493084; @@ -7195,29 +7195,29 @@ namespace MusicApp // aapt resource value: 0x7f0c00d6 public const int add_to_queue = 2131493078; - // aapt resource value: 0x7f0c0114 - public const int album = 2131493140; + // aapt resource value: 0x7f0c0113 + public const int album = 2131493139; // aapt resource value: 0x7f0c00e8 public const int all = 2131493096; - // aapt resource value: 0x7f0c012b - public const int and = 2131493163; + // aapt resource value: 0x7f0c012f + public const int and = 2131493167; - // aapt resource value: 0x7f0c012c - public const int and_more = 2131493164; + // aapt resource value: 0x7f0c0130 + public const int and_more = 2131493168; // aapt resource value: 0x7f0c0080 public const int appbar_scrolling_view_behavior = 2131492992; - // aapt resource value: 0x7f0c0132 - public const int appearances = 2131493170; + // aapt resource value: 0x7f0c0136 + public const int appearances = 2131493174; - // aapt resource value: 0x7f0c0121 - public const int apply = 2131493153; + // aapt resource value: 0x7f0c0125 + public const int apply = 2131493157; - // aapt resource value: 0x7f0c0113 - public const int artist = 2131493139; + // aapt resource value: 0x7f0c0112 + public const int artist = 2131493138; // aapt resource value: 0x7f0c00c7 public const int autoplay = 2131493063; @@ -7225,11 +7225,11 @@ namespace MusicApp // aapt resource value: 0x7f0c00c8 public const int autoplay_desc = 2131493064; - // aapt resource value: 0x7f0c0128 - public const int behavior = 2131493160; + // aapt resource value: 0x7f0c012c + public const int behavior = 2131493164; - // aapt resource value: 0x7f0c0149 - public const int beta_available = 2131493193; + // aapt resource value: 0x7f0c014d + public const int beta_available = 2131493197; // aapt resource value: 0x7f0c0081 public const int bottom_sheet_behavior = 2131492993; @@ -7237,17 +7237,17 @@ namespace MusicApp // aapt resource value: 0x7f0c00b3 public const int browse = 2131493043; - // aapt resource value: 0x7f0c0122 - public const int cancel = 2131493154; + // aapt resource value: 0x7f0c0126 + public const int cancel = 2131493158; - // aapt resource value: 0x7f0c014f - public const int cancelling = 2131493199; + // aapt resource value: 0x7f0c0153 + public const int cancelling = 2131493203; - // aapt resource value: 0x7f0c00f1 - public const int cant_delete = 2131493105; + // aapt resource value: 0x7f0c00f0 + public const int cant_delete = 2131493104; - // aapt resource value: 0x7f0c014c - public const int cant_play_non_youtube = 2131493196; + // aapt resource value: 0x7f0c0150 + public const int cant_play_non_youtube = 2131493200; // aapt resource value: 0x7f0c00b8 public const int cast = 2131493048; @@ -7330,11 +7330,11 @@ namespace MusicApp // aapt resource value: 0x7f0c0015 public const int cast_play = 2131492885; - // aapt resource value: 0x7f0c011f - public const int cast_queue_push = 2131493151; + // aapt resource value: 0x7f0c0123 + public const int cast_queue_push = 2131493155; - // aapt resource value: 0x7f0c0120 - public const int cast_queue_pushed = 2131493152; + // aapt resource value: 0x7f0c0124 + public const int cast_queue_pushed = 2131493156; // aapt resource value: 0x7f0c0016 public const int cast_rewind = 2131492886; @@ -7384,14 +7384,14 @@ namespace MusicApp // aapt resource value: 0x7f0c0025 public const int cast_unmute = 2131492901; - // aapt resource value: 0x7f0c0116 - public const int change_albumart = 2131493142; + // aapt resource value: 0x7f0c0115 + public const int change_albumart = 2131493141; - // aapt resource value: 0x7f0c011b - public const int changes_saved = 2131493147; + // aapt resource value: 0x7f0c011a + public const int changes_saved = 2131493146; - // aapt resource value: 0x7f0c00eb - public const int channels = 2131493099; + // aapt resource value: 0x7f0c00ea + public const int channels = 2131493098; // aapt resource value: 0x7f0c0082 public const int character_counter_content_description = 2131492994; @@ -7399,8 +7399,8 @@ namespace MusicApp // aapt resource value: 0x7f0c0083 public const int character_counter_pattern = 2131492995; - // aapt resource value: 0x7f0c0138 - public const int check_updates = 2131493176; + // aapt resource value: 0x7f0c013c + public const int check_updates = 2131493180; // aapt resource value: 0x7f0c00b0 public const int clientID = 2131493040; @@ -7462,8 +7462,11 @@ namespace MusicApp // aapt resource value: 0x7f0c003b public const int common_signin_button_text_long = 2131492923; - // aapt resource value: 0x7f0c010f - public const int create_local = 2131493135; + // aapt resource value: 0x7f0c0122 + public const int completed = 2131493154; + + // aapt resource value: 0x7f0c010e + public const int create_local = 2131493134; // aapt resource value: 0x7f0c00c9 public const int create_mix = 2131493065; @@ -7471,65 +7474,68 @@ namespace MusicApp // aapt resource value: 0x7f0c00cd public const int create_mix_from_song = 2131493069; - // aapt resource value: 0x7f0c010b - public const int create_playlist = 2131493131; - - // aapt resource value: 0x7f0c0111 - public const int create_synced = 2131493137; + // aapt resource value: 0x7f0c010a + public const int create_playlist = 2131493130; // aapt resource value: 0x7f0c0110 - public const int create_youtube = 2131493136; + public const int create_synced = 2131493136; - // aapt resource value: 0x7f0c0136 - public const int dark_theme = 2131493174; + // aapt resource value: 0x7f0c010f + public const int create_youtube = 2131493135; + + // aapt resource value: 0x7f0c013a + public const int dark_theme = 2131493178; // aapt resource value: 0x7f0c00d8 public const int delete = 2131493080; - // aapt resource value: 0x7f0c0106 - public const int delete_playlist = 2131493126; + // aapt resource value: 0x7f0c0105 + public const int delete_playlist = 2131493125; - // aapt resource value: 0x7f0c011e - public const int deleted_file = 2131493150; + // aapt resource value: 0x7f0c011d + public const int deleted_file = 2131493149; // aapt resource value: 0x7f0c00d0 public const int download = 2131493072; + // aapt resource value: 0x7f0c0117 + public const int download_albumart = 2131493143; + + // aapt resource value: 0x7f0c0132 + public const int download_directory = 2131493170; + // aapt resource value: 0x7f0c0118 - public const int download_albumart = 2131493144; - - // aapt resource value: 0x7f0c012e - public const int download_directory = 2131493166; - - // aapt resource value: 0x7f0c0119 - public const int download_meta = 2131493145; - - // aapt resource value: 0x7f0c00ed - public const int download_path_error = 2131493101; + public const int download_meta = 2131493144; // aapt resource value: 0x7f0c00ec - public const int download_path_not_set = 2131493100; + public const int download_path_error = 2131493100; - // aapt resource value: 0x7f0c011d - public const int download_queue = 2131493149; + // aapt resource value: 0x7f0c00eb + public const int download_path_not_set = 2131493099; - // aapt resource value: 0x7f0c00ef - public const int downloading = 2131493103; + // aapt resource value: 0x7f0c011c + public const int download_queue = 2131493148; - // aapt resource value: 0x7f0c014d - public const int downloading_notification = 2131493197; + // aapt resource value: 0x7f0c00ee + public const int downloading = 2131493102; - // aapt resource value: 0x7f0c014a - public const int downloading_update = 2131493194; + // aapt resource value: 0x7f0c0151 + public const int downloading_notification = 2131493201; + + // aapt resource value: 0x7f0c0120 + public const int downloading_status = 2131493152; + + // aapt resource value: 0x7f0c014e + public const int downloading_update = 2131493198; // aapt resource value: 0x7f0c00cf public const int edit_metadata = 2131493071; - // aapt resource value: 0x7f0c00ff - public const int element = 2131493119; + // aapt resource value: 0x7f0c00fe + public const int element = 2131493118; - // aapt resource value: 0x7f0c0100 - public const int elements = 2131493120; + // aapt resource value: 0x7f0c00ff + public const int elements = 2131493119; // aapt resource value: 0x7f0c0090 public const int exo_controls_fastforward_description = 2131493008; @@ -7645,8 +7651,8 @@ namespace MusicApp // aapt resource value: 0x7f0c00e6 public const int folders = 2131493094; - // aapt resource value: 0x7f0c012a - public const int genre_nothing = 2131493162; + // aapt resource value: 0x7f0c012e + public const int genre_nothing = 2131493166; // aapt resource value: 0x7f0c0086 public const int hide_bottom_view_on_scroll_behavior = 2131492998; @@ -7660,38 +7666,44 @@ namespace MusicApp // aapt resource value: 0x7f0c00c3 public const int hours = 2131493059; - // aapt resource value: 0x7f0c0125 - public const int later = 2131493157; + // aapt resource value: 0x7f0c011e + public const int initialization = 2131493150; + + // aapt resource value: 0x7f0c0129 + public const int later = 2131493161; // aapt resource value: 0x7f0c00d3 public const int list_songs = 2131493075; - // aapt resource value: 0x7f0c00ea - public const int lives = 2131493098; + // aapt resource value: 0x7f0c00e9 + public const int lives = 2131493097; - // aapt resource value: 0x7f0c00fd - public const int local_playlist_empty = 2131493117; + // aapt resource value: 0x7f0c00fc + public const int local_playlist_empty = 2131493116; - // aapt resource value: 0x7f0c00f9 - public const int local_playlists = 2131493113; + // aapt resource value: 0x7f0c00f8 + public const int local_playlists = 2131493112; - // aapt resource value: 0x7f0c013c - public const int log_in = 2131493180; + // aapt resource value: 0x7f0c0140 + public const int log_in = 2131493184; - // aapt resource value: 0x7f0c013d - public const int log_out = 2131493181; + // aapt resource value: 0x7f0c0141 + public const int log_out = 2131493185; - // aapt resource value: 0x7f0c013b - public const int logged_in = 2131493179; + // aapt resource value: 0x7f0c013f + public const int logged_in = 2131493183; - // aapt resource value: 0x7f0c012f - public const int max_download = 2131493167; + // aapt resource value: 0x7f0c0133 + public const int max_download = 2131493171; - // aapt resource value: 0x7f0c0130 - public const int max_download_dialog = 2131493168; + // aapt resource value: 0x7f0c0134 + public const int max_download_dialog = 2131493172; - // aapt resource value: 0x7f0c011c - public const int metdata_error_noid = 2131493148; + // aapt resource value: 0x7f0c011f + public const int metadata = 2131493151; + + // aapt resource value: 0x7f0c011b + public const int metdata_error_noid = 2131493147; // aapt resource value: 0x7f0c00c0 public const int minute = 2131493056; @@ -7777,50 +7789,50 @@ namespace MusicApp // aapt resource value: 0x7f0c0087 public const int mtrl_chip_close_icon_content_description = 2131492999; - // aapt resource value: 0x7f0c0129 - public const int music_genre = 2131493161; + // aapt resource value: 0x7f0c012d + public const int music_genre = 2131493165; // aapt resource value: 0x7f0c00e3 public const int music_genres = 2131493091; - // aapt resource value: 0x7f0c010e - public const int new_playlist = 2131493134; + // aapt resource value: 0x7f0c010d + public const int new_playlist = 2131493133; // aapt resource value: 0x7f0c00bd public const int next_loading = 2131493053; - // aapt resource value: 0x7f0c0127 - public const int no = 2131493159; - - // aapt resource value: 0x7f0c00f6 - public const int no_channel = 2131493110; + // aapt resource value: 0x7f0c012b + public const int no = 2131493163; // aapt resource value: 0x7f0c00f5 - public const int no_lives = 2131493109; - - // aapt resource value: 0x7f0c013f - public const int no_permission = 2131493183; + public const int no_channel = 2131493109; // aapt resource value: 0x7f0c00f4 - public const int no_playlist = 2131493108; + public const int no_lives = 2131493108; - // aapt resource value: 0x7f0c00f2 - public const int no_result = 2131493106; + // aapt resource value: 0x7f0c0143 + public const int no_permission = 2131493187; + + // aapt resource value: 0x7f0c00f3 + public const int no_playlist = 2131493107; + + // aapt resource value: 0x7f0c00f1 + public const int no_result = 2131493105; // aapt resource value: 0x7f0c00e7 public const int no_song = 2131493095; - // aapt resource value: 0x7f0c0140 - public const int no_song_mix = 2131493184; - - // aapt resource value: 0x7f0c00f3 - public const int no_track = 2131493107; - - // aapt resource value: 0x7f0c013a - public const int not_log = 2131493178; - // aapt resource value: 0x7f0c0144 - public const int not_streamable = 2131493188; + public const int no_song_mix = 2131493188; + + // aapt resource value: 0x7f0c00f2 + public const int no_track = 2131493106; + + // aapt resource value: 0x7f0c013e + public const int not_log = 2131493182; + + // aapt resource value: 0x7f0c0148 + public const int not_streamable = 2131493192; // aapt resource value: 0x7f0c00bc public const int nothing = 2131493052; @@ -7828,11 +7840,11 @@ namespace MusicApp // aapt resource value: 0x7f0c00bf public const int off = 2131493055; - // aapt resource value: 0x7f0c0123 - public const int ok = 2131493155; + // aapt resource value: 0x7f0c0127 + public const int ok = 2131493159; - // aapt resource value: 0x7f0c0137 - public const int others = 2131493175; + // aapt resource value: 0x7f0c013b + public const int others = 2131493179; // aapt resource value: 0x7f0c0088 public const int password_toggle_content_description = 2131493000; @@ -7852,8 +7864,8 @@ namespace MusicApp // aapt resource value: 0x7f0c00c5 public const int paused = 2131493061; - // aapt resource value: 0x7f0c0117 - public const int pick_album_local = 2131493143; + // aapt resource value: 0x7f0c0116 + public const int pick_album_local = 2131493142; // aapt resource value: 0x7f0c00ca public const int play = 2131493066; @@ -7870,17 +7882,17 @@ namespace MusicApp // aapt resource value: 0x7f0c00c4 public const int playing = 2131493060; - // aapt resource value: 0x7f0c0105 - public const int playlist_add_song_not_found = 2131493125; + // aapt resource value: 0x7f0c0104 + public const int playlist_add_song_not_found = 2131493124; + + // aapt resource value: 0x7f0c0102 + public const int playlist_already_saved = 2131493122; + + // aapt resource value: 0x7f0c0100 + public const int playlist_empty = 2131493120; // aapt resource value: 0x7f0c0103 - public const int playlist_already_saved = 2131493123; - - // aapt resource value: 0x7f0c0101 - public const int playlist_empty = 2131493121; - - // aapt resource value: 0x7f0c0104 - public const int playlist_not_found = 2131493124; + public const int playlist_not_found = 2131493123; // aapt resource value: 0x7f0c00b4 public const int playlists = 2131493044; @@ -7894,8 +7906,8 @@ namespace MusicApp // aapt resource value: 0x7f0c00e4 public const int recommendation_explanation = 2131493092; - // aapt resource value: 0x7f0c00f8 - public const int remove = 2131493112; + // aapt resource value: 0x7f0c00f7 + public const int remove = 2131493111; // aapt resource value: 0x7f0c00d2 public const int remove_from_playlist = 2131493074; @@ -7903,11 +7915,11 @@ namespace MusicApp // aapt resource value: 0x7f0c00d1 public const int remove_from_queue = 2131493073; - // aapt resource value: 0x7f0c00f7 - public const int remove_search = 2131493111; + // aapt resource value: 0x7f0c00f6 + public const int remove_search = 2131493110; - // aapt resource value: 0x7f0c0102 - public const int removed_from_playlist = 2131493122; + // aapt resource value: 0x7f0c0101 + public const int removed_from_playlist = 2131493121; // aapt resource value: 0x7f0c00c6 public const int removed_from_queue = 2131493062; @@ -7915,23 +7927,23 @@ namespace MusicApp // aapt resource value: 0x7f0c00d7 public const int rename = 2131493079; - // aapt resource value: 0x7f0c0107 - public const int rename_playlist = 2131493127; + // aapt resource value: 0x7f0c0106 + public const int rename_playlist = 2131493126; // aapt resource value: 0x7f0c00b5 public const int repeat = 2131493045; - // aapt resource value: 0x7f0c010d - public const int save_folder_playlist = 2131493133; - // aapt resource value: 0x7f0c010c - public const int save_playlist = 2131493132; + public const int save_folder_playlist = 2131493132; + + // aapt resource value: 0x7f0c010b + public const int save_playlist = 2131493131; // aapt resource value: 0x7f0c0073 public const int search_menu_title = 2131492979; - // aapt resource value: 0x7f0c00ee - public const int set_path = 2131493102; + // aapt resource value: 0x7f0c00ed + public const int set_path = 2131493101; // aapt resource value: 0x7f0c00b9 public const int settings = 2131493049; @@ -7957,8 +7969,8 @@ namespace MusicApp // aapt resource value: 0x7f0c00db public const int stop_sync = 2131493083; - // aapt resource value: 0x7f0c0108 - public const int stop_syncing = 2131493128; + // aapt resource value: 0x7f0c0107 + public const int stop_syncing = 2131493127; // aapt resource value: 0x7f0c003d public const int summary_collapsed_preference_list = 2131492925; @@ -7969,62 +7981,62 @@ namespace MusicApp // aapt resource value: 0x7f0c00da public const int sync_now = 2131493082; - // aapt resource value: 0x7f0c0131 - public const int sync_remove = 2131493169; + // aapt resource value: 0x7f0c0135 + public const int sync_remove = 2131493173; - // aapt resource value: 0x7f0c00f0 - public const int syncing = 2131493104; + // aapt resource value: 0x7f0c00ef + public const int syncing = 2131493103; - // aapt resource value: 0x7f0c014e - public const int tap_details = 2131493198; + // aapt resource value: 0x7f0c0152 + public const int tap_details = 2131493202; - // aapt resource value: 0x7f0c0133 - public const int theme = 2131493171; + // aapt resource value: 0x7f0c0137 + public const int theme = 2131493175; - // aapt resource value: 0x7f0c0134 - public const int theme_dialog = 2131493172; + // aapt resource value: 0x7f0c0138 + public const int theme_dialog = 2131493176; + + // aapt resource value: 0x7f0c0146 + public const int timout = 2131493190; + + // aapt resource value: 0x7f0c0111 + public const int title = 2131493137; // aapt resource value: 0x7f0c0142 - public const int timout = 2131493186; + public const int undo = 2131493186; - // aapt resource value: 0x7f0c0112 - public const int title = 2131493138; - - // aapt resource value: 0x7f0c00e9 - public const int tracks = 2131493097; - - // aapt resource value: 0x7f0c013e - public const int undo = 2131493182; - - // aapt resource value: 0x7f0c011a - public const int undo_change = 2131493146; + // aapt resource value: 0x7f0c0119 + public const int undo_change = 2131493145; // aapt resource value: 0x7f0c00dd public const int unfork = 2131493085; - // aapt resource value: 0x7f0c0109 - public const int unfork_playlist = 2131493129; + // aapt resource value: 0x7f0c0108 + public const int unfork_playlist = 2131493128; - // aapt resource value: 0x7f0c0143 - public const int unknow = 2131493187; + // aapt resource value: 0x7f0c0147 + public const int unknow = 2131493191; // aapt resource value: 0x7f0c00bb public const int up_next = 2131493051; - // aapt resource value: 0x7f0c0148 - public const int up_to_date = 2131493192; + // aapt resource value: 0x7f0c014c + public const int up_to_date = 2131493196; - // aapt resource value: 0x7f0c0146 - public const int update = 2131493190; + // aapt resource value: 0x7f0c0121 + public const int up_to_date_status = 2131493153; - // aapt resource value: 0x7f0c0147 - public const int update_message = 2131493191; - - // aapt resource value: 0x7f0c0145 - public const int update_no_internet = 2131493189; + // aapt resource value: 0x7f0c014a + public const int update = 2131493194; // aapt resource value: 0x7f0c014b - public const int updating = 2131493195; + public const int update_message = 2131493195; + + // aapt resource value: 0x7f0c0149 + public const int update_no_internet = 2131493193; + + // aapt resource value: 0x7f0c014f + public const int updating = 2131493199; // aapt resource value: 0x7f0c003e public const int v7_preference_off = 2131492926; @@ -8032,35 +8044,35 @@ namespace MusicApp // aapt resource value: 0x7f0c003f public const int v7_preference_on = 2131492927; + // aapt resource value: 0x7f0c013d + public const int version = 2131493181; + + // aapt resource value: 0x7f0c0131 + public const int volume = 2131493169; + // aapt resource value: 0x7f0c0139 - public const int version = 2131493177; + public const int white_theme = 2131493177; - // aapt resource value: 0x7f0c012d - public const int volume = 2131493165; + // aapt resource value: 0x7f0c012a + public const int yes = 2131493162; - // aapt resource value: 0x7f0c0135 - public const int white_theme = 2131493173; + // aapt resource value: 0x7f0c0145 + public const int youtube_endpoint = 2131493189; - // aapt resource value: 0x7f0c0126 - public const int yes = 2131493158; + // aapt resource value: 0x7f0c00fb + public const int youtube_loading_error = 2131493115; - // aapt resource value: 0x7f0c0141 - public const int youtube_endpoint = 2131493185; + // aapt resource value: 0x7f0c00fd + public const int youtube_playlist_empty = 2131493117; - // aapt resource value: 0x7f0c00fc - public const int youtube_loading_error = 2131493116; - - // aapt resource value: 0x7f0c00fe - public const int youtube_playlist_empty = 2131493118; - - // aapt resource value: 0x7f0c00fa - public const int youtube_playlists = 2131493114; + // aapt resource value: 0x7f0c00f9 + public const int youtube_playlists = 2131493113; // aapt resource value: 0x7f0c00b6 public const int youtube_search = 2131493046; - // aapt resource value: 0x7f0c0115 - public const int youtubeid = 2131493141; + // aapt resource value: 0x7f0c0114 + public const int youtubeid = 2131493140; static String() { diff --git a/MusicApp/Resources/values-fr/strings.xml b/MusicApp/Resources/values-fr/strings.xml index f8a218b..256006d 100644 --- a/MusicApp/Resources/values-fr/strings.xml +++ b/MusicApp/Resources/values-fr/strings.xml @@ -49,7 +49,7 @@ Lire dans l\'ordre Lecture aléatoire Ajouter a la liste de lecture - Renomer + Renommer Supprimer Synchronizer la playlist Synchronizer maintenant @@ -73,7 +73,6 @@ Tous - Titre Playlists Lives Chaines @@ -95,7 +94,7 @@ Playlists locales Playlists youtubes AJOUTER UNE PLAYLIST - Erreur de chargement. \nVerifiez avoir séléction un compte et votre connection internet. + Erreur de chargement. \nVerifiez avoir séléctionné un compte et votre connection internet. Vous n\'avez aucune playlist sur cet appareil. Vous n\'avez aucune playlist sur ce compte youtube \nAttention : Seulement les playlists présentes sur votre compte google sont affichées. titre diff --git a/MusicApp/Resources/values/strings.xml b/MusicApp/Resources/values/strings.xml index 84da252..724d5df 100644 --- a/MusicApp/Resources/values/strings.xml +++ b/MusicApp/Resources/values/strings.xml @@ -73,7 +73,6 @@ All - Tracks Playlists Lives Channels