paket/src/login.rs

@@ -23,7 +23,6 @@ static KEYRING: OnceLock<oo7::Keyring> = OnceLock::new();
 pub enum LoginInput {
     LogOut,
     NeedsLogin,
-    ConsentToLogin,
     NeedsRefresh,
     ReceivedAuthCode(String),
     BreakWorld,
@@ -31,7 +30,6 @@ pub enum LoginInput {
 
 #[derive(Debug, PartialEq)]
 pub enum LoginState {
-    Beginning,
     InFlow,
     Offline,
 }
@@ -93,71 +91,15 @@ impl AsyncComponent for Login {
         #[root]
         adw::Bin {
             #[wrap(Some)]
-            set_child = &adw::ToolbarView {
-                add_top_bar = &adw::HeaderBar {},
+            #[name = "webview"]
+            set_child = &WebView::builder().web_context(&webcontext).build() {
+                #[track(model.changed(Self::state()))]
+                set_visible: model.state == LoginState::InFlow,
 
-                #[wrap(Some)]
-                set_content = &adw::ViewStack {
 
-                    #[name = "page_beginning"]
-                    add = &adw::Bin {
-                        #[wrap(Some)]
-                        set_child = &adw::StatusPage {
-                            set_title: "Welcome to Paket!",
-                            #[wrap(Some)]
-                            set_child = &adw::Clamp {
-                                set_maximum_size: 260,
-
-                                #[wrap(Some)]
-                                set_child = &gtk::Button {
-                                    add_css_class: relm4::css::SUGGESTED_ACTION,
-                                    add_css_class: relm4::css::PILL,
-
-                                    set_label: "Log In",
-
-                                    connect_clicked => LoginInput::ConsentToLogin,
-                                },
-                            },
-                        }
-                    },
-
-                    #[name = "page_webview"]
-                    add = &adw::Bin {
-                        #[wrap(Some)]
-                        set_child = &adw::Clamp {
-                            #[wrap(Some)]
-                            set_child = &adw::Bin {
-                                add_css_class: relm4::css::CARD,
-                                set_margin_all: 12,
-
-                                #[wrap(Some)]
-                                #[name = "webview"]
-                                set_child = &WebView::builder().web_context(&webcontext).build() {
-                                    set_margin_all: 12,
-                                    // TODO: make webkitview rounded
-                                    #[track(model.changed_state() && model.state == LoginState::InFlow)]
-                                    load_request?: &model.construct_request_uri(),
-                                }
-                            }
-
-                        },
-                    },
-
-                    #[name = "page_offline"]
-                    add = &adw::Bin {
-
-                    },
-
-                    #[track(model.changed_state())]
-                    set_visible_child: {
-                        match model.state {
-                            LoginState::Beginning => page_beginning.widget_ref(),
-                            LoginState::Offline => page_offline.widget_ref(),
-                            LoginState::InFlow => page_webview.widget_ref(),
-                        }
-                    }
-                },
-            },
+                #[track(model.changed_state() && model.state == LoginState::InFlow)]
+                load_request?: &model.construct_request_uri(),
+            }
         }
     }
 
@@ -316,12 +258,8 @@ impl AsyncComponent for Login {
                 self.flow_model.replace(None);
             }
             LoginInput::NeedsLogin => {
-                self.set_state(LoginState::Beginning);
-                sender.output(LoginOutput::RequiresLogin).unwrap();
-            }
-            LoginInput::ConsentToLogin => {
-                sender.output(LoginOutput::RequiresLogin).unwrap();
                 self.set_state(LoginState::InFlow);
+                sender.output(LoginOutput::RequiresLogin).unwrap();
                 self.flow_model.replace(Some(LoginFlowModel {
                     code_verifier: CodeVerfier::new(),
                     nonce: create_nonce(),

paket/src/tracking.rs

@@ -59,6 +59,7 @@ impl Component for TrackingView {
                             set_child = &gtk::Box {
                                 set_orientation: gtk::Orientation::Horizontal,
                                 set_margin_all: 2,
+                                set_halign: gtk::Align::Center,
 
                                 add_css_class: relm4::css::TOOLBAR,