Added feeds update progress indicator

Show some status info about the progress of feed refresh. The search query and feeds indicators now use the small UI font size.

3 files changed, 33 insertions, 16 deletions

diff --git a/src/app.c b/src/app.c
index df4a8b0d..012eb697 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2827,19 +2827,28 @@ iBool handleCommand_App(const char *cmd) {
         refresh_Feeds();
         return iTrue;
     }
-    else if (equal_Command(cmd, "feeds.update.started")) {
-        iAnyObject *prog = findWidget_Root("feeds.progress");
-        const iWidget *navBar = findWidget_Root("navbar");
-        updateTextAndResizeWidthCStr_LabelWidget(
-            prog, flags_Widget(navBar) & tight_WidgetFlag || deviceType_App() == phone_AppDeviceType ?
-                                                 "\u2605" : "\u2605 ${status.feeds}");
-        showCollapsed_Widget(prog, iTrue);
-        return iFalse;
-    }
-    else if (equal_Command(cmd, "feeds.update.finished")) {
-        showCollapsed_Widget(findWidget_Root("feeds.progress"), iFalse);
-        refreshFinished_Feeds();
-        refresh_Widget(findWidget_App("url"));
+    else if (startsWith_CStr(cmd, "feeds.update.")) {
+        const iWidget *navBar = findChild_Widget(get_Window()->roots[0]->widget, "navbar");
+        iAnyObject *prog = findChild_Widget(navBar, "feeds.progress");
+        if (equal_Command(cmd, "feeds.update.started") ||
+            equal_Command(cmd, "feeds.update.progress")) {
+            const int num   = arg_Command(cmd);
+            const int total = argLabel_Command(cmd, "total");
+            updateTextAndResizeWidthCStr_LabelWidget(prog,
+                                                     flags_Widget(navBar) & tight_WidgetFlag ||
+                                                             deviceType_App() == phone_AppDeviceType
+                                                         ? star_Icon
+                                                         : star_Icon " ${status.feeds}");
+            showCollapsed_Widget(prog, iTrue);
+            setFixedSize_Widget(findChild_Widget(prog, "feeds.progressbar"),
+                                init_I2(width_Widget(prog) * num / total, -1));
+        }
+        else if (equal_Command(cmd, "feeds.update.finished")) {
+            showCollapsed_Widget(prog, iFalse);
+            refreshFinished_Feeds();
+            refresh_Widget(findWidget_App("url"));
+            return iFalse;
+        }
         return iFalse;
     }
     else if (equal_Command(cmd, "visited.changed")) {
diff --git a/src/ui/root.c b/src/ui/root.c
index adc18870..253d0cfb 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1149,9 +1149,10 @@ void createUserInterface_Root(iRoot *d) {
                 iLabelWidget *queryInd = new_LabelWidget("${status.query} " return_Icon, NULL);
                 setId_Widget(as_Widget(queryInd), "input.indicator.search");
                 setTextColor_LabelWidget(queryInd, uiTextAction_ColorId);
+                setFont_LabelWidget(queryInd, defaultSmall_FontId);
                 setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId);
                 setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId);
-                setAlignVisually_LabelWidget(queryInd, iTrue);
+//                setAlignVisually_LabelWidget(queryInd, iTrue);
                 setNoAutoMinHeight_LabelWidget(queryInd, iTrue);
                 addChildFlags_Widget(rightEmbed,
                                      iClob(queryInd),
@@ -1161,9 +1162,16 @@ void createUserInterface_Root(iRoot *d) {
                 iLabelWidget *fprog = new_LabelWidget("", NULL);
                 setId_Widget(as_Widget(fprog), "feeds.progress");
                 setTextColor_LabelWidget(fprog, uiTextCaution_ColorId);
+                setFont_LabelWidget(fprog, defaultSmall_FontId);
                 setBackgroundColor_Widget(as_Widget(fprog), uiBackground_ColorId);
-                setAlignVisually_LabelWidget(fprog, iTrue);
+//                setAlignVisually_LabelWidget(fprog, iTrue);
                 setNoAutoMinHeight_LabelWidget(fprog, iTrue);
+                iWidget *progBar = new_Widget();
+                setBackgroundColor_Widget(progBar, uiTextCaution_ColorId);
+                setFixedSize_Widget(progBar, init_I2(0, gap_UI / 4));
+                setId_Widget(addChildFlags_Widget(as_Widget(fprog), iClob(progBar),
+                                                  moveToParentBottomEdge_WidgetFlag),
+                             "feeds.progressbar");
                 addChildFlags_Widget(rightEmbed,
                                      iClob(fprog),
                                      collapse_WidgetFlag | hidden_WidgetFlag | frameless_WidgetFlag);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index bdc5f090..ec92ac5a 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -289,7 +289,7 @@ void showCollapsed_Widget(iWidget *d, iBool show) {
         setFlags_Widget(d, hidden_WidgetFlag, !show);
         /* The entire UI may be affected, if parents are resized due to the (un)collapsing. */
         arrange_Widget(root_Widget(d));
-        postRefresh_App();
+        refresh_Widget(d);
     }
 }