diff --git a/main.go b/main.go index 4f585b9..723fb74 100644 --- a/main.go +++ b/main.go @@ -5286,17 +5286,6 @@ func (u *ui) groupBar(gtx layout.Context) layout.Dimensions { lbl.Color = mutedColor return lbl.Layout(gtx) }), - layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout), - layout.Rigid(detailLine(u.theme, "Current Group", u.currentGroupDisplayName())), - layout.Rigid(func(gtx layout.Context) layout.Dimensions { - if atRoot { - return layout.Dimensions{} - } - return layout.Flex{Axis: layout.Vertical}.Layout(gtx, - layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout), - layout.Rigid(detailLine(u.theme, "Parent Group", u.parentGroupDisplayName())), - ) - }), layout.Rigid(func(gtx layout.Context) layout.Dimensions { if atRoot { return layout.Dimensions{} @@ -5330,19 +5319,9 @@ func (u *ui) groupBar(gtx layout.Context) layout.Dimensions { ) }), layout.Rigid(layout.Spacer{Height: unit.Dp(10)}.Layout), - layout.Rigid(func(gtx layout.Context) layout.Dimensions { - label := "CHILD GROUPS" - if atRoot { - label = "TOP-LEVEL GROUPS" - } - lbl := material.Label(u.theme, unit.Sp(12), label) - lbl.Color = mutedColor - return lbl.Layout(gtx) - }), - layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout), layout.Rigid(func(gtx layout.Context) layout.Dimensions { if len(groups) == 0 { - lbl := material.Label(u.theme, unit.Sp(12), "No child groups here yet.") + lbl := material.Label(u.theme, unit.Sp(12), "No groups here.") lbl.Color = mutedColor return lbl.Layout(gtx) } diff --git a/ui_forms.go b/ui_forms.go index 6b702e7..dc6e81f 100644 --- a/ui_forms.go +++ b/ui_forms.go @@ -789,12 +789,6 @@ func (u *ui) groupControls(gtx layout.Context) layout.Dimensions { lbl.Color = mutedColor return lbl.Layout(gtx) }), - layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout), - layout.Rigid(func(gtx layout.Context) layout.Dimensions { - lbl := material.Label(u.theme, unit.Sp(12), "Create, rename, move, and delete groups without interrupting the browsing path above.") - lbl.Color = mutedColor - return lbl.Layout(gtx) - }), layout.Rigid(layout.Spacer{Height: unit.Dp(10)}.Layout), layout.Rigid(func(gtx layout.Context) layout.Dimensions { lbl := material.Label(u.theme, unit.Sp(12), "CREATE") @@ -802,16 +796,6 @@ func (u *ui) groupControls(gtx layout.Context) layout.Dimensions { return lbl.Layout(gtx) }), layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout), - layout.Rigid(func(gtx layout.Context) layout.Dimensions { - help := "Add a new top-level group." - if len(u.displayPath()) > 0 { - help = "Add a subgroup inside " + u.currentGroupDisplayName() + "." - } - lbl := material.Label(u.theme, unit.Sp(12), help) - lbl.Color = mutedColor - return lbl.Layout(gtx) - }), - layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout), layout.Rigid(labeledEditor(u.theme, "Create Group / Subgroup", &u.groupName, false)), layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout), layout.Rigid(func(gtx layout.Context) layout.Dimensions { @@ -834,12 +818,6 @@ func (u *ui) groupControls(gtx layout.Context) layout.Dimensions { lbl.Color = accentColor return lbl.Layout(gtx) }), - layout.Rigid(layout.Spacer{Height: unit.Dp(4)}.Layout), - layout.Rigid(func(gtx layout.Context) layout.Dimensions { - lbl := material.Label(u.theme, unit.Sp(12), "Rename or relocate only the selected group. Browsing stays in the separate group navigator.") - lbl.Color = mutedColor - return lbl.Layout(gtx) - }), layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout), layout.Rigid(func(gtx layout.Context) layout.Dimensions { return tonedButton(gtx, u.theme, &u.renameGroup, "Rename Current Group")