Skip to content

Commit

Permalink
Android: Updated mini playlist design.
Browse files Browse the repository at this point in the history 
Related to issue #406.
  • Loading branch information
@ycastonguay
ycastonguay committed Sep 17, 2013
1 parent 95101fc commit 24d7264
Show file tree
Hide file tree
Showing 4 changed files with 365 additions and 420 deletions.
12 changes: 6 additions & 6 deletions MPfm/MPfm.Android/Classes/Activities/MainActivity.cs
View file
Expand Up @@ -60,9 +60,9 @@ public class MainActivity : BaseActivity, View.IOnTouchListener, ActionBar.IOnNa
private TextView _lblArtistName;
private TextView _lblAlbumTitle;
private TextView _lblSongTitle;
private TextView _lblNextArtistName;
private TextView _lblNextAlbumTitle;
private TextView _lblNextSongTitle;
//private TextView _lblNextArtistName;
//private TextView _lblNextAlbumTitle;
//private TextView _lblNextSongTitle;
private TextView _lblPlaylistCount;
private Spinner _cboPlaylist;
private SquareImageView _imageAlbum;
Expand Down Expand Up @@ -103,9 +103,9 @@ protected override void OnCreate(Bundle bundle)
_lblArtistName = FindViewById<TextView>(Resource.Id.main_miniplayer_lblArtistName);
_lblAlbumTitle = FindViewById<TextView>(Resource.Id.main_miniplayer_lblAlbumTitle);
_lblSongTitle = FindViewById<TextView>(Resource.Id.main_miniplayer_lblSongTitle);
_lblNextArtistName = FindViewById<TextView>(Resource.Id.main_miniplaylist_lblNextArtistName);
_lblNextAlbumTitle = FindViewById<TextView>(Resource.Id.main_miniplaylist_lblNextAlbumTitle);
_lblNextSongTitle = FindViewById<TextView>(Resource.Id.main_miniplaylist_lblNextSongTitle);
//_lblNextArtistName = FindViewById<TextView>(Resource.Id.main_miniplaylist_lblNextArtistName);
//_lblNextAlbumTitle = FindViewById<TextView>(Resource.Id.main_miniplaylist_lblNextAlbumTitle);
//_lblNextSongTitle = FindViewById<TextView>(Resource.Id.main_miniplaylist_lblNextSongTitle);
_lblPlaylistCount = FindViewById<TextView>(Resource.Id.main_miniplaylist_lblPlaylistCount);
_btnPrevious = FindViewById<ImageButton>(Resource.Id.main_miniplayer_btnPrevious);
_btnPlayPause = FindViewById<ImageButton>(Resource.Id.main_miniplayer_btnPlayPause);
Expand Down
94 changes: 24 additions & 70 deletions MPfm/MPfm.Android/Resources/Layout/Main.axml
View file
Expand Up @@ -19,7 +19,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:background="@color/actionbar"
android:background="@color/background"
android:gravity="center_vertical">
<org.sessionsapp.android.SquareImageView
android:id="@+id/main_miniplayer_imageAlbum"
Expand Down Expand Up @@ -116,7 +116,7 @@
android:id="@+id/main_miniplaylist"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/actionbar"
android:background="@color/background"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageButton
Expand All @@ -131,17 +131,30 @@
android:layout_height="fill_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_marginLeft="18dp"
android:layout_marginTop="4dp"
android:text="Playlist"
android:textColor="#CCCCCC"
android:textSize="14dp" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="76dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="18dp"
android:layout_marginRight="6dp"
android:layout_marginBottom="2dp"
android:gravity="center_vertical"
android:text="Playlist:"
android:textColor="#CCCCCC"
android:textSize="14dp" />
<Spinner
android:id="@+id/main_miniplaylist_cboPlaylist"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="60dp"
android:layout_gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
Expand All @@ -153,74 +166,19 @@
android:id="@+id/main_miniplaylist_btnPlaylist"
android:layout_width="60dp"
android:layout_height="44dp"
android:padding="6dp"
android:background="@android:color/transparent"
android:src="@drawable/player_playlist" />
<TextView
android:id="@+id/main_miniplaylist_lblPlaylistCount"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center"
android:text="0 / 0"
android:textColor="#CCCCCC"
android:textSize="12dp"
android:ellipsize="end"
android:singleLine="true" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingRight="8dp">
<Spinner
android:id="@+id/main_miniplaylist_cboPlaylist"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="4dp"
android:gravity="right"
android:text="Length: 110:34"
android:textColor="#CCCCCC"
android:textSize="11dp" />
<TextView
android:id="@+id/main_miniplaylist_lblNextArtistName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:textColor="#FFFFFF"
android:text="[Artist name]"
android:visibility="gone"
android:textSize="14dp"
android:ellipsize="end"
android:singleLine="true" />
<TextView
android:id="@+id/main_miniplaylist_lblNextAlbumTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="[Album title]"
android:visibility="gone"
android:textColor="#EEEEEE"
android:textSize="12dp"
android:ellipsize="end"
android:singleLine="true" />
<TextView
android:id="@+id/main_miniplaylist_lblNextSongTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="[Title]"
android:visibility="gone"
android:textColor="#CCCCCC"
android:textSize="11dp"
android:ellipsize="end"
android:singleLine="true" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -230,13 +188,11 @@
android:id="@+id/main_miniplaylist_btnRepeat"
android:layout_width="60dp"
android:layout_height="44dp"
android:padding="20dp"
android:background="@android:color/transparent"
android:src="@drawable/player_repeat" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center"
android:text="Off"
android:textColor="#CCCCCC"
Expand All @@ -253,13 +209,11 @@
android:id="@+id/main_miniplaylist_btnShuffle"
android:layout_width="60dp"
android:layout_height="44dp"
android:padding="20dp"
android:background="@android:color/transparent"
android:src="@drawable/player_shuffle" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center"
android:text="Off"
android:textColor="#CCCCCC"
Expand Down
2 changes: 1 addition & 1 deletion MPfm/MPfm.Android/Resources/Layout/Player.axml
View file
Expand Up @@ -66,7 +66,7 @@
android:id="@+id/player_layoutButtons"
android:layout_width="fill_parent"
android:layout_height="60dp"
android:background="@color/actionbar"
android:background="@color/background"
android:orientation="horizontal"
android:gravity="center">
<ImageButton
Expand Down

0 comments on commit 24d7264

Please sign in to comment.