From b6dd58d89704a48c425283f463063546995a349f Mon Sep 17 00:00:00 2001 From: Anonymous Raccoon <32224410+AnonymusRaccoon@users.noreply.github.com> Date: Mon, 25 Jun 2018 16:43:23 +0200 Subject: [PATCH] Adding playlist header with a collapsing toolbar. --- MusicApp/MainActivity.cs | 7 +- .../Resources/Portable Class/FolderBrowse.cs | 3 +- .../Portable Class/PlaylistTracks.cs | 8 +- MusicApp/Resources/Resource.Designer.cs | 394 +++++++++--------- MusicApp/Resources/layout/Main.xml | 24 +- MusicApp/Resources/layout/PlaylistHeader.xml | 14 +- 6 files changed, 240 insertions(+), 210 deletions(-) diff --git a/MusicApp/MainActivity.cs b/MusicApp/MainActivity.cs index a8e7a8a..a3e886d 100644 --- a/MusicApp/MainActivity.cs +++ b/MusicApp/MainActivity.cs @@ -639,11 +639,10 @@ namespace MusicApp viewPager = pager; TabLayout tabs = FindViewById(Resource.Id.tabs); - ((AppBarLayout.LayoutParams)ToolBar.LayoutParameters).ScrollFlags = AppBarLayout.LayoutParams.ScrollFlagScroll | AppBarLayout.LayoutParams.ScrollFlagEnterAlways | AppBarLayout.LayoutParams.ScrollFlagSnap; + ((AppBarLayout.LayoutParams)FindViewById(Resource.Id.collapsingToolbar).LayoutParameters).ScrollFlags = AppBarLayout.LayoutParams.ScrollFlagScroll | AppBarLayout.LayoutParams.ScrollFlagEnterAlways | AppBarLayout.LayoutParams.ScrollFlagSnap; if (Browse.instance != null) { - Console.WriteLine("&Browse instance exist, not refreshing tabs"); pager.CurrentItem = selectedTab; tabs.SetScrollPosition(selectedTab, 0f, true); CanSwitchDelay(); @@ -682,7 +681,7 @@ namespace MusicApp viewPager = pager; TabLayout tabs = FindViewById(Resource.Id.tabs); - ((AppBarLayout.LayoutParams)ToolBar.LayoutParameters).ScrollFlags = AppBarLayout.LayoutParams.ScrollFlagScroll | AppBarLayout.LayoutParams.ScrollFlagEnterAlways | AppBarLayout.LayoutParams.ScrollFlagSnap; + ((AppBarLayout.LayoutParams)FindViewById(Resource.Id.collapsingToolbar).LayoutParameters).ScrollFlags = AppBarLayout.LayoutParams.ScrollFlagScroll | AppBarLayout.LayoutParams.ScrollFlagEnterAlways | AppBarLayout.LayoutParams.ScrollFlagSnap; if (YoutubeEngine.instances != null) { @@ -807,7 +806,7 @@ namespace MusicApp tabs.RemoveAllTabs(); tabs.Visibility = ViewStates.Gone; - ((AppBarLayout.LayoutParams)ToolBar.LayoutParameters).ScrollFlags = 0; + ((AppBarLayout.LayoutParams)FindViewById(Resource.Id.collapsingToolbar).LayoutParameters).ScrollFlags = 0; if (viewPager == null) return; diff --git a/MusicApp/Resources/Portable Class/FolderBrowse.cs b/MusicApp/Resources/Portable Class/FolderBrowse.cs index d1c2bbf..d60ebee 100644 --- a/MusicApp/Resources/Portable Class/FolderBrowse.cs +++ b/MusicApp/Resources/Portable Class/FolderBrowse.cs @@ -29,7 +29,7 @@ namespace MusicApp.Resources.Portable_Class public bool focused = false; private View view; - private string[] actions = new string[] { "List songs", "Play in order", "Add To Playlist", "Random Play" }; + private readonly string[] actions = new string[] { "List songs", "Play in order", "Add To Playlist", "Random Play" }; private bool isEmpty = false; @@ -43,6 +43,7 @@ namespace MusicApp.Resources.Portable_Class ListView.Scroll += MainActivity.instance.Scroll; ListView.ItemClick += ListView_ItemClick; ListView.ItemLongClick += ListView_ItemLongClick; + ListView.NestedScrollingEnabled = true; MainActivity.instance.contentRefresh.Refresh += OnRefresh; MainActivity.instance.OnPaddingChanged += OnPaddingChanged; diff --git a/MusicApp/Resources/Portable Class/PlaylistTracks.cs b/MusicApp/Resources/Portable Class/PlaylistTracks.cs index a2a26f6..3aefae7 100644 --- a/MusicApp/Resources/Portable Class/PlaylistTracks.cs +++ b/MusicApp/Resources/Portable Class/PlaylistTracks.cs @@ -3,6 +3,7 @@ using Android.Database; using Android.Net; using Android.OS; using Android.Provider; +using Android.Support.Design.Widget; using Android.Support.V4.App; using Android.Support.V7.App; using Android.Views; @@ -41,11 +42,12 @@ namespace MusicApp.Resources.Portable_Class ListView.EmptyView = emptyView; ListView.Scroll += MainActivity.instance.Scroll; ListView.ScrollStateChanged += ListView_ScrollStateChanged; + ListView.NestedScrollingEnabled = true; MainActivity.instance.contentRefresh.Refresh += OnRefresh; MainActivity.instance.OnPaddingChanged += OnPaddingChanged; MainActivity.instance.DisplaySearch(1); - - ListView.AddHeaderView(LayoutInflater.Inflate(Resource.Layout.PlaylistHeader, null)); + Activity.FindViewById(Resource.Id.playlistHeader).Visibility = ViewStates.Visible; + ((AppBarLayout.LayoutParams)Activity.FindViewById(Resource.Id.collapsingToolbar).LayoutParameters).ScrollFlags = AppBarLayout.LayoutParams.ScrollFlagScroll | AppBarLayout.LayoutParams.ScrollFlagEnterAlwaysCollapsed; #pragma warning disable CS4014 PopulateList(); @@ -72,6 +74,8 @@ namespace MusicApp.Resources.Portable_Class { MainActivity.instance.contentRefresh.Refresh -= OnRefresh; MainActivity.instance.OnPaddingChanged -= OnPaddingChanged; + Activity.FindViewById(Resource.Id.playlistHeader).Visibility = ViewStates.Gone; + base.OnDestroy(); instance = null; } diff --git a/MusicApp/Resources/Resource.Designer.cs b/MusicApp/Resources/Resource.Designer.cs index 8e39b5c..03b993b 100644 --- a/MusicApp/Resources/Resource.Designer.cs +++ b/MusicApp/Resources/Resource.Designer.cs @@ -3088,8 +3088,8 @@ namespace MusicApp // aapt resource value: 0x7f0a0051 public const int META = 2131361873; - // aapt resource value: 0x7f0a010c - public const int PreferenceScreen = 2131362060; + // aapt resource value: 0x7f0a0110 + public const int PreferenceScreen = 2131362064; // aapt resource value: 0x7f0a0052 public const int SHIFT = 2131361874; @@ -3097,11 +3097,11 @@ namespace MusicApp // aapt resource value: 0x7f0a0053 public const int SYM = 2131361875; - // aapt resource value: 0x7f0a010d - public const int accountPreference = 2131362061; + // aapt resource value: 0x7f0a0111 + public const int accountPreference = 2131362065; - // aapt resource value: 0x7f0a00e1 - public const int action0 = 2131362017; + // aapt resource value: 0x7f0a00e2 + public const int action0 = 2131362018; // aapt resource value: 0x7f0a009e public const int action_bar = 2131361950; @@ -3124,17 +3124,17 @@ namespace MusicApp // aapt resource value: 0x7f0a007c public const int action_bar_title = 2131361916; - // aapt resource value: 0x7f0a00de - public const int action_container = 2131362014; + // aapt resource value: 0x7f0a00df + public const int action_container = 2131362015; // aapt resource value: 0x7f0a009f public const int action_context_bar = 2131361951; - // aapt resource value: 0x7f0a00e5 - public const int action_divider = 2131362021; + // aapt resource value: 0x7f0a00e6 + public const int action_divider = 2131362022; - // aapt resource value: 0x7f0a00df - public const int action_image = 2131362015; + // aapt resource value: 0x7f0a00e0 + public const int action_image = 2131362016; // aapt resource value: 0x7f0a0003 public const int action_menu_divider = 2131361795; @@ -3151,11 +3151,11 @@ namespace MusicApp // aapt resource value: 0x7f0a007e public const int action_mode_close_button = 2131361918; - // aapt resource value: 0x7f0a00e0 - public const int action_text = 2131362016; + // aapt resource value: 0x7f0a00e1 + public const int action_text = 2131362017; - // aapt resource value: 0x7f0a00ee - public const int actions = 2131362030; + // aapt resource value: 0x7f0a00ef + public const int actions = 2131362031; // aapt resource value: 0x7f0a007f public const int activity_chooser_view_content = 2131361919; @@ -3205,11 +3205,11 @@ namespace MusicApp // aapt resource value: 0x7f0a0059 public const int bottom = 2131361881; - // aapt resource value: 0x7f0a00db - public const int bottomView = 2131362011; + // aapt resource value: 0x7f0a00dc + public const int bottomView = 2131362012; - // aapt resource value: 0x7f0a012a - public const int browseLayout = 2131362090; + // aapt resource value: 0x7f0a012e + public const int browseLayout = 2131362094; // aapt resource value: 0x7f0a00ae public const int browseList = 2131361966; @@ -3220,11 +3220,11 @@ namespace MusicApp // aapt resource value: 0x7f0a0085 public const int buttonPanel = 2131361925; - // aapt resource value: 0x7f0a00e2 - public const int cancel_action = 2131362018; + // aapt resource value: 0x7f0a00e3 + public const int cancel_action = 2131362019; - // aapt resource value: 0x7f0a0116 - public const int cardPlayer = 2131362070; + // aapt resource value: 0x7f0a011a + public const int cardPlayer = 2131362074; // aapt resource value: 0x7f0a0060 public const int center = 2131361888; @@ -3241,8 +3241,8 @@ namespace MusicApp // aapt resource value: 0x7f0a0095 public const int checkbox = 2131361941; - // aapt resource value: 0x7f0a00ea - public const int chronometer = 2131362026; + // aapt resource value: 0x7f0a00eb + public const int chronometer = 2131362027; // aapt resource value: 0x7f0a0069 public const int clip_horizontal = 2131361897; @@ -3262,11 +3262,11 @@ namespace MusicApp // aapt resource value: 0x7f0a0088 public const int contentPanel = 2131361928; - // aapt resource value: 0x7f0a00d7 - public const int contentRefresh = 2131362007; - // aapt resource value: 0x7f0a00d8 - public const int contentView = 2131362008; + public const int contentRefresh = 2131362008; + + // aapt resource value: 0x7f0a00d9 + public const int contentView = 2131362009; // aapt resource value: 0x7f0a00b7 public const int coordinator = 2131361975; @@ -3304,14 +3304,14 @@ namespace MusicApp // aapt resource value: 0x7f0a003d public const int disableHome = 2131361853; - // aapt resource value: 0x7f0a0102 - public const int downFAB = 2131362050; + // aapt resource value: 0x7f0a0103 + public const int downFAB = 2131362051; - // aapt resource value: 0x7f0a012c - public const int downloadMDfromYT = 2131362092; + // aapt resource value: 0x7f0a0130 + public const int downloadMDfromYT = 2131362096; - // aapt resource value: 0x7f0a0122 - public const int edit = 2131362082; + // aapt resource value: 0x7f0a0126 + public const int edit = 2131362086; // aapt resource value: 0x7f0a00a0 public const int edit_query = 2131361952; @@ -3322,8 +3322,8 @@ namespace MusicApp // aapt resource value: 0x7f0a004c public const int end = 2131361868; - // aapt resource value: 0x7f0a00f0 - public const int end_padder = 2131362032; + // aapt resource value: 0x7f0a00f1 + public const int end_padder = 2131362033; // aapt resource value: 0x7f0a005b public const int enterAlways = 2131361883; @@ -3415,8 +3415,8 @@ namespace MusicApp // aapt resource value: 0x7f0a0063 public const int fill_vertical = 2131361891; - // aapt resource value: 0x7f0a0130 - public const int filter = 2131362096; + // aapt resource value: 0x7f0a0134 + public const int filter = 2131362100; // aapt resource value: 0x7f0a0076 public const int fit = 2131361910; @@ -3445,11 +3445,20 @@ namespace MusicApp // aapt resource value: 0x7f0a000a public const int ghost_view = 2131361802; - // aapt resource value: 0x7f0a0104 - public const int headerNumber = 2131362052; + // aapt resource value: 0x7f0a0108 + public const int headerMore = 2131362056; - // aapt resource value: 0x7f0a0103 - public const int headerTitle = 2131362051; + // aapt resource value: 0x7f0a0105 + public const int headerNumber = 2131362053; + + // aapt resource value: 0x7f0a0106 + public const int headerPlay = 2131362054; + + // aapt resource value: 0x7f0a0107 + public const int headerShuffle = 2131362055; + + // aapt resource value: 0x7f0a0104 + public const int headerTitle = 2131362052; // aapt resource value: 0x7f0a0005 public const int home = 2131361797; @@ -3460,11 +3469,11 @@ namespace MusicApp // aapt resource value: 0x7f0a0084 public const int icon = 2131361924; - // aapt resource value: 0x7f0a0105 - public const int icon_frame = 2131362053; + // aapt resource value: 0x7f0a0109 + public const int icon_frame = 2131362057; - // aapt resource value: 0x7f0a00ef - public const int icon_group = 2131362031; + // aapt resource value: 0x7f0a00f0 + public const int icon_group = 2131362032; // aapt resource value: 0x7f0a0034 public const int icon_only = 2131361844; @@ -3475,11 +3484,11 @@ namespace MusicApp // aapt resource value: 0x7f0a0081 public const int image = 2131361921; - // aapt resource value: 0x7f0a00eb - public const int info = 2131362027; + // aapt resource value: 0x7f0a00ec + public const int info = 2131362028; - // aapt resource value: 0x7f0a00f9 - public const int infoPanel = 2131362041; + // aapt resource value: 0x7f0a00fa + public const int infoPanel = 2131362042; // aapt resource value: 0x7f0a0074 public const int italic = 2131361908; @@ -3490,8 +3499,8 @@ namespace MusicApp // aapt resource value: 0x7f0a00b5 public const int largeLabel = 2131361973; - // aapt resource value: 0x7f0a00f2 - public const int lastButton = 2131362034; + // aapt resource value: 0x7f0a00f3 + public const int lastButton = 2131362035; // aapt resource value: 0x7f0a0064 public const int left = 2131361892; @@ -3502,14 +3511,14 @@ namespace MusicApp // aapt resource value: 0x7f0a0017 public const int line1 = 2131361815; - // aapt resource value: 0x7f0a0126 - public const int line2 = 2131362086; + // aapt resource value: 0x7f0a012a + public const int line2 = 2131362090; // aapt resource value: 0x7f0a0018 public const int line3 = 2131361816; - // aapt resource value: 0x7f0a0107 - public const int list = 2131362055; + // aapt resource value: 0x7f0a010b + public const int list = 2131362059; // aapt resource value: 0x7f0a003a public const int listMode = 2131361850; @@ -3517,23 +3526,23 @@ namespace MusicApp // aapt resource value: 0x7f0a0083 public const int list_item = 2131361923; - // aapt resource value: 0x7f0a010f - public const int localPlay = 2131362063; + // aapt resource value: 0x7f0a0113 + public const int localPlay = 2131362067; // aapt resource value: 0x7f0a00d4 public const int logButton = 2131362004; - // aapt resource value: 0x7f0a0128 - public const int masked = 2131362088; + // aapt resource value: 0x7f0a012c + public const int masked = 2131362092; - // aapt resource value: 0x7f0a0115 - public const int maxValue = 2131362069; + // aapt resource value: 0x7f0a0119 + public const int maxValue = 2131362073; - // aapt resource value: 0x7f0a00e4 - public const int media_actions = 2131362020; + // aapt resource value: 0x7f0a00e5 + public const int media_actions = 2131362021; - // aapt resource value: 0x7f0a0125 - public const int message = 2131362085; + // aapt resource value: 0x7f0a0129 + public const int message = 2131362089; // aapt resource value: 0x7f0a00c8 public const int metadataAlbum = 2131361992; @@ -3559,20 +3568,20 @@ namespace MusicApp // aapt resource value: 0x7f0a004d public const int middle = 2131361869; - // aapt resource value: 0x7f0a0114 - public const int minValue = 2131362068; + // aapt resource value: 0x7f0a0118 + public const int minValue = 2131362072; // aapt resource value: 0x7f0a006e public const int mini = 2131361902; - // aapt resource value: 0x7f0a0123 - public const int moreButton = 2131362083; + // aapt resource value: 0x7f0a0127 + public const int moreButton = 2131362087; // aapt resource value: 0x7f0a0044 public const int multiply = 2131361860; - // aapt resource value: 0x7f0a0129 - public const int musicLayout = 2131362089; + // aapt resource value: 0x7f0a012d + public const int musicLayout = 2131362093; // aapt resource value: 0x7f0a00bc public const int navigation_header_container = 2131361980; @@ -3580,23 +3589,23 @@ namespace MusicApp // aapt resource value: 0x7f0a0057 public const int never = 2131361879; + // aapt resource value: 0x7f0a00fe + public const int nextArt = 2131362046; + + // aapt resource value: 0x7f0a0100 + public const int nextArtist = 2131362048; + + // aapt resource value: 0x7f0a00f5 + public const int nextButton = 2131362037; + // aapt resource value: 0x7f0a00fd - public const int nextArt = 2131362045; + public const int nextSong = 2131362045; // aapt resource value: 0x7f0a00ff - public const int nextArtist = 2131362047; + public const int nextTitle = 2131362047; - // aapt resource value: 0x7f0a00f4 - public const int nextButton = 2131362036; - - // aapt resource value: 0x7f0a00fc - public const int nextSong = 2131362044; - - // aapt resource value: 0x7f0a00fe - public const int nextTitle = 2131362046; - - // aapt resource value: 0x7f0a00dd - public const int noPlaylist = 2131362013; + // aapt resource value: 0x7f0a00de + public const int noPlaylist = 2131362014; // aapt resource value: 0x7f0a0033 public const int none = 2131361843; @@ -3604,20 +3613,20 @@ namespace MusicApp // aapt resource value: 0x7f0a003b public const int normal = 2131361851; - // aapt resource value: 0x7f0a00ed - public const int notification_background = 2131362029; + // aapt resource value: 0x7f0a00ee + public const int notification_background = 2131362030; + + // aapt resource value: 0x7f0a00e8 + public const int notification_main_column = 2131362024; // aapt resource value: 0x7f0a00e7 - public const int notification_main_column = 2131362023; - - // aapt resource value: 0x7f0a00e6 - public const int notification_main_column_container = 2131362022; + public const int notification_main_column_container = 2131362023; // aapt resource value: 0x7f0a0075 public const int one = 2131361909; - // aapt resource value: 0x7f0a0124 - public const int pager = 2131362084; + // aapt resource value: 0x7f0a0128 + public const int pager = 2131362088; // aapt resource value: 0x7f0a0067 public const int parallax = 2131361895; @@ -3631,41 +3640,44 @@ namespace MusicApp // aapt resource value: 0x7f0a0068 public const int pin = 2131361896; - // aapt resource value: 0x7f0a00f3 - public const int playButton = 2131362035; + // aapt resource value: 0x7f0a00f4 + public const int playButton = 2131362036; - // aapt resource value: 0x7f0a00f1 - public const int playerAlbum = 2131362033; + // aapt resource value: 0x7f0a00f2 + public const int playerAlbum = 2131362034; - // aapt resource value: 0x7f0a00fb - public const int playerArtist = 2131362043; - - // aapt resource value: 0x7f0a00f7 - public const int playerDownload = 2131362039; - - // aapt resource value: 0x7f0a00f6 - public const int playerPlaylistAdd = 2131362038; - - // aapt resource value: 0x7f0a00f5 - public const int playerSleep = 2131362037; - - // aapt resource value: 0x7f0a00fa - public const int playerTitle = 2131362042; + // aapt resource value: 0x7f0a00fc + public const int playerArtist = 2131362044; // aapt resource value: 0x7f0a00f8 - public const int playerYoutube = 2131362040; + public const int playerDownload = 2131362040; - // aapt resource value: 0x7f0a012b - public const int playlistLayout = 2131362091; + // aapt resource value: 0x7f0a00f7 + public const int playerPlaylistAdd = 2131362039; + + // aapt resource value: 0x7f0a00f6 + public const int playerSleep = 2131362038; + + // aapt resource value: 0x7f0a00fb + public const int playerTitle = 2131362043; + + // aapt resource value: 0x7f0a00f9 + public const int playerYoutube = 2131362041; + + // aapt resource value: 0x7f0a00d6 + public const int playlistHeader = 2131362006; + + // aapt resource value: 0x7f0a012f + public const int playlistLayout = 2131362095; // aapt resource value: 0x7f0a00b3 public const int playlistName = 2131361971; - // aapt resource value: 0x7f0a0112 - public const int playlistURL = 2131362066; + // aapt resource value: 0x7f0a0116 + public const int playlistURL = 2131362070; - // aapt resource value: 0x7f0a010b - public const int preferenceContent = 2131362059; + // aapt resource value: 0x7f0a010f + public const int preferenceContent = 2131362063; // aapt resource value: 0x7f0a0006 public const int progress_circular = 2131361798; @@ -3673,11 +3685,11 @@ namespace MusicApp // aapt resource value: 0x7f0a0007 public const int progress_horizontal = 2131361799; - // aapt resource value: 0x7f0a0111 - public const int quickPlay = 2131362065; + // aapt resource value: 0x7f0a0115 + public const int quickPlay = 2131362069; - // aapt resource value: 0x7f0a010e - public const int quickPlayLinear = 2131362062; + // aapt resource value: 0x7f0a0112 + public const int quickPlayLinear = 2131362066; // aapt resource value: 0x7f0a0097 public const int radio = 2131361943; @@ -3685,20 +3697,20 @@ namespace MusicApp // aapt resource value: 0x7f0a00d3 public const int recycler = 2131362003; - // aapt resource value: 0x7f0a011f - public const int reorder = 2131362079; + // aapt resource value: 0x7f0a0123 + public const int reorder = 2131362083; - // aapt resource value: 0x7f0a012f - public const int repeat = 2131362095; + // aapt resource value: 0x7f0a0133 + public const int repeat = 2131362099; // aapt resource value: 0x7f0a0065 public const int right = 2131361893; - // aapt resource value: 0x7f0a00ec - public const int right_icon = 2131362028; + // aapt resource value: 0x7f0a00ed + public const int right_icon = 2131362029; - // aapt resource value: 0x7f0a00e8 - public const int right_side = 2131362024; + // aapt resource value: 0x7f0a00e9 + public const int right_side = 2131362025; // aapt resource value: 0x7f0a000c public const int save_image_matrix = 2131361804; @@ -3727,8 +3739,8 @@ namespace MusicApp // aapt resource value: 0x7f0a0070 public const int scrollable = 2131361904; - // aapt resource value: 0x7f0a0113 - public const int search = 2131362067; + // aapt resource value: 0x7f0a0117 + public const int search = 2131362071; // aapt resource value: 0x7f0a00a2 public const int search_badge = 2131361954; @@ -3760,17 +3772,17 @@ namespace MusicApp // aapt resource value: 0x7f0a00ab public const int search_voice_btn = 2131361963; - // aapt resource value: 0x7f0a0108 - public const int seekbar = 2131362056; + // aapt resource value: 0x7f0a010c + public const int seekbar = 2131362060; - // aapt resource value: 0x7f0a0109 - public const int seekbar_value = 2131362057; + // aapt resource value: 0x7f0a010d + public const int seekbar_value = 2131362061; // aapt resource value: 0x7f0a00ac public const int select_dialog_listview = 2131361964; - // aapt resource value: 0x7f0a0131 - public const int settings = 2131362097; + // aapt resource value: 0x7f0a0135 + public const int settings = 2131362101; // aapt resource value: 0x7f0a0096 public const int shortcut = 2131361942; @@ -3781,23 +3793,23 @@ namespace MusicApp // aapt resource value: 0x7f0a0040 public const int showHome = 2131361856; - // aapt resource value: 0x7f0a0100 - public const int showQueue = 2131362048; + // aapt resource value: 0x7f0a0101 + public const int showQueue = 2131362049; // aapt resource value: 0x7f0a0041 public const int showTitle = 2131361857; - // aapt resource value: 0x7f0a012e - public const int shuffle = 2131362094; + // aapt resource value: 0x7f0a0132 + public const int shuffle = 2131362098; // aapt resource value: 0x7f0a00b4 public const int smallLabel = 2131361972; - // aapt resource value: 0x7f0a00d9 - public const int smallPlayer = 2131362009; - // aapt resource value: 0x7f0a00da - public const int snackBar = 2131362010; + public const int smallPlayer = 2131362010; + + // aapt resource value: 0x7f0a00db + public const int snackBar = 2131362011; // aapt resource value: 0x7f0a00bb public const int snackbar_action = 2131361979; @@ -3808,38 +3820,38 @@ namespace MusicApp // aapt resource value: 0x7f0a005f public const int snap = 2131361887; - // aapt resource value: 0x7f0a0101 - public const int songTimer = 2131362049; - - // aapt resource value: 0x7f0a0118 - public const int spArt = 2131362072; - - // aapt resource value: 0x7f0a011a - public const int spArtist = 2131362074; - - // aapt resource value: 0x7f0a0117 - public const int spContainer = 2131362071; - - // aapt resource value: 0x7f0a011d - public const int spLast = 2131362077; - - // aapt resource value: 0x7f0a011b - public const int spNext = 2131362075; + // aapt resource value: 0x7f0a0102 + public const int songTimer = 2131362050; // aapt resource value: 0x7f0a011c - public const int spPlay = 2131362076; + public const int spArt = 2131362076; // aapt resource value: 0x7f0a011e - public const int spProgress = 2131362078; + public const int spArtist = 2131362078; - // aapt resource value: 0x7f0a0119 - public const int spTitle = 2131362073; + // aapt resource value: 0x7f0a011b + public const int spContainer = 2131362075; + + // aapt resource value: 0x7f0a0121 + public const int spLast = 2131362081; + + // aapt resource value: 0x7f0a011f + public const int spNext = 2131362079; + + // aapt resource value: 0x7f0a0120 + public const int spPlay = 2131362080; + + // aapt resource value: 0x7f0a0122 + public const int spProgress = 2131362082; + + // aapt resource value: 0x7f0a011d + public const int spTitle = 2131362077; // aapt resource value: 0x7f0a0086 public const int spacer = 2131361926; - // aapt resource value: 0x7f0a0106 - public const int spinner = 2131362054; + // aapt resource value: 0x7f0a010a + public const int spinner = 2131362058; // aapt resource value: 0x7f0a0008 public const int split_action_bar = 2131361800; @@ -3859,11 +3871,11 @@ namespace MusicApp // aapt resource value: 0x7f0a0066 public const int start = 2131361894; - // aapt resource value: 0x7f0a0120 - public const int status = 2131362080; + // aapt resource value: 0x7f0a0124 + public const int status = 2131362084; - // aapt resource value: 0x7f0a00e3 - public const int status_bar_latest_event_content = 2131362019; + // aapt resource value: 0x7f0a00e4 + public const int status_bar_latest_event_content = 2131362020; // aapt resource value: 0x7f0a0098 public const int submenuarrow = 2131361944; @@ -3874,14 +3886,14 @@ namespace MusicApp // aapt resource value: 0x7f0a007a public const int surface_view = 2131361914; - // aapt resource value: 0x7f0a010a - public const int switchWidget = 2131362058; + // aapt resource value: 0x7f0a010e + public const int switchWidget = 2131362062; // aapt resource value: 0x7f0a003c public const int tabMode = 2131361852; - // aapt resource value: 0x7f0a00d6 - public const int tabs = 2131362006; + // aapt resource value: 0x7f0a00d7 + public const int tabs = 2131362007; // aapt resource value: 0x7f0a0019 public const int tag_transition_group = 2131361817; @@ -3889,8 +3901,8 @@ namespace MusicApp // aapt resource value: 0x7f0a001a public const int text = 2131361818; - // aapt resource value: 0x7f0a00dc - public const int text1 = 2131362012; + // aapt resource value: 0x7f0a00dd + public const int text1 = 2131362013; // aapt resource value: 0x7f0a001b public const int text2 = 2131361819; @@ -3916,8 +3928,8 @@ namespace MusicApp // aapt resource value: 0x7f0a007b public const int texture_view = 2131361915; - // aapt resource value: 0x7f0a00e9 - public const int time = 2131362025; + // aapt resource value: 0x7f0a00ea + public const int time = 2131362026; // aapt resource value: 0x7f0a001c public const int title = 2131361820; @@ -3955,8 +3967,8 @@ namespace MusicApp // aapt resource value: 0x7f0a0013 public const int transition_transform = 2131361811; - // aapt resource value: 0x7f0a012d - public const int undoChange = 2131362093; + // aapt resource value: 0x7f0a0131 + public const int undoChange = 2131362097; // aapt resource value: 0x7f0a0049 public const int uniform = 2131361865; @@ -3970,8 +3982,8 @@ namespace MusicApp // aapt resource value: 0x7f0a0016 public const int view_offset_helper = 2131361814; - // aapt resource value: 0x7f0a0127 - public const int visible = 2131362087; + // aapt resource value: 0x7f0a012b + public const int visible = 2131362091; // aapt resource value: 0x7f0a0036 public const int wide = 2131361846; @@ -3982,11 +3994,11 @@ namespace MusicApp // aapt resource value: 0x7f0a004a public const int wrap_content = 2131361866; - // aapt resource value: 0x7f0a0121 - public const int youtubeIcon = 2131362081; + // aapt resource value: 0x7f0a0125 + public const int youtubeIcon = 2131362085; - // aapt resource value: 0x7f0a0110 - public const int ytPlay = 2131362064; + // aapt resource value: 0x7f0a0114 + public const int ytPlay = 2131362068; // aapt resource value: 0x7f0a00d2 public const int ytProgress = 2131362002; diff --git a/MusicApp/Resources/layout/Main.xml b/MusicApp/Resources/layout/Main.xml index edcc5cc..fb00fd4 100644 --- a/MusicApp/Resources/layout/Main.xml +++ b/MusicApp/Resources/layout/Main.xml @@ -11,14 +11,24 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/appbar" > - + android:layout_height="wrap_content" + app:layout_scrollFlags="scroll" + android:fitsSystemWindows="true" + android:id="@+id/collapsingToolbar" + app:titleEnabled="false" > + + + + android:layout_width="fill_parent" + android:id="@+id/playlistHeader"> + android:src="@drawable/ic_pause_black_24dp" + android:background="@null" /> + android:src="@drawable/Shuffle" + android:background="@null"/> + android:src="@drawable/ic_more_vert_black_24dp" + android:background="@null" />