Skip to content
This repository was archived by the owner on Feb 9, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class HoverViewStateCollapsed extends BaseHoverViewState {

protected FloatingTab mFloatingTab;
protected final Dragger.DragListener mDragListener = new FloatingTabDragListener(this);
private HoverMenu.Section mSelectedSection;
protected HoverMenu.Section mSelectedSection;
private int mSelectedSectionIndex = -1;
private boolean mIsCollapsed = false;
private boolean mIsDocked = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public void takeControl(@NonNull HoverView hoverView, final Runnable onStateChan
super.takeControl(hoverView, null);
Log.d(TAG, "Taking control.");
mMessageView = mHoverView.mScreen.getTabMessageView(mHoverView.mSelectedSectionId);
mMessageView.setMessageView(mSelectedSection.getTabMessageView());
mMessageView.appear(mHoverView.mCollapsedDock, new Runnable() {
@Override
public void run() {
Expand Down
13 changes: 6 additions & 7 deletions hover/src/main/java/io/mattcarroll/hover/Screen.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ public void enableDrugMode(boolean debugMode) {
@NonNull
public FloatingTab createChainedTab(@NonNull HoverMenu.Section section) {
String tabId = section.getId().toString();
return createChainedTab(tabId, section.getTabView(), section.getTabMessageView());
return createChainedTab(tabId, section.getTabView());
}

@NonNull
public FloatingTab createChainedTab(@NonNull String tabId, @NonNull View tabView, @Nullable View tabMessageView) {
public FloatingTab createChainedTab(@NonNull String tabId, @NonNull View tabView) {
Log.d(TAG, "Existing tabs...");
for (String existingTabId : mTabs.keySet()) {
Log.d(TAG, existingTabId);
Expand All @@ -97,11 +97,9 @@ public FloatingTab createChainedTab(@NonNull String tabId, @NonNull View tabView
chainedTab.enableDebugMode(mIsDebugMode);
mContainer.addView(chainedTab);
mTabs.put(tabId, chainedTab);
if (tabMessageView != null) {
final TabMessageView messageView = new TabMessageView(tabView.getContext(), tabMessageView, chainedTab);
mContainer.addView(messageView);
mTabMessageViews.put(tabId, messageView);
}
final TabMessageView messageView = new TabMessageView(tabView.getContext(), chainedTab);
mContainer.addView(messageView);
mTabMessageViews.put(tabId, messageView);
return chainedTab;
}
}
Expand All @@ -119,6 +117,7 @@ public FloatingTab getChainedTab(@Nullable String tabId) {

public void destroyChainedTab(@NonNull FloatingTab chainedTab) {
mTabs.remove(chainedTab.getTabId());
mTabMessageViews.remove(chainedTab.getTabId());
chainedTab.setTabView(null);
mContainer.removeView(chainedTab);
}
Expand Down
15 changes: 13 additions & 2 deletions hover/src/main/java/io/mattcarroll/hover/TabMessageView.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class TabMessageView extends HoverFrameLayout {

private final FloatingTab mFloatingTab;
private SideDock mSideDock;
private View mMessageView;

private final OnPositionChangeListener mOnTabPositionChangeListener = new OnPositionChangeListener() {
@Override
Expand Down Expand Up @@ -46,15 +47,25 @@ public void onDockChange(@NonNull Dock dock) {
}
};

public TabMessageView(@NonNull Context context, @NonNull View messageView, @NonNull FloatingTab floatingTab) {
public TabMessageView(@NonNull Context context, @NonNull FloatingTab floatingTab) {
super(context);
setClipToPadding(false);
setClipChildren(false);
mFloatingTab = floatingTab;
addView(messageView);
setVisibility(GONE);
}

public void setMessageView(@Nullable View view) {
if (view == mMessageView) {
return;
}
removeAllViews();
mMessageView = view;
if (mMessageView != null) {
addView(mMessageView);
}
}

public void appear(final SideDock dock, @Nullable final Runnable onAppeared) {
mSideDock = dock;
mFloatingTab.addOnPositionChangeListener(mOnTabPositionChangeListener);
Expand Down