[Android] Enhance save playlist icon
Geoffrey Métais
git at videolan.org
Wed Mar 25 18:07:43 CET 2015
vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Mar 25 18:06:42 2015 +0100| [bee25a77db981cb1b779f791364c56cbf19b9875] | committer: Geoffrey Métais
Enhance save playlist icon
- Do not always show it
- Larger drawables
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=bee25a77db981cb1b779f791364c56cbf19b9875
---
vlc-android/res/drawable-hdpi/ic_save_grey600_24dp.png | Bin 344 -> 0 bytes
.../ic_save_grey600_48dp.png} | Bin 493 -> 493 bytes
vlc-android/res/drawable-hdpi/ic_save_white_24dp.png | Bin 341 -> 0 bytes
.../ic_save_white_48dp.png} | Bin 489 -> 489 bytes
vlc-android/res/drawable-mdpi/ic_save_grey600_24dp.png | Bin 259 -> 0 bytes
.../ic_save_grey600_48dp.png} | Bin 440 -> 440 bytes
vlc-android/res/drawable-mdpi/ic_save_white_24dp.png | Bin 257 -> 0 bytes
.../ic_save_white_48dp.png} | Bin 359 -> 359 bytes
.../ic_save_grey600_48dp.png} | Bin 747 -> 747 bytes
.../ic_save_white_48dp.png} | Bin 747 -> 747 bytes
vlc-android/res/drawable-xxhdpi/ic_save_grey600_48dp.png | Bin 0 -> 1112 bytes
vlc-android/res/drawable-xxhdpi/ic_save_white_48dp.png | Bin 0 -> 1105 bytes
vlc-android/res/drawable-xxxhdpi/ic_save_grey600_48dp.png | Bin 0 -> 1480 bytes
vlc-android/res/drawable-xxxhdpi/ic_save_white_48dp.png | Bin 0 -> 1483 bytes
vlc-android/res/values/styles.xml | 4 ++--
vlc-android/src/org/videolan/vlc/gui/MainActivity.java | 4 ++--
vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java | 7 ++++++-
17 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/vlc-android/res/drawable-hdpi/ic_save_grey600_24dp.png b/vlc-android/res/drawable-hdpi/ic_save_grey600_24dp.png
deleted file mode 100644
index 3ead270..0000000
Binary files a/vlc-android/res/drawable-hdpi/ic_save_grey600_24dp.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xxhdpi/ic_save_grey600_24dp.png b/vlc-android/res/drawable-hdpi/ic_save_grey600_48dp.png
similarity index 100%
rename from vlc-android/res/drawable-xxhdpi/ic_save_grey600_24dp.png
rename to vlc-android/res/drawable-hdpi/ic_save_grey600_48dp.png
diff --git a/vlc-android/res/drawable-hdpi/ic_save_white_24dp.png b/vlc-android/res/drawable-hdpi/ic_save_white_24dp.png
deleted file mode 100644
index 8c9e9ce..0000000
Binary files a/vlc-android/res/drawable-hdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xxhdpi/ic_save_white_24dp.png b/vlc-android/res/drawable-hdpi/ic_save_white_48dp.png
similarity index 100%
rename from vlc-android/res/drawable-xxhdpi/ic_save_white_24dp.png
rename to vlc-android/res/drawable-hdpi/ic_save_white_48dp.png
diff --git a/vlc-android/res/drawable-mdpi/ic_save_grey600_24dp.png b/vlc-android/res/drawable-mdpi/ic_save_grey600_24dp.png
deleted file mode 100644
index e72945d..0000000
Binary files a/vlc-android/res/drawable-mdpi/ic_save_grey600_24dp.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_save_grey600_24dp.png b/vlc-android/res/drawable-mdpi/ic_save_grey600_48dp.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_save_grey600_24dp.png
rename to vlc-android/res/drawable-mdpi/ic_save_grey600_48dp.png
diff --git a/vlc-android/res/drawable-mdpi/ic_save_white_24dp.png b/vlc-android/res/drawable-mdpi/ic_save_white_24dp.png
deleted file mode 100644
index bb26bc0..0000000
Binary files a/vlc-android/res/drawable-mdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_save_white_24dp.png b/vlc-android/res/drawable-mdpi/ic_save_white_48dp.png
similarity index 100%
rename from vlc-android/res/drawable-xhdpi/ic_save_white_24dp.png
rename to vlc-android/res/drawable-mdpi/ic_save_white_48dp.png
diff --git a/vlc-android/res/drawable-xxxhdpi/ic_save_grey600_24dp.png b/vlc-android/res/drawable-xhdpi/ic_save_grey600_48dp.png
similarity index 100%
rename from vlc-android/res/drawable-xxxhdpi/ic_save_grey600_24dp.png
rename to vlc-android/res/drawable-xhdpi/ic_save_grey600_48dp.png
diff --git a/vlc-android/res/drawable-xxxhdpi/ic_save_white_24dp.png b/vlc-android/res/drawable-xhdpi/ic_save_white_48dp.png
similarity index 100%
rename from vlc-android/res/drawable-xxxhdpi/ic_save_white_24dp.png
rename to vlc-android/res/drawable-xhdpi/ic_save_white_48dp.png
diff --git a/vlc-android/res/drawable-xxhdpi/ic_save_grey600_48dp.png b/vlc-android/res/drawable-xxhdpi/ic_save_grey600_48dp.png
new file mode 100644
index 0000000..d93a55f
Binary files /dev/null and b/vlc-android/res/drawable-xxhdpi/ic_save_grey600_48dp.png differ
diff --git a/vlc-android/res/drawable-xxhdpi/ic_save_white_48dp.png b/vlc-android/res/drawable-xxhdpi/ic_save_white_48dp.png
new file mode 100644
index 0000000..383f5a2
Binary files /dev/null and b/vlc-android/res/drawable-xxhdpi/ic_save_white_48dp.png differ
diff --git a/vlc-android/res/drawable-xxxhdpi/ic_save_grey600_48dp.png b/vlc-android/res/drawable-xxxhdpi/ic_save_grey600_48dp.png
new file mode 100644
index 0000000..0cc4aaa
Binary files /dev/null and b/vlc-android/res/drawable-xxxhdpi/ic_save_grey600_48dp.png differ
diff --git a/vlc-android/res/drawable-xxxhdpi/ic_save_white_48dp.png b/vlc-android/res/drawable-xxxhdpi/ic_save_white_48dp.png
new file mode 100644
index 0000000..06363aa
Binary files /dev/null and b/vlc-android/res/drawable-xxxhdpi/ic_save_white_48dp.png differ
diff --git a/vlc-android/res/values/styles.xml b/vlc-android/res/values/styles.xml
index 3913689..c366065 100644
--- a/vlc-android/res/values/styles.xml
+++ b/vlc-android/res/values/styles.xml
@@ -67,7 +67,7 @@
<item name="ic_menu_preferences">@drawable/ic_menu_preferences</item>
<item name="ic_menu_cone">@drawable/ic_menu_cone</item>
<item name="ic_move_media">@drawable/ic_move_media</item>
- <item name="ic_save">@drawable/ic_save_grey600_24dp</item>
+ <item name="ic_save">@drawable/ic_save_grey600_48dp</item>
<item name="ic_trash_small_normal">@drawable/ic_trash_small_normal</item>
<item name="gridview_progressbar">@drawable/gridview_progressbar_w</item>
<item name="advanced_options_style">@style/Theme.VLC.AdvancedOptionsLight</item>
@@ -139,7 +139,7 @@
<item name="ic_menu_preferences">@drawable/ic_menu_preferences_w</item>
<item name="ic_menu_cone">@drawable/ic_menu_cone_w</item>
<item name="ic_move_media">@drawable/ic_move_media_w</item>
- <item name="ic_save">@drawable/ic_save_white_24dp</item>
+ <item name="ic_save">@drawable/ic_save_white_48dp</item>
<item name="ic_trash_small_normal">@drawable/ic_trash_small_normal_w</item>
<item name="gridview_progressbar">@drawable/gridview_progressbar</item>
<item name="advanced_options_style">@style/Theme.VLC.AdvancedOptionsBlack</item>
diff --git a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
index 80bafe4..50106ab 100644
--- a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java
@@ -876,7 +876,7 @@ public class MainActivity extends ActionBarActivity implements OnItemClickListen
int resId = Util.getResourceFromAttribute(MainActivity.this, R.attr.mini_player_top_shadow);
if (resId != 0)
mSlidingPane.setShadowResource(resId);
- mAudioPlayer.setHeaderVisibilities(false, false, true, true, true);
+ mAudioPlayer.setHeaderVisibilities(false, false, true, true, true, false);
mRootContainer.setDrawerLockMode(HackyDrawerLayout.LOCK_MODE_UNLOCKED);
removeTipViewIfDisplayed();
mAudioPlayer.showAudioPlayerTips();
@@ -890,7 +890,7 @@ public class MainActivity extends ActionBarActivity implements OnItemClickListen
@Override
public void onPanelClosed() {
- mAudioPlayer.setHeaderVisibilities(true, true, false, false, false);
+ mAudioPlayer.setHeaderVisibilities(true, true, false, false, false, true);
mRootContainer.setDrawerLockMode(HackyDrawerLayout.LOCK_MODE_LOCKED_CLOSED);
mAudioPlayer.showPlaylistTips();
}
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
index 34bb0df..a1aeaab 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
@@ -98,6 +98,7 @@ public class AudioPlayer extends Fragment implements IAudioPlayer, View.OnClickL
private boolean mAdvFuncVisible;
private boolean mPlaylistSwitchVisible;
+ private boolean mPlaylistSaveVisible;
private boolean mHeaderPlayPauseVisible;
private boolean mProgressBarVisible;
private boolean mHeaderTimeVisible;
@@ -149,6 +150,7 @@ public class AudioPlayer extends Fragment implements IAudioPlayer, View.OnClickL
mAdvFuncVisible = false;
mPlaylistSwitchVisible = false;
+ mPlaylistSaveVisible = false;
mHeaderPlayPauseVisible = true;
mProgressBarVisible = true;
mHeaderTimeVisible = true;
@@ -505,18 +507,20 @@ public class AudioPlayer extends Fragment implements IAudioPlayer, View.OnClickL
*/
public void setHeaderVisibilities(boolean advFuncVisible, boolean playlistSwitchVisible,
boolean headerPlayPauseVisible, boolean progressBarVisible,
- boolean headerTimeVisible) {
+ boolean headerTimeVisible, boolean playlistSaveVisible) {
mAdvFuncVisible = advFuncVisible;
mPlaylistSwitchVisible = playlistSwitchVisible;
mHeaderPlayPauseVisible = headerPlayPauseVisible;
mProgressBarVisible = progressBarVisible;
mHeaderTimeVisible = headerTimeVisible;
+ mPlaylistSaveVisible = playlistSaveVisible;
restoreHedaderButtonVisibilities();
}
private void restoreHedaderButtonVisibilities() {
mAdvFunc.setVisibility(mAdvFuncVisible ? ImageButton.VISIBLE : ImageButton.GONE);
mPlaylistSwitch.setVisibility(mPlaylistSwitchVisible ? ImageButton.VISIBLE : ImageButton.GONE);
+ mPlaylistSave.setVisibility(mPlaylistSaveVisible ? ImageButton.VISIBLE : ImageButton.GONE);
mHeaderPlayPause.setVisibility(mHeaderPlayPauseVisible ? ImageButton.VISIBLE : ImageButton.GONE);
mProgressBar.setVisibility(mProgressBarVisible ? ProgressBar.VISIBLE : ProgressBar.GONE);
mHeaderTime.setVisibility(mHeaderTimeVisible ? TextView.VISIBLE : TextView.GONE);
@@ -525,6 +529,7 @@ public class AudioPlayer extends Fragment implements IAudioPlayer, View.OnClickL
private void hideHedaderButtons() {
mAdvFunc.setVisibility(ImageButton.GONE);
mPlaylistSwitch.setVisibility(ImageButton.GONE);
+ mPlaylistSave.setVisibility(ImageButton.GONE);
mHeaderPlayPause.setVisibility(ImageButton.GONE);
mHeaderTime.setVisibility(TextView.GONE);
}
More information about the Android
mailing list