From dbcc1ea45ecf34521aaa7b6d772a06a9deb4cda5 Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Mon, 19 Sep 2022 19:34:36 -0400
Subject: [PATCH] Hide overhang when not on 1st section

---
 components/JFOverhang.brs       | 16 ++++++++++++
 components/JFOverhang.xml       | 43 +++++++++++++++------------------
 components/music/ArtistView.brs | 14 +++++++++++
 3 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/components/JFOverhang.brs b/components/JFOverhang.brs
index cf41f342..a7615895 100644
--- a/components/JFOverhang.brs
+++ b/components/JFOverhang.brs
@@ -18,6 +18,9 @@ sub init()
     m.overlayRightGroup = m.top.findNode("overlayRightGroup")
     m.overlayTimeGroup = m.top.findNode("overlayTimeGroup")
 
+    m.slideDownAnimation = m.top.findNode("slideDown")
+    m.slideUpAnimation = m.top.findNode("slideUp")
+
     if not m.hideClock
         ' get system preference clock format (12/24hr)
         di = CreateObject("roDeviceInfo")
@@ -40,6 +43,19 @@ sub init()
     setClockVisibility()
 end sub
 
+sub onVisibleChange()
+    if m.top.disableMoveAnimation
+        m.top.translation = [0, 0]
+        return
+    end if
+    if m.top.isVisible
+        m.slideDownAnimation.control = "start"
+        return
+    end if
+
+    m.slideUpAnimation.control = "start"
+end sub
+
 sub updateTitle()
     leftSeperator = m.top.findNode("overlayLeftSeperator")
     if m.top.title <> ""
diff --git a/components/JFOverhang.xml b/components/JFOverhang.xml
index 954d4c82..139d61a5 100644
--- a/components/JFOverhang.xml
+++ b/components/JFOverhang.xml
@@ -1,27 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <component name="JFOverhang" extends="Group">
   <children>
-    <Poster id="overlayLogo"
-      uri="pkg:/images/logo.png"
-      translation="[70, 53]"
-      width="270" height="72" />
-    <LayoutGroup id="overlayLeftGroup" layoutDirection="horiz" translation="[375, 53]" itemSpacings="30" >
-      <Rectangle
-        id="overlayLeftSeperator"
-        color="#666666"
-        width="2"
-        height="64"/>
+    <Poster id="overlayLogo" uri="pkg:/images/logo.png" translation="[70, 53]" width="270" height="72" />
+    <LayoutGroup id="overlayLeftGroup" layoutDirection="horiz" translation="[375, 53]" itemSpacings="30">
+      <Rectangle id="overlayLeftSeperator" color="#666666" width="2" height="64"/>
       <ScrollingLabel id="overlayTitle" font="font:LargeSystemFont" vertAlign="center" height="64" maxWidth="1100" repeatCount="0" />
     </LayoutGroup>
-    <LayoutGroup id="overlayRightGroup" layoutDirection="horiz" itemSpacings="30" translation="[1820, 53]" horizAlignment="right" >
+    <LayoutGroup id="overlayRightGroup" layoutDirection="horiz" itemSpacings="30" translation="[1820, 53]" horizAlignment="right">
       <Label id="overlayCurrentUser" font="font:MediumSystemFont" width="300" horizAlign="right" vertAlign="center" height="64" />
-      <Rectangle
-        id="overlayRightSeperator"
-        color="#666666"
-        width="2"
-        height="64"
-        visible="false"/>
-      <LayoutGroup id="overlayTimeGroup" layoutDirection="horiz" horizAlignment="right" itemSpacings="0" >
+      <Rectangle id="overlayRightSeperator" color="#666666" width="2" height="64" visible="false"/>
+      <LayoutGroup id="overlayTimeGroup" layoutDirection="horiz" horizAlignment="right" itemSpacings="0">
         <Label id="overlayHours" font="font:MediumSystemFont" vertAlign="center" height="64" />
         <Label font="font:MediumSystemFont" text=":" vertAlign="center" height="64" />
         <Label id="overlayMinutes" font="font:MediumSystemFont" vertAlign="center" height="64" />
@@ -30,19 +18,26 @@
     </LayoutGroup>
 
     <LayoutGroup layoutDirection="horiz" horizAlignment="right" translation="[1820, 125]" vertAlignment="custom">
-        <Label id="overlayOptionsStar" font="font:LargeSystemFont" text="*"   />
-        <Label id="overlayOptionsText" font="font:SmallSystemFont" text="Options" translation="[0,6]" />
+      <Label id="overlayOptionsStar" font="font:LargeSystemFont" text="*" />
+      <Label id="overlayOptionsText" font="font:SmallSystemFont" text="Options" translation="[0,6]" />
     </LayoutGroup>
-    <Timer
-      id="currentTimeTimer"
-      repeat="true"
-      duration="60" />
+    <Timer id="currentTimeTimer" repeat="true" duration="60" />
+
+    <Animation id="slideUp" duration=".5" repeat="false">
+      <Vector2DFieldInterpolator key="[0.0, .5]" keyValue="[[0, 0], [0, -200]]" fieldToInterp="overhang.translation" />
+    </Animation>
+
+    <Animation id="slideDown" delay=".2" duration=".5" repeat="false">
+      <Vector2DFieldInterpolator key="[0.0, .5]" keyValue="[[0, -200], [0, 0]]" fieldToInterp="overhang.translation" />
+    </Animation>
   </children>
   <interface>
     <field id="id" type="string" />
     <field id="currentUser" type="string" onChange="updateUser" />
     <field id="title" type="string" onChange="updateTitle" />
     <field id="showOptions" value="true" type="boolean" onChange="updateOptions" />
+    <field id="isVisible" value="true" type="boolean" onChange="onVisibleChange" />
+    <field id="disableMoveAnimation" value="false" type="boolean" />
     <function name="resetTime" />
   </interface>
   <script type="text/brightscript" uri="JFOverhang.brs" />
diff --git a/components/music/ArtistView.brs b/components/music/ArtistView.brs
index d2f70542..2eaa868d 100644
--- a/components/music/ArtistView.brs
+++ b/components/music/ArtistView.brs
@@ -19,6 +19,8 @@ sub init()
     m.sectionNavigation.observeField("selected", "onSectionNavigationSelected")
 
     m.sectionScroller = m.top.findNode("sectionScroller")
+    m.sectionScroller.observeField("displayedIndex", "onSectionScrollerChange")
+    m.overhang = m.top.getScene().findNode("overhang")
 
     ' Load background image
     m.LoadBackdropImageTask = CreateObject("roSGNode", "LoadItemsTask")
@@ -31,6 +33,18 @@ sub init()
     createDialogPallete()
 end sub
 
+sub onSectionScrollerChange()
+    m.overhang.isVisible = (m.sectionScroller.displayedIndex = 0)
+end sub
+
+sub OnScreenHidden()
+    if not m.overhang.isVisible
+        m.overhang.disableMoveAnimation = true
+        m.overhang.isVisible = true
+        m.overhang.disableMoveAnimation = false
+    end if
+end sub
+
 sub onAlbumsEscape()
     if m.albums.escape = "up"
         m.sectionNavigation.selected = m.sectionScroller.displayedIndex - 1