Skip to content

Commit

Permalink
Temp commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@simoarpe
simoarpe committed Dec 16, 2024
1 parent b66f4dc commit a3c42b1
Showing 1 changed file with 253 additions and 2 deletions.
255 changes: 253 additions & 2 deletions android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,30 @@

package org.chromium.chrome.browser.tabbed_mode;

import static org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher.ActivityState.RESUMED_WITH_NATIVE;

import android.app.PictureInPictureParams;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;

import org.chromium.base.Callback;
import org.chromium.base.Log;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.ObservableSupplierImpl;
import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.base.supplier.OneshotSupplierImpl;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.BackgroundVideoPlaybackTabHelper;
import org.chromium.chrome.browser.app.BraveActivity;
import org.chromium.chrome.browser.back_press.BackPressManager;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
Expand All @@ -33,34 +42,45 @@
import org.chromium.chrome.browser.hub.HubManager;
import org.chromium.chrome.browser.keyboard_accessory.ManualFillingComponentSupplier;
import org.chromium.chrome.browser.layouts.LayoutStateProvider;
import org.chromium.chrome.browser.layouts.LayoutType;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabHidingType;
import org.chromium.chrome.browser.tab_ui.TabContentManager;
import org.chromium.chrome.browser.tab_ui.TabSwitcher;
import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
import org.chromium.chrome.browser.toolbar.ToolbarIntentMetadata;
import org.chromium.chrome.browser.ui.appmenu.AppMenuBlocker;
import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider;
import org.chromium.chrome.browser.youtube.YouTubeFeaturesLayout;
import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
import org.chromium.chrome.browser.util.TabUtils;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.NavigationHandle;
import org.chromium.net.NetError;
import org.chromium.ui.InsetObserver;
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.ui.widget.Toast;
import org.chromium.url.GURL;

import java.util.function.BooleanSupplier;
import java.util.function.Function;

public class BraveTabbedRootUiCoordinator extends TabbedRootUiCoordinator {
private AppCompatActivity mActivity;
private OneshotSupplier<HubManager> mHubManagerSupplier;
private final AppCompatActivity mActivity;
private final OneshotSupplier<HubManager> mHubManagerSupplier;
private YouTubeFeaturesLayout mYouTubeLayout;

public BraveTabbedRootUiCoordinator(
@NonNull AppCompatActivity activity,
Expand Down Expand Up @@ -174,6 +194,190 @@ public void onPostInflationStartup() {
.updateBottomSheetPosition(
mActivity.getResources().getConfiguration().orientation);
}

ViewGroup viewGroup = mActivity.getWindow().getDecorView().findViewById(android.R.id.content);
mYouTubeLayout = new YouTubeFeaturesLayout(mActivity, new YouTubeFeaturesLayout.Callback() {
@Override
public void onFullscreenClick() {
final Tab currentTab = mTabModelSelectorSupplier.get().getCurrentTab();
//noinspection ConstantValue
if (TabUtils.isYouTubeVideo(currentTab) && mActivity instanceof BraveActivity braveActivity) {
if (braveActivity.isActivityFinishingOrDestroyed()) {
return;
}
BackgroundVideoPlaybackTabHelper.setFullscreen(currentTab.getWebContents());
}
}

@Override
public void onPictureInPictureClick() {
if (!mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
Toast.makeText(mActivity, R.string.picture_in_picture_not_supported, Toast.LENGTH_LONG).show();
return;
}

final Tab currentTab = mTabModelSelectorSupplier.get().getCurrentTab();
//noinspection ConstantValue
if (TabUtils.isYouTubeVideo(currentTab) && mActivity instanceof BraveActivity braveActivity) {
if (braveActivity.getLifecycleDispatcher().getCurrentActivityState() != RESUMED_WITH_NATIVE) {
return;
}
BackgroundVideoPlaybackTabHelper.setFullscreen(currentTab.getWebContents());
braveActivity.enterPictureInPictureMode(new PictureInPictureParams.Builder().build());
}
}
});

FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT);
params.bottomMargin = (int) mActivity.getResources().getDimension(R.dimen.youtube_features_layout_margin_bottom);
params.leftMargin = (int) mActivity.getResources().getDimension(R.dimen.youtube_features_layout_margin_left);
params.gravity = Gravity.BOTTOM | Gravity.START;

mYouTubeLayout.setLayoutParams(params);
mYouTubeLayout.setVisibility(View.GONE);
viewGroup.addView(mYouTubeLayout);

mTabModelSelectorSupplier.addObserver(selector -> new TabModelSelectorTabObserver(selector) {
@Override
public void onInitialized(Tab tab, String appId) {
Log.d("SIMONE", "onInitialized");
}

@Override
public void onShown(Tab tab, int type) {
if (mIsInOverviewModeSupplier.get()) {
return;
}
Log.d("SIMONE", "onShown");
if (!tab.isHidden()) {
mYouTubeLayout.setVisibility(TabUtils.isYouTubeVideo(tab) ? View.VISIBLE : View.GONE);
}
}

@Override
public void onHidden(Tab tab, @TabHidingType int reason) {
Log.d("SIMONE", "onHidden");
}

@Override
public void onDestroyed(Tab tab) {
Log.d("SIMONE", "onDestroyed");
}

@Override
public void onContentChanged(Tab tab) {
Log.d("SIMONE", "onContentChanged");
}

@Override
public void onLoadUrl(Tab tab, LoadUrlParams params, Tab.LoadUrlResult loadUrlResult) {
Log.d("SIMONE", "onLoadUrl");
}

@Override
public void onPageLoadFinished(Tab tab, GURL url) {
Log.d("SIMONE", "onPageLoadFinished");
}

@Override
public void onPageLoadFailed(Tab tab, @NetError int errorCode) {
Log.d("SIMONE", "onPageLoadFailed");
}

@Override
public void onRestoreStarted(Tab tab) {
Log.d("SIMONE", "onRestoreStarted");
}

@Override
public void onRestoreFailed(Tab tab) {
Log.d("SIMONE", "onRestoreFailed");
}

@Override
public void onUrlUpdated(Tab tab) {
Log.d("SIMONE", "onUrlUpdated");
}

@Override
public void onCrash(Tab tab) {
Log.d("SIMONE", "onCrash");
}

@Override
public void webContentsWillSwap(Tab tab) {
Log.d("SIMONE", "webContentsWillSwap");
}

@Override
public void onWebContentsSwapped(Tab tab, boolean didStartLoad, boolean didFinishLoad) {
Log.d("SIMONE", "onWebContentsSwapped");
}

@Override
public void onContextMenuShown(Tab tab) {
Log.d("SIMONE", "onContextMenuShown");
}

@Override
public void onCloseContents(Tab tab) {
Log.d("SIMONE", "onCloseContents");
}

@Override
public void onLoadStarted(Tab tab, boolean toDifferentDocument) {
Log.d("SIMONE", "onLoadStarted");
}

@Override
public void onLoadStopped(Tab tab, boolean toDifferentDocument) {
Log.d("SIMONE", "onLoadStopped");
}

@Override
public void onLoadProgressChanged(Tab tab, float progress) {
Log.d("SIMONE", "onLoadProgressChanged");
}

@Override
public void onUpdateUrl(Tab tab, GURL url) {
Log.d("SIMONE", "onUpdateUrl");
}

@Override
public void onDidStartNavigationInPrimaryMainFrame(
Tab tab, NavigationHandle navigationHandle) {
Log.d("SIMONE", "onDidStartNavigationInPrimaryMainFrame");
}

@Override
public void onDidRedirectNavigation(Tab tab, NavigationHandle navigationHandle) {
Log.d("SIMONE", "onDidRedirectNavigation");
}

@Override
public void onDidFinishNavigationEnd() {
Log.d("SIMONE", "onDidFinishNavigationEnd");
}

@Override
public void onClosingStateChanged(Tab tab, boolean closing) {
Log.d("SIMONE", "onClosingStateChanged");
}

@Override
public void onPageLoadStarted(Tab tab, GURL url) {
Log.d("SIMONE", "onPageLoadStarted");
}

@Override
public void onDidFinishNavigationInPrimaryMainFrame(Tab tab, NavigationHandle navigation) {
Log.d("SIMONE", "VISIBILITY_CHANGE onDidFinishNavigationInPrimaryMainFrame isHidden: " + tab.isHidden());
if (!tab.isHidden()) {
mYouTubeLayout.setVisibility(TabUtils.isYouTubeVideo(tab) ? View.VISIBLE : View.GONE);
}
}
});
}

@Override
Expand All @@ -190,5 +394,52 @@ protected void onLayoutManagerAvailable(LayoutManagerImpl layoutManager) {
* -1;
hubManager.setStatusIndicatorHeight(bottomToolbarHeight);
});

layoutManager.addObserver(new LayoutStateProvider.LayoutStateObserver() {
@Override
public void onStartedShowing(int layoutType) {
LayoutStateProvider.LayoutStateObserver.super.onStartedShowing(layoutType);
Log.d("SIMONE", "LAYOUT VISIBILITY_CHANGE onStartedShowing layoutType: " + layoutType);
showYouTubeExtraFeatures(true, layoutType, mTabModelSelectorSupplier.get());
}

@Override
public void onFinishedShowing(int layoutType) {
LayoutStateProvider.LayoutStateObserver.super.onFinishedShowing(layoutType);
Log.d("SIMONE", "LAYOUT onFinishedShowing layoutType: " + layoutType);
}

@Override
public void onStartedHiding(int layoutType) {
LayoutStateProvider.LayoutStateObserver.super.onStartedHiding(layoutType);
Log.d("SIMONE", "LAYOUT VISIBILITY_CHANGE onStartedHiding layoutType: " + layoutType);
showYouTubeExtraFeatures(false, layoutType, mTabModelSelectorSupplier.get());
}

@Override
public void onFinishedHiding(int layoutType) {
LayoutStateProvider.LayoutStateObserver.super.onFinishedHiding(layoutType);
Log.d("SIMONE", "LAYOUT onFinishedHiding layoutType: " + layoutType);
}
});

}

private void showYouTubeExtraFeatures(final boolean show,
@LayoutType final int layoutType,
@NonNull final TabModelSelector tabModelSelector) {
if (layoutType != LayoutType.BROWSING || mYouTubeLayout == null) {
return;
}

if (!TabUtils.isYouTubeVideo(tabModelSelector.getCurrentTab())) {
// Toast.makeText(mBraveToolbarLayout.getContext(), "Hide!", Toast.LENGTH_SHORT).show();
mYouTubeLayout.setVisibility(View.GONE);
return;
}

mYouTubeLayout.setVisibility(show ? View.VISIBLE : View.GONE);
// Toast.makeText(mBraveToolbarLayout.getContext(), show ? "Show YT layout" : "Hide YT layout", Toast.LENGTH_SHORT).show();
}

}

0 comments on commit a3c42b1

Please sign in to comment.