Mobile: Toolbar color depends on sidebar

Toolbar should reflect the colors of the current view, whether it's a page or the sidebar.

4 files changed, 31 insertions, 7 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 3fc22bdf..bd624059 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1674,7 +1674,7 @@ static void scrollBegan_DocumentWidget_(iAnyObject *any, int offset, uint32_t du
     if (deviceType_App() == phone_AppDeviceType) {
         const float normPos = normScrollPos_DocumentWidget_(d);
         if (prefs_App()->hideToolbarOnScroll && iAbs(offset) > 5 && normPos >= 0) {
-            showToolbars_Root(as_Widget(d)->root, offset < 0);
+            showToolbar_Root(as_Widget(d)->root, offset < 0);
         }
     }
     updateVisible_DocumentWidget_(d);
@@ -2840,7 +2840,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             if (d->flags & openedFromSidebar_DocumentWidgetFlag &&
                 !isVisible_Widget(findWidget_App("sidebar"))) {
                 postCommand_App("sidebar.toggle");
-                showToolbars_Root(get_Root(), iTrue);
+                showToolbar_Root(get_Root(), iTrue);
+#if defined (iPlatformAppleMobile)
+                /* TODO: Add a softer tap? */
+//                playHapticEffect_iOS(tap_HapticEffect);
+#endif
                 return iTrue;
             }
             d->flags &= ~openedFromSidebar_DocumentWidgetFlag;
diff --git a/src/ui/root.c b/src/ui/root.c
index 0a5eb96e..6c00db0f 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -514,6 +514,24 @@ void updatePadding_Root(iRoot *d) {
 #endif
 }
 
+void updateToolbarColors_Root(iRoot *d) {
+#if defined (iPlatformMobile)
+    iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
+    if (toolBar) {
+        const iBool isSidebarVisible = isVisible_Widget(findChild_Widget(d->widget, "sidebar"));
+        setBackgroundColor_Widget(toolBar, isSidebarVisible ? uiBackgroundSidebar_ColorId :
+                                  tmBannerBackground_ColorId);
+        iForEach(ObjectList, i, children_Widget(toolBar)) {
+            iLabelWidget *btn = i.object;
+            setTextColor_LabelWidget(i.object, isSidebarVisible ? uiTextDim_ColorId :
+                                     tmBannerIcon_ColorId);
+        }
+    }
+#else
+    iUnused(d);
+#endif
+}
+
 void dismissPortraitPhoneSidebars_Root(iRoot *d) {
     if (deviceType_App() == phone_AppDeviceType && isPortrait_App()) {
         iWidget *sidebar = findChild_Widget(d->widget, "sidebar");
@@ -1247,7 +1265,6 @@ void createUserInterface_Root(iRoot *d) {
                                      arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag |
                                      commandOnClick_WidgetFlag |
                                      drawBackgroundToBottom_WidgetFlag, iTrue);
-        setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId);
         setId_Widget(addChildFlags_Widget(toolBar,
                                           iClob(newLargeIcon_LabelWidget("\U0001f870", "navigate.back")),
                                           frameless_WidgetFlag),
@@ -1269,12 +1286,13 @@ void createUserInterface_Root(iRoot *d) {
         setFont_LabelWidget(menuButton, uiLabelLarge_FontId);
         setId_Widget(as_Widget(menuButton), "toolbar.navmenu");
         addChildFlags_Widget(toolBar, iClob(menuButton), frameless_WidgetFlag);
+//        setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId);
         iForEach(ObjectList, i, children_Widget(toolBar)) {
             iLabelWidget *btn = i.object;
             setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue);
-            setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId);
-            //            setBackgroundColor_Widget(i.object, tmBannerSideTitle_ColorId);
+//            setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId);
         }
+        updateToolbarColors_Root(d);
         const iMenuItem items[] = {
             { book_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" },
             { star_Icon " ${sidebar.feeds}", 0, 0, "toolbar.showview arg:1" },
@@ -1356,7 +1374,7 @@ void createUserInterface_Root(iRoot *d) {
     }
 }
 
-void showToolbars_Root(iRoot *d, iBool show) {
+void showToolbar_Root(iRoot *d, iBool show) {
     /* The toolbar is only used on phone portrait layout. */
     if (isLandscape_App()) return;
     iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
diff --git a/src/ui/root.h b/src/ui/root.h
index 96864a15..740e97c9 100644
--- a/src/ui/root.h
+++ b/src/ui/root.h
@@ -34,7 +34,8 @@ void        postArrange_Root                    (iRoot *);
 void        updateMetrics_Root                  (iRoot *);
 void        updatePadding_Root                  (iRoot *); /* TODO: is part of metrics? */
 void        dismissPortraitPhoneSidebars_Root   (iRoot *);
-void        showToolbars_Root                   (iRoot *, iBool show);
+void        showToolbar_Root                    (iRoot *, iBool show);
+void        updateToolbarColors_Root            (iRoot *);
 
 iInt2       size_Root                           (const iRoot *);
 iRect       rect_Root                           (const iRoot *);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index f7181037..5b836670 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -971,6 +971,7 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                     w, -w->rect.size.x - safePad, 300, easeOut_AnimFlag | softer_AnimFlag);
             }
         }
+        updateToolbarColors_Root(w->root);
         arrange_Widget(w->parent);
         /* BUG: Rearranging because the arrange above didn't fully resolve the height. */
         arrange_Widget(w);