9.0.0

README.md

@@ -6,7 +6,7 @@ If you're a Zenimax Media Inc. representative and have any objection to any of t
 
 This repo is also available at http://www.esoui.com/downloads/info1213-ESOUI-TheElderScrollsOnlinesourcecode.html
 
-**Last update: 8.3.7 (API 101037) on 11 Apr 2023.**
+**Last update: 9.0.0 (API 101038) on 17 Apr 2023.**
 
 *Join ESOUI Dev Community on Gitter :*
 

bin/update

@@ -2,7 +2,7 @@
 
 set -ue
 
-git checkout master
+git checkout pts9.0
 find esoui/ -type f -name "*.dds" > Textures.txt
 grep -Phor 'EsoUI[^"]+?\.dds' esoui/ >> Textures.txt
 cat Textures.txt | tr '[A-Z]\\' '[a-z]/' | sort -u > 1.txt

esoui/app/loadingscreen/gamepad/gamepadloadingscreen.lua

@@ -36,6 +36,11 @@ end
 function LoadingScreen_Gamepad:OnLongLoadTime(event)
     if not self:IsHidden() then
         self.longLoadAnimation:PlayFromStart()
+        if IsScreenNarrationEnabled() then
+            --Add the narration for the long load text
+            AddPendingNarrationText(GetString(SI_LONG_LOAD_TIME))
+            RequestReadPendingNarrationTextToClient(NARRATION_TYPE_UI_SCREEN)
+        end
     end
 end
 

esoui/app/loadingscreen/sharedloadingscreen.lua

@@ -91,7 +91,11 @@ function LoadingScreen_Base:Initialize()
     EVENT_MANAGER:RegisterForEvent(self:GetSystemName(), EVENT_DISCONNECTED_FROM_SERVER, function(...) self:OnDisconnectedFromServer(...) end)
     EVENT_MANAGER:RegisterForEvent(self:GetSystemName(), EVENT_RESUME_FROM_SUSPEND, function(...) self:OnResumeFromSuspend(...) end)
 
-    local function OnSubsystemLoadComplete(eventCode, system)
+    local function OnSubsystemLoadStateChanged(eventCode, system, isComplete)
+        if not isComplete then
+            return
+        end
+
         self:Log(string.format("Load Screen - %s Complete", GetLoadingSystemName(system)))
         if GetNumTotalSubsystemsToLoad() == GetNumLoadedSubsystems() then
             if not IsWaitingForTeleport() then
@@ -103,7 +107,7 @@ function LoadingScreen_Base:Initialize()
             end
         else
             local remainingText = "Load Screen - Waiting On: "
-            for i = 1, GetNumTotalSubsystemsToLoad() do
+            for i = LOADING_SYSTEM_ITERATION_BEGIN, LOADING_SYSTEM_ITERATION_END do
                 if not IsSystemLoaded(i) then
                     remainingText = remainingText .. GetLoadingSystemName(i) .. ", "
                 end
@@ -112,7 +116,7 @@ function LoadingScreen_Base:Initialize()
         end
     end
 
-    EVENT_MANAGER:RegisterForEvent(self:GetSystemName(), EVENT_SUBSYSTEM_LOAD_COMPLETE, OnSubsystemLoadComplete)
+    EVENT_MANAGER:RegisterForEvent(self:GetSystemName(), EVENT_SUBSYSTEM_LOAD_STATE_CHANGED, OnSubsystemLoadStateChanged)
 
     self:SizeLoadingTexture()
     self:InitializeAnimations()

esoui/common/common.txt

@@ -29,8 +29,6 @@ EsoUI\Common\Console\AutoSaving_Console.xml
 EsoUI\Common\Console\ZO_PlayerConsoleInfoRequestManager.lua
 EsoUI\Common\Console\ZO_PlayerConsoleRequestsUtils.lua
 
-EsoUI\Common\Heron\HeronURLManager.lua
-
 EsoUI\Common\Gamepad\GenericHeaders\GenericHeaders.lua
 EsoUI\Common\Gamepad\GenericHeaders\GenericHeaders.xml
 EsoUI\Common\Gamepad\GenericFooters\GenericFooters.lua

esoui/common/gamepad/genericheaders/genericheaders.lua

@@ -658,7 +658,12 @@ function ZO_GamepadGenericHeader_Refresh(control, data, blockTabBarCallbacks)
         control.tabBar:Clear()
         if data.tabBarEntries then
             for i, tabData in ipairs(data.tabBarEntries) do
-                if (tabData.visible == nil) or tabData.visible() then
+                local visible = tabData.visible
+                if type(visible) == "function" then
+                    visible = visible()
+                end
+
+                if visible ~= false then
                     if tabData.template then
                         control.tabBar:AddEntry(tabData.template, tabData)
                     else

esoui/common/gamepad/genericheaders/genericheaders.xml

@@ -10,7 +10,7 @@
         <Label name="ZO_GamepadHeaderDataTextTemplate" maxLineCount="1" font="ZoFontGamepadHeaderDataValue" wrapMode="ELLIPSIS" virtual="true" />
 
         <!-- End Font Templates -->
-        
+
         <Control name="ZO_GamepadHeaderAnchors" resizeToFitDescendents="true" virtual="true">
             <Anchor point="TOPLEFT" />
             <Anchor point="TOPRIGHT" />
@@ -23,19 +23,19 @@
 
         <Control name="ZO_GamepadHeaderHorizontalDivider" resizeToFitConstrains="Y" virtual="true">
             <Controls>
-                <Texture name="$(parent)Left" textureFile="EsoUI/Art/Windows/Gamepad/gp_nav1_horDividerFlat.dds" level="2">
+                <Texture name="$(parent)Left" textureFile="EsoUI/Art/Windows/Gamepad/gp_nav1_horDividerFlat.dds" level="4">
                     <Anchor point="LEFT" />
                     <Dimensions x="4" y="8" />
                     <TextureCoords left="0" right="0.25" top=".25" bottom=".75" />
                 </Texture>
 
-                <Texture name="$(parent)Right" textureFile="EsoUI/Art/Windows/Gamepad/gp_nav1_horDividerFlat.dds" level="2">
+                <Texture name="$(parent)Right" textureFile="EsoUI/Art/Windows/Gamepad/gp_nav1_horDividerFlat.dds" level="4">
                     <Anchor point="RIGHT" />
                     <Dimensions x="4" y="8" />
                     <TextureCoords left="0.75" right="1" top=".25" bottom=".75" />
                 </Texture>
 
-                <Texture name="$(parent)Center" textureFile="EsoUI/Art/Windows/Gamepad/gp_nav1_horDividerFlat.dds" level="2">
+                <Texture name="$(parent)Center" textureFile="EsoUI/Art/Windows/Gamepad/gp_nav1_horDividerFlat.dds" level="4">
                     <Anchor point="TOPLEFT" relativeTo="$(parent)Left" relativePoint="TOPRIGHT" />
                     <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)Right" relativePoint="BOTTOMLEFT" />
                     <TextureCoords left="0.25" right="0.75" top=".25" bottom=".75" />

esoui/common/gamepad/zo_gamepadentrydata.lua

@@ -143,6 +143,13 @@ function ZO_GamepadEntryData:InitializeLootVisualData(lootId, count, displayQual
     end
 end
 
+function ZO_GamepadEntryData:InitializeCollectibleVisualData(collectibleData, actorCategory)
+    self:SetNew(collectibleData:IsNew())
+    self:SetEnabled(not collectibleData:IsBlocked(actorCategory))
+    self.isFavorite = collectibleData:IsFavorite()
+    -- Don't need to specify data.isPrimaryResidence because it's already on the collectibleData
+end
+
 --[[ Setters for specific fields and options ]]--
 function ZO_GamepadEntryData:SetHeader(header)
     self.header = header

esoui/common/gamepad/zo_gamepadparametricscrolllistscreen.lua

@@ -339,6 +339,31 @@ function ZO_Gamepad_ParametricList_Screen:AddSearch(textSearchKeybindStripDescri
     self:SetupHeaderFocus(self.textSearchHeaderFocus)
 
     ZO_GamepadGenericHeader_SetHeaderFocusControl(self.header, self.textSearchHeaderControl)
+
+    --Register the text search header for narration
+    local textSearchHeaderNarrationInfo =
+    {
+        headerNarrationFunction = function()
+            return self:GetHeaderNarration()
+        end,
+        resultsNarrationFunction = function()
+            local narrations = {}
+            local currentList = self:GetCurrentList()
+            if currentList then
+                --If current list is not a parametric list, ask it to give us the parametric list
+                if not currentList:IsInstanceOf(ZO_ParametricScrollList) then
+                    currentList = currentList:GetParametricList()
+                end
+
+                --If the list is empty, include the empty text as part of the results narration
+                if currentList:IsEmpty() then
+                    ZO_AppendNarration(narrations, SCREEN_NARRATION_MANAGER:CreateNarratableObject(currentList:GetNoItemText()))
+                end
+            end
+            return narrations
+        end,
+    }
+    SCREEN_NARRATION_MANAGER:RegisterTextSearchHeader(self.textSearchHeaderFocus, textSearchHeaderNarrationInfo)
 end
 
 function ZO_Gamepad_ParametricList_Screen:IsTextSearchEntryHidden()

esoui/common/gamepad/zo_gamepadtemplatescommon.lua

@@ -437,6 +437,14 @@ local function ZO_SharedGamepadEntryStatusIndicatorSetup(statusIndicator, data)
             statusIndicator:AddIcon(ZO_IN_ARMORY_BUILD_ICON, NO_TINT, GetString(SI_SCREEN_NARRATION_IN_ARMORY_BUILD_ICON_NARRATION))
         end
 
+        if data.isFavorite then
+            statusIndicator:AddIcon("EsoUI/Art/Collections/Favorite_StarOnly.dds", NO_TINT)
+        end
+
+        if data.isPrimaryResidence then
+            statusIndicator:AddIcon("EsoUI/Art/Collections/PrimaryHouse.dds", NO_TINT)
+        end
+
         statusIndicator:Show()
     end
 end

esoui/common/gamepad/zo_textsearch_header_gamepad.lua

@@ -15,8 +15,6 @@ function ZO_TextSearch_Header_Gamepad:Initialize(control, onTextChangedCallback)
     self.headerTextFilterEditBox:SetHandler("OnTextChanged", onTextChangedCallback)
     --When the edit box loses focus, fire off a callback that screen narration will listen for
     self.headerTextFilterEditBox:SetHandler("OnFocusLost", function() self:FireCallbacks("EditBoxFocusLost") end, "TextSearchHeader")
-
-    SCREEN_NARRATION_MANAGER:RegisterTextSearchHeader(self)
 end
 
 function ZO_TextSearch_Header_Gamepad:IsActive()
@@ -72,4 +70,8 @@ end
 
 function ZO_TextSearch_Header_Gamepad:GetEditBox()
     return self.headerTextFilterEditBox
+end
+
+function ZO_TextSearch_Header_Gamepad:GetNarrationText()
+    return ZO_FormatEditBoxNarrationText(self:GetEditBox(), GetString(SI_SCREEN_NARRATION_EDIT_BOX_SEARCH_NAME))
 end

esoui/common/globals/platformstoredialogs.lua

@@ -42,10 +42,6 @@ function ZO_ShowBuyCrownsPlatformDialog()
     OnMarketPurchaseMoreCrowns()
     if DoesPlatformStoreUseExternalLinks() then 
         ZO_PlatformOpenApprovedURL(APPROVED_URL_ESO_ACCOUNT_STORE, ZO_GetPlatformStoreName(), GetString(SI_URL_APPLICATION_WEB))
-    elseif GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_HERON then
-        -- A temporary solution until Stadia goes away next update.
-        -- This will just redirect to the generic confirm url dialog
-        ShowPlatformESOCrownPacksUI()
     else
         ZO_Dialogs_ShowPlatformDialog("BUY_CROWNS_FROM_PLATFORM_STORE", nil, { mainTextParams = { ZO_Currency_FormatKeyboard(CURT_CROWNS, NO_AMOUNT, ZO_CURRENCY_FORMAT_PLURAL_NAME_ICON), ZO_GetPlatformStoreName() } })
     end
@@ -66,22 +62,14 @@ ESO_Dialogs["BUY_ESO_PLUS_FROM_PLATFORM_STORE"] =
     mainText =
     {
         text = function()
-            if GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_HERON then
-                return SI_OPEN_STORE_TO_BUY_PLUS_TEXT_HERON
-            else
-                return zo_strformat(SI_OPEN_STORE_TO_BUY_PLUS_TEXT, ZO_GetPlatformStoreName())
-            end
+            return zo_strformat(SI_OPEN_STORE_TO_BUY_PLUS_TEXT, ZO_GetPlatformStoreName())
         end,
     },
     buttons =
     {
         {
             text = function()
-                if GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_HERON then
-                    return GetString(SI_START_HERON_PURCHASE_FLOW)
-                else
-                    return zo_strformat(SI_OPEN_FIRST_PARTY_STORE_KEYBIND, ZO_GetPlatformStoreName())
-                end
+                return zo_strformat(SI_OPEN_FIRST_PARTY_STORE_KEYBIND, ZO_GetPlatformStoreName())
             end,
             callback =  function(dialog)
                 ShowPlatformESOPlusSubscriptionUI()
@@ -96,10 +84,6 @@ ESO_Dialogs["BUY_ESO_PLUS_FROM_PLATFORM_STORE"] =
 function ZO_ShowBuySubscriptionPlatformDialog()
     if DoesPlatformStoreUseExternalLinks() then
         ZO_PlatformOpenApprovedURL(APPROVED_URL_ESO_ACCOUNT_SUBSCRIPTION, ZO_GetPlatformStoreName(), GetString(SI_URL_APPLICATION_WEB))
-    elseif GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_HERON then
-        -- A temporary solution until Stadia goes away next update.
-        -- This will just redirect to the generic confirm url dialog
-        ShowPlatformESOPlusSubscriptionUI()
     else
         ZO_Dialogs_ShowPlatformDialog("BUY_ESO_PLUS_FROM_PLATFORM_STORE")
     end
@@ -130,8 +114,6 @@ ESO_Dialogs["CHAPTER_UPGRADE_STORE"] =
                     return SI_OPEN_CHAPTER_PREPURCHASE_STEAM
                 elseif GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_EPIC then
                     return SI_OPEN_CHAPTER_PREPURCHASE_EPIC
-                elseif GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_HERON then
-                    return SI_OPEN_CHAPTER_PREPURCHASE_HERON
                 elseif DoesPlatformStoreUseExternalLinks() then
                     return zo_strformat(SI_OPEN_CHAPTER_PREPURCHASE_WEB, ZO_GetPlatformStoreName())
                 else
@@ -143,8 +125,6 @@ ESO_Dialogs["CHAPTER_UPGRADE_STORE"] =
                     mainText = GetString(SI_OPEN_CHAPTER_UPGRADE_STEAM)
                 elseif GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_EPIC then
                     mainText = GetString(SI_OPEN_CHAPTER_UPGRADE_EPIC)
-                elseif GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_HERON then
-                    mainText = GetString(SI_OPEN_CHAPTER_UPGRADE_HERON)
                 elseif DoesPlatformStoreUseExternalLinks() then
                     mainText = zo_strformat(SI_OPEN_CHAPTER_UPGRADE_WEB, ZO_GetPlatformStoreName())
                 else
@@ -164,11 +144,7 @@ ESO_Dialogs["CHAPTER_UPGRADE_STORE"] =
     {
         {
             text = function()
-                if GetPlatformServiceType() == PLATFORM_SERVICE_TYPE_HERON then
-                    return GetString(SI_START_HERON_PURCHASE_FLOW)
-                else
-                    return GetString(SI_DIALOG_UPGRADE)
-                end
+                return GetString(SI_DIALOG_UPGRADE)
             end,
             callback = function(dialog)
                 if DoesPlatformStoreUseExternalLinks() then

esoui/common/globals/shareddialogs.lua

@@ -104,6 +104,8 @@ ESO_Dialogs["CONFIRM_OPEN_URL_BY_TYPE"] =
                 local serviceType = GetPlatformServiceType()
                 if serviceType == PLATFORM_SERVICE_TYPE_STEAM then
                     return SI_CONFIRM_OPEN_STEAM_STORE
+                elseif serviceType == PLATFORM_SERVICE_TYPE_EPIC then
+                    return SI_CONFIRM_OPEN_EPIC_STORE
                 end
             else
                 return SI_CONFIRM_OPEN_URL_TEXT
@@ -190,7 +192,7 @@ ESO_Dialogs["SHOW_REDEEM_CODE_CONSOLE"] =
             callback = function(dialog)
                 if IsConsoleUI() then
                     ShowConsoleRedeemCodeUI()
-                else -- It's intended that Heron do this as well
+                else
                     OpenURLByType(APPROVED_URL_ESO_ACCOUNT)
                 end
             end,