Skip to content

Commit c096a1a

Browse files
committed
Insets work
1 parent 59211f6 commit c096a1a

File tree

4 files changed

+51
-40
lines changed

4 files changed

+51
-40
lines changed

Player/app/src/main/java/org/floens/player/PlayerActivity.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.floens.player;
22

33
import android.os.Bundle;
4+
import android.view.View;
45
import android.view.Window;
56
import android.view.WindowManager;
67

@@ -11,6 +12,8 @@
1112
import org.floens.player.controller.PlaylistController;
1213

1314
public class PlayerActivity extends StartActivity {
15+
private static final String TAG = "PlayerActivity";
16+
1417
@Override
1518
protected void onCreate(Bundle savedInstanceState) {
1619
Window window = getWindow();
@@ -20,16 +23,28 @@ protected void onCreate(Bundle savedInstanceState) {
2023

2124
// window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
2225

23-
mainController = new MainNavigationController(this);
26+
NavigationController mainController = new MainNavigationController(this);
27+
this.mainController = mainController;
2428

2529
super.onCreate(savedInstanceState);
2630

27-
NavigationController mainController = (NavigationController) this.mainController;
31+
mainController.view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
32+
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
33+
View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
34+
2835
PagedNavigationController pagedNavigationController = new PagedNavigationController(this);
2936
mainController.pushController(pagedNavigationController, false);
3037

3138
for (int i = 0; i < 3; i++) {
3239
pagedNavigationController.addController(new PlaylistController(this));
3340
}
41+
/*mainController.view.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
42+
@Override
43+
public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
44+
Log.d(TAG, "onApplyWindowInsets() called with: v = [" + v + "], insets = [" + insets + "]");
45+
return insets.consumeSystemWindowInsets();
46+
}
47+
});*/
48+
mainController.view.requestApplyInsets();
3449
}
3550
}

Player/app/src/main/java/org/floens/player/layout/PlayerControls.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import android.graphics.RectF;
99
import android.util.AttributeSet;
1010
import android.view.MotionEvent;
11+
import android.view.View;
12+
import android.view.ViewGroup;
1113
import android.view.animation.AccelerateInterpolator;
1214
import android.view.animation.DecelerateInterpolator;
1315
import android.widget.LinearLayout;
@@ -40,6 +42,8 @@ public class PlayerControls extends LinearLayout implements ReactiveButton.Callb
4042
private ValueAnimator alphaAnimator;
4143
private float drawnAlpha = 1f;
4244

45+
private View back;
46+
4347
private Callback callback;
4448

4549
public PlayerControls(Context context) {
@@ -120,6 +124,11 @@ public boolean hasOverlappingRendering() {
120124
public void setAlpha(float alpha) {
121125
super.setAlpha(alpha);
122126
setVisibility(alpha == 0f ? GONE : VISIBLE);
127+
128+
if (back != null) {
129+
back.setAlpha(alpha);
130+
back.setVisibility(alpha == 0f ? GONE : VISIBLE);
131+
}
123132
}
124133

125134
@Override
@@ -135,6 +144,18 @@ protected void onFinishInflate() {
135144
playPauseButton.setCallback(this);
136145
}
137146

147+
@Override
148+
protected void onAttachedToWindow() {
149+
super.onAttachedToWindow();
150+
back = ((ViewGroup) getParent()).findViewById(R.id.back);
151+
}
152+
153+
@Override
154+
protected void onDetachedFromWindow() {
155+
super.onDetachedFromWindow();
156+
back = null;
157+
}
158+
138159
@Override
139160
public void onButtonSelectedChanged(ReactiveButton button, int selected) {
140161
if (button == prevButton) {

Player/app/src/main/java/org/floens/player/view/FitRecyclerView.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

Player/app/src/main/res/layout/controller_player.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,19 @@
99
android:layout_height="match_parent"
1010
android:background="#ff000000" />
1111

12-
<include layout="@layout/layout_player_controls" />
12+
<FrameLayout
13+
android:layout_width="match_parent"
14+
android:layout_height="match_parent"
15+
android:fitsSystemWindows="true">
1316

14-
<ImageView
15-
android:id="@+id/back"
16-
android:layout_width="56dp"
17-
android:layout_height="56dp"
18-
android:scaleType="center" />
17+
<ImageView
18+
android:id="@+id/back"
19+
android:layout_width="56dp"
20+
android:layout_height="56dp"
21+
android:scaleType="center" />
22+
23+
<include layout="@layout/layout_player_controls" />
24+
25+
</FrameLayout>
1926

2027
</org.floens.player.layout.PlayerControllerContainer>

0 commit comments

Comments
 (0)