Skip to content

Fix - Player fullscreen toggle icon(to change on toggle) #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KunalDhyani wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix - Player fullscreen toggle icon(to change on toggle) #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions giraffeplayer2/src/main/java/tcking/github/com/giraffeplayer2/DefaultMediaController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import tv.danmaku.ijk.media.player.IMediaPlayer;
import tv.danmaku.ijk.media.player.IjkTimedText;

import static tcking.github.com.giraffeplayer2.GiraffePlayer.DISPLAY_FULL_WINDOW;

/**
* media controller for ListView or RecyclerView
* Created by tcking on 2017
Expand Down Expand Up @@ -170,7 +172,7 @@ protected long setProgress() {

protected void show(int timeout) {
if (!isShowing) {
if (videoView.getVideoInfo().isShowTopBar() || displayModel == GiraffePlayer.DISPLAY_FULL_WINDOW) {
if (videoView.getVideoInfo().isShowTopBar() || displayModel == DISPLAY_FULL_WINDOW) {
$.id(R.id.app_video_top_box).visible();
$.id(R.id.app_video_title).text(videoView.getVideoInfo().getTitle());
} else {
Expand Down Expand Up @@ -249,7 +251,7 @@ public void onClick(View v) {
player.stop();
player.setDisplayModel(GiraffePlayer.DISPLAY_NORMAL);
} else if (v.getId() == R.id.app_video_float_full) {
player.setDisplayModel(GiraffePlayer.DISPLAY_FULL_WINDOW);
player.setDisplayModel(DISPLAY_FULL_WINDOW);
} else if (v.getId() == R.id.app_video_clarity) {
Activity activity = (Activity) videoView.getContext();
if (activity instanceof AppCompatActivity) {
Expand Down Expand Up @@ -696,6 +698,15 @@ public void onDisplayModelChange(int oldModel, int newModel) {
// } else if (newModel == GiraffePlayer.DISPLAY_NORMAL) {
// videoView.addView(controllerView);
// }

ImageView zoom = $.id(R.id.app_video_fullscreen).view();
int model = displayModel;

if (model == DISPLAY_FULL_WINDOW){
zoom.setImageResource(R.drawable.ic_fullscreen_exit_white_24dp);
}else{
zoom.setImageResource(R.drawable.ic_fullscreen_white_24dp);
}
}

@Override
Expand Down