Implement global focus highlight

This commit is contained in:
Alexander 2019-09-23 14:17:03 +07:00 committed by Alexander--
parent eb6d26b6a4
commit d23227d427
5 changed files with 271 additions and 0 deletions

View file

@ -69,6 +69,7 @@ import org.schabi.newpipe.util.PermissionHelper;
import org.schabi.newpipe.util.ServiceHelper; import org.schabi.newpipe.util.ServiceHelper;
import org.schabi.newpipe.util.StateSaver; import org.schabi.newpipe.util.StateSaver;
import org.schabi.newpipe.util.ThemeHelper; import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.views.FocusOverlayView;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
private static final String TAG = "MainActivity"; private static final String TAG = "MainActivity";
@ -121,6 +122,10 @@ public class MainActivity extends AppCompatActivity {
} catch (Exception e) { } catch (Exception e) {
ErrorActivity.reportUiError(this, e); ErrorActivity.reportUiError(this, e);
} }
if (FireTvUtils.isFireTv()) {
FocusOverlayView.setupFocusObserver(this);
}
} }
private void setupDrawer() throws Exception { private void setupDrawer() throws Exception {

View file

@ -45,10 +45,12 @@ import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.report.UserAction;
import org.schabi.newpipe.util.Constants; import org.schabi.newpipe.util.Constants;
import org.schabi.newpipe.util.ExtractorHelper; import org.schabi.newpipe.util.ExtractorHelper;
import org.schabi.newpipe.util.FireTvUtils;
import org.schabi.newpipe.util.ListHelper; import org.schabi.newpipe.util.ListHelper;
import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.util.PermissionHelper; import org.schabi.newpipe.util.PermissionHelper;
import org.schabi.newpipe.util.ThemeHelper; import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.views.FocusOverlayView;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
@ -316,6 +318,10 @@ public class RouterActivity extends AppCompatActivity {
selectedPreviously = selectedRadioPosition; selectedPreviously = selectedRadioPosition;
alertDialog.show(); alertDialog.show();
if (FireTvUtils.isFireTv()) {
FocusOverlayView.setupFocusObserver(alertDialog);
}
} }
private List<AdapterChoiceItem> getChoicesForService(StreamingService service, LinkType linkType) { private List<AdapterChoiceItem> getChoicesForService(StreamingService service, LinkType linkType) {

View file

@ -13,7 +13,9 @@ import android.view.ViewTreeObserver;
import org.schabi.newpipe.R; import org.schabi.newpipe.R;
import org.schabi.newpipe.settings.SettingsActivity; import org.schabi.newpipe.settings.SettingsActivity;
import org.schabi.newpipe.util.FireTvUtils;
import org.schabi.newpipe.util.ThemeHelper; import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.views.FocusOverlayView;
import us.shandian.giga.service.DownloadManagerService; import us.shandian.giga.service.DownloadManagerService;
import us.shandian.giga.ui.fragment.MissionsFragment; import us.shandian.giga.ui.fragment.MissionsFragment;
@ -50,6 +52,10 @@ public class DownloadActivity extends AppCompatActivity {
getWindow().getDecorView().getViewTreeObserver().removeOnGlobalLayoutListener(this); getWindow().getDecorView().getViewTreeObserver().removeOnGlobalLayoutListener(this);
} }
}); });
if (FireTvUtils.isFireTv()) {
FocusOverlayView.setupFocusObserver(this);
}
} }
private void updateFragments() { private void updateFragments() {

View file

@ -84,6 +84,7 @@ import org.schabi.newpipe.util.PermissionHelper;
import org.schabi.newpipe.util.ShareUtils; import org.schabi.newpipe.util.ShareUtils;
import org.schabi.newpipe.util.StateSaver; import org.schabi.newpipe.util.StateSaver;
import org.schabi.newpipe.util.ThemeHelper; import org.schabi.newpipe.util.ThemeHelper;
import org.schabi.newpipe.views.FocusOverlayView;
import java.util.List; import java.util.List;
import java.util.Queue; import java.util.Queue;
@ -141,6 +142,7 @@ public final class MainVideoPlayer extends AppCompatActivity
hideSystemUi(); hideSystemUi();
setContentView(R.layout.activity_main_player); setContentView(R.layout.activity_main_player);
playerImpl = new VideoPlayerImpl(this); playerImpl = new VideoPlayerImpl(this);
playerImpl.setup(findViewById(android.R.id.content)); playerImpl.setup(findViewById(android.R.id.content));
@ -172,6 +174,10 @@ public final class MainVideoPlayer extends AppCompatActivity
getContentResolver().registerContentObserver( getContentResolver().registerContentObserver(
Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION), Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION),
false, rotationObserver); false, rotationObserver);
if (FireTvUtils.isFireTv()) {
FocusOverlayView.setupFocusObserver(this);
}
} }
@Override @Override

View file

@ -0,0 +1,248 @@
/*
* Copyright 2019 Alexander Rvachev <rvacheva@nxt.ru>
* FocusOverlayView.java is part of NewPipe
*
* License: GPL-3.0+
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.schabi.newpipe.views;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.Window;
import androidx.annotation.NonNull;
import androidx.appcompat.view.WindowCallbackWrapper;
import org.schabi.newpipe.R;
import java.lang.ref.WeakReference;
public final class FocusOverlayView extends Drawable implements
ViewTreeObserver.OnGlobalFocusChangeListener,
ViewTreeObserver.OnDrawListener,
ViewTreeObserver.OnGlobalLayoutListener,
ViewTreeObserver.OnScrollChangedListener, ViewTreeObserver.OnTouchModeChangeListener {
private boolean isInTouchMode;
private final Rect focusRect = new Rect();
private final Paint rectPaint = new Paint();
private final Handler animator = new Handler(Looper.getMainLooper()) {
@Override
public void handleMessage(Message msg) {
updateRect();
}
};
private WeakReference<View> focused;
public FocusOverlayView(Context context) {
rectPaint.setStyle(Paint.Style.STROKE);
rectPaint.setStrokeWidth(2);
rectPaint.setColor(context.getResources().getColor(R.color.white));
}
@Override
public void onGlobalFocusChanged(View oldFocus, View newFocus) {
int l = focusRect.left;
int r = focusRect.right;
int t = focusRect.top;
int b = focusRect.bottom;
if (newFocus != null && newFocus.getWidth() > 0 && newFocus.getHeight() > 0) {
newFocus.getGlobalVisibleRect(focusRect);
focused = new WeakReference<>(newFocus);
} else {
focusRect.setEmpty();
focused = null;
}
if (l != focusRect.left || r != focusRect.right || t != focusRect.top || b != focusRect.bottom) {
invalidateSelf();
}
focused = new WeakReference<>(newFocus);
animator.sendEmptyMessageDelayed(0, 1000);
}
private void updateRect() {
if (focused == null) {
return;
}
View focused = this.focused.get();
int l = focusRect.left;
int r = focusRect.right;
int t = focusRect.top;
int b = focusRect.bottom;
if (focused != null) {
focused.getGlobalVisibleRect(focusRect);
} else {
focusRect.setEmpty();
}
if (l != focusRect.left || r != focusRect.right || t != focusRect.top || b != focusRect.bottom) {
invalidateSelf();
}
}
@Override
public void onDraw() {
updateRect();
}
@Override
public void onScrollChanged() {
updateRect();
animator.removeMessages(0);
animator.sendEmptyMessageDelayed(0, 1000);
}
@Override
public void onGlobalLayout() {
updateRect();
animator.sendEmptyMessageDelayed(0, 1000);
}
@Override
public void onTouchModeChanged(boolean isInTouchMode) {
this.isInTouchMode = isInTouchMode;
if (isInTouchMode) {
updateRect();
} else {
invalidateSelf();
}
}
public void setCurrentFocus(View focused) {
if (focused == null) {
return;
}
this.isInTouchMode = focused.isInTouchMode();
onGlobalFocusChanged(null, focused);
}
@Override
public void draw(@NonNull Canvas canvas) {
if (!isInTouchMode && focusRect.width() != 0) {
canvas.drawRect(focusRect, rectPaint);
}
}
@Override
public int getOpacity() {
return PixelFormat.TRANSPARENT;
}
@Override
public void setAlpha(int alpha) {
}
@Override
public void setColorFilter(ColorFilter colorFilter) {
}
public static void setupFocusObserver(Dialog dialog) {
Rect displayRect = new Rect();
Window window = dialog.getWindow();
assert window != null;
View decor = window.getDecorView();
decor.getWindowVisibleDisplayFrame(displayRect);
FocusOverlayView overlay = new FocusOverlayView(dialog.getContext());
overlay.setBounds(0, 0, displayRect.width(), displayRect.height());
setupOverlay(window, overlay);
}
public static void setupFocusObserver(Activity activity) {
Rect displayRect = new Rect();
Window window = activity.getWindow();
View decor = window.getDecorView();
decor.getWindowVisibleDisplayFrame(displayRect);
FocusOverlayView overlay = new FocusOverlayView(activity);
overlay.setBounds(0, 0, displayRect.width(), displayRect.height());
setupOverlay(window, overlay);
}
private static void setupOverlay(Window window, FocusOverlayView overlay) {
ViewGroup decor = (ViewGroup) window.getDecorView();
decor.getOverlay().add(overlay);
ViewTreeObserver observer = decor.getViewTreeObserver();
observer.addOnScrollChangedListener(overlay);
observer.addOnGlobalFocusChangeListener(overlay);
observer.addOnGlobalLayoutListener(overlay);
observer.addOnTouchModeChangeListener(overlay);
overlay.setCurrentFocus(decor.getFocusedChild());
// Some key presses don't actually move focus, but still result in movement on screen.
// For example, MovementMethod of TextView may cause requestRectangleOnScreen() due to
// some "focusable" spans, which in turn causes CoordinatorLayout to "scroll" it's children.
// Unfortunately many such forms of "scrolling" do not count as scrolling for purpose
// of dispatching ViewTreeObserver callbacks, so we have to intercept them by directly
// receiving keys from Window.
window.setCallback(new WindowCallbackWrapper(window.getCallback()) {
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
boolean res = super.dispatchKeyEvent(event);
overlay.onKey(event);
return res;
}
});
}
private void onKey(KeyEvent event) {
if (event.getAction() != KeyEvent.ACTION_DOWN) {
return;
}
updateRect();
animator.sendEmptyMessageDelayed(0, 100);
}
}