Skip to content

Commit

Permalink
Android: Yet another new layout for the mini playlist; it is much bet…
Browse files Browse the repository at this point in the history 
…ter than the other layouts. Fixed all bugs in PlaylistCell layout. Added glyph for disabled select in dialogs.

Related to issue #406.
  • Loading branch information
@ycastonguay
ycastonguay committed Sep 17, 2013
1 parent 24d7264 commit b699168
Show file tree
Hide file tree
Showing 15 changed files with 454 additions and 402 deletions.
3 changes: 2 additions & 1 deletion MPfm/MPfm.Android/Classes/Activities/MainActivity.cs
View file
Expand Up @@ -548,7 +548,8 @@ public void RefreshPlaylist(Playlist playlist)
{
RunOnUiThread(() =>
{
_lblPlaylistCount.Text = string.Format("{0}/{1}", playlist.CurrentItemIndex+1, playlist.Items.Count);
//_lblPlaylistCount.Text = string.Format("{0}/{1}", playlist.CurrentItemIndex+1, playlist.Items.Count);
_lblPlaylistCount.Text = string.Format("{0} items", playlist.Items.Count);
ShowMiniPlaylist();
});
}
Expand Down
2 changes: 1 addition & 1 deletion MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs
View file
Expand Up @@ -73,7 +73,7 @@ public override View GetView(int position, View convertView, ViewGroup parent)
var title = view.FindViewById<TextView>(Resource.Id.playlistcell_title);
var count = view.FindViewById<TextView>(Resource.Id.playlistcell_count);
title.Text = _playlists[position].Name;
count.Text = _playlists[position].ItemCount.ToString();
count.Text = string.Format("{0}", _playlists[position].ItemCount);

return view;
}
Expand Down
5 changes: 5 additions & 0 deletions MPfm/MPfm.Android/MPfm.Android.csproj
View file
Expand Up @@ -579,6 +579,11 @@
<AndroidResource Include="Resources\layout\playlist_spinner_item.xml">
<SubType>Designer</SubType>
</AndroidResource>
<AndroidResource Include="Resources\drawable-hdpi\actionbar_select_disabled.png" />
<AndroidResource Include="Resources\drawable-mdpi\actionbar_select_disabled.png" />
<AndroidResource Include="Resources\drawable-xhdpi\actionbar_select_disabled.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\actionbar_select_disabled.png" />
<AndroidResource Include="Resources\drawable\selectimage_selector.xml" />
</ItemGroup>
<ItemGroup>
<Folder Include="Lib\armeabi\" />
Expand Down
16 changes: 16 additions & 0 deletions MPfm/MPfm.Android/Resources/Drawable/selectimage_selector.xml
View file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- disabled -->
<item
android:state_enabled="false"
android:drawable="@drawable/actionbar_select_disabled" />
<!-- pressed -->
<item
android:state_pressed="true"
android:drawable="@drawable/actionbar_select" />
<item
android:state_focused="true"
android:drawable="@drawable/actionbar_select" />
<item
android:drawable="@drawable/actionbar_select" />
</selector>
2 changes: 1 addition & 1 deletion MPfm/MPfm.Android/Resources/Layout/AddNewPlaylist.axml
View file
Expand Up @@ -48,7 +48,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableLeft="@drawable/actionbar_select"
android:drawableLeft="@drawable/selectimage_selector"
android:drawablePadding="2dp"
android:background="@drawable/dialogbutton_selector"
android:text="Create"
Expand Down
72 changes: 40 additions & 32 deletions MPfm/MPfm.Android/Resources/Layout/Main.axml
View file
Expand Up @@ -154,67 +154,75 @@
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="60dp"
android:layout_height="44dp"
android:layout_gravity="center_vertical"
android:orientation="horizontal">
<ImageButton
android:id="@+id/main_miniplaylist_btnPlaylist"
android:layout_width="60dp"
android:layout_height="44dp"
android:background="@android:color/transparent"
android:src="@drawable/player_playlist" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_width="60dp"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:orientation="vertical">
<ImageButton
android:id="@+id/main_miniplaylist_btnPlaylist"
android:layout_width="60dp"
android:layout_height="44dp"
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:gravity="center"
android:text="0 / 0"
android:text="0 items"
android:textColor="#CCCCCC"
android:textSize="12dp"
android:ellipsize="end"
android:singleLine="true" />
<TextView
android:id="@+id/main_miniplaylist_lblPlaylistLength"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="1140:24"
android:textColor="#CCCCCC"
android:textSize="12dp"
android:ellipsize="end"
android:singleLine="true" />
</LinearLayout>
<ImageButton
android:id="@+id/main_miniplaylist_btnRepeat"
android:layout_width="60dp"
android:layout_height="44dp"
android:background="@android:color/transparent"
android:src="@drawable/player_repeat" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_width="30dp"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
android:orientation="vertical">
<ImageButton
android:id="@+id/main_miniplaylist_btnRepeat"
android:layout_width="60dp"
android:layout_height="44dp"
android:background="@android:color/transparent"
android:src="@drawable/player_repeat" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Off"
android:textColor="#CCCCCC"
android:textSize="12dp"
android:ellipsize="end"
android:singleLine="true" />
</LinearLayout>
<ImageButton
android:id="@+id/main_miniplaylist_btnShuffle"
android:layout_width="60dp"
android:layout_height="44dp"
android:background="@android:color/transparent"
android:src="@drawable/player_shuffle" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_width="30dp"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
android:orientation="vertical">
<ImageButton
android:id="@+id/main_miniplaylist_btnShuffle"
android:layout_width="60dp"
android:layout_height="44dp"
android:background="@android:color/transparent"
android:src="@drawable/player_shuffle" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Off"
android:textColor="#CCCCCC"
android:textSize="12dp"
Expand Down
29 changes: 21 additions & 8 deletions MPfm/MPfm.Android/Resources/Layout/PlaylistCell.axml
View file
Expand Up @@ -7,20 +7,33 @@
android:id="@+id/playlistcell_title"
android:layout_width="0dp"
android:layout_height="44dp"
android:layout_weight="1"
android:layout_weight="1"
android:minHeight="44dp"
android:maxHeight="44dp"
android:padding="6dp"
android:gravity="center_vertical"
android:textColor="@color/dialoglist_text"
android:textSize="16dp" />
<TextView
android:id="@+id/playlistcell_count"
<LinearLayout
android:layout_width="60dp"
android:layout_height="44dp"
android:layout_height="44dp"
android:layout_gravity="center_vertical"
android:padding="6dp"
android:gravity="right"
android:textColor="@color/dialoglist_text"
android:textSize="16dp" />
android:layout_marginRight="8dp"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/playlistcell_count"
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="right"
android:textColor="@color/dialoglist_text"
android:textSize="16dp" />
<TextView
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="right"
android:text="songs"
android:textColor="#CCCCCC"
android:textSize="11dp" />
</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion MPfm/MPfm.Android/Resources/Layout/SelectPlaylist.axml
View file
Expand Up @@ -52,7 +52,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableLeft="@drawable/actionbar_select"
android:drawableLeft="@drawable/selectimage_selector"
android:drawablePadding="2dp"
android:background="@drawable/dialogbutton_selector"
android:text="Select"
Expand Down

0 comments on commit b699168

Please sign in to comment.