all: Improve footer
Implements new footer block widget and changes progress rendering.
9 files changed
+293
-98
70208c35
→
b6ff4ddc
modified bin/commands/inbox/flux/select.rs
@@ -38,11 +38,23 @@ pub struct App {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -136,6 +148,7 @@ impl TryFrom<&Context> for InboxState {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -143,6 +156,7 @@ impl TryFrom<&Context> for InboxState {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -150,11 +164,15 @@ impl State<Action, Selection> for InboxState {
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified bin/commands/inbox/flux/select/ui.rs
@@ -1,12 +1,11 @@
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -16,7 +15,6 @@ use radicle_tui as tui;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -153,6 +151,7 @@ struct NotificationsProps {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -177,6 +176,7 @@ impl From<&InboxState> for NotificationsProps {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -337,42 +337,52 @@ impl Notifications {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -396,5 +406,12 @@ impl Render<()> for Notifications {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
modified bin/commands/issue/flux/select.rs
@@ -34,11 +34,23 @@ pub struct App {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -68,6 +80,7 @@ impl TryFrom<&Context> for IssuesState {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -75,6 +88,7 @@ impl TryFrom<&Context> for IssuesState {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -86,6 +100,10 @@ impl State<Action, Selection> for IssuesState {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified bin/commands/issue/flux/select/ui.rs
@@ -9,14 +9,13 @@ use tokio::sync::mpsc::UnboundedSender;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -178,6 +177,7 @@ struct IssuesProps {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -210,6 +210,7 @@ impl From<&IssuesState> for IssuesProps {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -340,43 +341,52 @@ impl Issues {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -400,5 +410,12 @@ impl Render<()> for Issues {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
modified bin/commands/patch/flux/select.rs
@@ -34,11 +34,23 @@ pub struct App {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -68,6 +80,7 @@ impl TryFrom<&Context> for PatchesState {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -75,6 +88,7 @@ impl TryFrom<&Context> for PatchesState {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -82,11 +96,15 @@ impl State<Action, Selection> for PatchesState {
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified bin/commands/patch/flux/select/ui.rs
@@ -8,7 +8,6 @@ use tokio::sync::mpsc::UnboundedSender;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -18,7 +17,6 @@ use radicle_tui as tui;
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -196,6 +194,7 @@ struct PatchesProps {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -242,6 +241,7 @@ impl From<&PatchesState> for PatchesProps {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -298,9 +298,9 @@ impl Widget<PatchesState, Action> for Patches {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -313,9 +313,9 @@ impl Widget<PatchesState, Action> for Patches {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -373,51 +373,72 @@ impl Patches {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -441,5 +462,12 @@ impl Render<()> for Patches {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
modified src/flux/ui/ext.rs
@@ -113,6 +113,14 @@ impl Widget for HeaderBlock {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -121,6 +129,8 @@ pub struct FooterBlock {
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -128,7 +138,8 @@ pub struct FooterBlock {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -137,25 +148,35 @@ impl Default for FooterBlock {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -200,13 +221,21 @@ impl Widget for FooterBlock {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
modified src/flux/ui/widget.rs
@@ -169,6 +169,25 @@ impl<A> Table<A> {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified src/flux/ui/widget/container.rs
@@ -7,7 +7,7 @@ use termion::event::Key;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -51,20 +51,15 @@ impl<S, A> Widget<S, A> for Footer<A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -72,13 +67,49 @@ impl<'a, A, const W: usize> Render<FooterProps<'a, W>> for Footer<A> {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|