Export widget modules in iced_pure

... and fix collisions with the new `helpers`

pure/src/helpers.rs

@@ -0,0 +1,153 @@
+use crate::widget;
+use crate::Element;
+
+use iced_native::Length;
+use std::borrow::Cow;
+use std::ops::RangeInclusive;
+
+pub fn container<'a, Message, Renderer>(
+    content: impl Into<Element<'a, Message, Renderer>>,
+) -> widget::Container<'a, Message, Renderer>
+where
+    Renderer: iced_native::Renderer,
+{
+    widget::Container::new(content)
+}
+
+pub fn column<'a, Message, Renderer>() -> widget::Column<'a, Message, Renderer>
+{
+    widget::Column::new()
+}
+
+pub fn row<'a, Message, Renderer>() -> widget::Row<'a, Message, Renderer> {
+    widget::Row::new()
+}
+
+pub fn scrollable<'a, Message, Renderer>(
+    content: impl Into<Element<'a, Message, Renderer>>,
+) -> widget::Scrollable<'a, Message, Renderer>
+where
+    Renderer: iced_native::Renderer,
+{
+    widget::Scrollable::new(content)
+}
+
+pub fn button<'a, Message, Renderer>(
+    content: impl Into<Element<'a, Message, Renderer>>,
+) -> widget::Button<'a, Message, Renderer> {
+    widget::Button::new(content)
+}
+
+pub fn text<Renderer>(text: impl Into<String>) -> widget::Text<Renderer>
+where
+    Renderer: iced_native::text::Renderer,
+{
+    widget::Text::new(text)
+}
+
+pub fn checkbox<'a, Message, Renderer>(
+    label: impl Into<String>,
+    is_checked: bool,
+    f: impl Fn(bool) -> Message + 'a,
+) -> widget::Checkbox<'a, Message, Renderer>
+where
+    Renderer: iced_native::text::Renderer,
+{
+    widget::Checkbox::new(is_checked, label, f)
+}
+
+pub fn radio<'a, Message, Renderer, V>(
+    label: impl Into<String>,
+    value: V,
+    selected: Option<V>,
+    on_click: impl FnOnce(V) -> Message,
+) -> widget::Radio<'a, Message, Renderer>
+where
+    Message: Clone,
+    Renderer: iced_native::text::Renderer,
+    V: Copy + Eq,
+{
+    widget::Radio::new(value, label, selected, on_click)
+}
+
+pub fn toggler<'a, Message, Renderer>(
+    label: impl Into<Option<String>>,
+    is_checked: bool,
+    f: impl Fn(bool) -> Message + 'a,
+) -> widget::Toggler<'a, Message, Renderer>
+where
+    Renderer: iced_native::text::Renderer,
+{
+    widget::Toggler::new(is_checked, label, f)
+}
+
+pub fn text_input<'a, Message, Renderer>(
+    placeholder: &str,
+    value: &str,
+    on_change: impl Fn(String) -> Message + 'a,
+) -> widget::TextInput<'a, Message, Renderer>
+where
+    Message: Clone,
+    Renderer: iced_native::text::Renderer,
+{
+    widget::TextInput::new(placeholder, value, on_change)
+}
+
+pub fn slider<'a, Message, T>(
+    range: std::ops::RangeInclusive<T>,
+    value: T,
+    on_change: impl Fn(T) -> Message + 'a,
+) -> widget::Slider<'a, T, Message>
+where
+    Message: Clone,
+    T: Copy + From<u8> + std::cmp::PartialOrd,
+{
+    widget::Slider::new(range, value, on_change)
+}
+
+pub fn pick_list<'a, Message, Renderer, T>(
+    options: impl Into<Cow<'a, [T]>>,
+    selected: Option<T>,
+    on_selected: impl Fn(T) -> Message + 'a,
+) -> widget::PickList<'a, T, Message, Renderer>
+where
+    T: ToString + Eq + 'static,
+    [T]: ToOwned<Owned = Vec<T>>,
+    Renderer: iced_native::text::Renderer,
+{
+    widget::PickList::new(options, selected, on_selected)
+}
+
+pub fn image<Handle>(handle: impl Into<Handle>) -> widget::Image<Handle> {
+    widget::Image::new(handle.into())
+}
+
+pub fn horizontal_space(width: Length) -> widget::Space {
+    widget::Space::with_width(width)
+}
+
+pub fn vertical_space(height: Length) -> widget::Space {
+    widget::Space::with_height(height)
+}
+
+/// Creates a horizontal [`Rule`] with the given height.
+pub fn horizontal_rule<'a>(height: u16) -> widget::Rule<'a> {
+    widget::Rule::horizontal(height)
+}
+
+/// Creates a vertical [`Rule`] with the given width.
+pub fn vertical_rule<'a>(width: u16) -> widget::Rule<'a> {
+    widget::Rule::horizontal(width)
+}
+
+/// Creates a new [`ProgressBar`].
+///
+/// It expects:
+///   * an inclusive range of possible values
+///   * the current value of the [`ProgressBar`]
+pub fn progress_bar<'a>(
+    range: RangeInclusive<f32>,
+    value: f32,
+) -> widget::ProgressBar<'a> {
+    widget::ProgressBar::new(range, value)
+}