Add "Hide password" button.

+ Add an "Hide password" button.
+ Upgrade FTXUI version to include:
  ArthurSonzogni/FTXUI@b95a7a4
+ And various minor improvements.

Author: ArthurSonzogni

CMakeLists.txt

@@ -9,7 +9,7 @@ set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE)
 
 FetchContent_Declare(ftxui
   GIT_REPOSITORY https://github.com/ArthurSonzogni/FTXUI
-  GIT_TAG 69b0c9e53e523ac43a303964fc9c5bc0da7d5d61
+  GIT_TAG b95a7a4c6b8e89f5288a96d8b2c0461ad4a69f77
 )
 
 FetchContent_GetProperties(ftxui)
@@ -112,4 +112,4 @@ if(ARMHF_DEB)
 
   include(CPack)
 
-endif(ARMHF_DEB)
+endif(ARMHF_DEB)

src/ui/panel/passwd/passwd.cpp

@@ -12,58 +12,55 @@ namespace {
 
 class passwdImpl : public PanelBase {
  public:
-  passwdImpl() : user(getlogin()), view(false) {
-    InputOption inp_opt;
-    inp_opt.password = true;
-    inp_opt.cursor_position = 0;
-    inp_opt.on_enter = [&] { view = !view; };
-    input_p = Input(&pass, "Current Password", inp_opt);
-    input_np = Input(&new_pass, "New Password", inp_opt);
-    change_ = Button("Change", [&] {
-      auto cmd = "passwd " + user;
+  passwdImpl() : user_(getlogin()) {
+    input_options_.password = &hide_password_;
+    input_password_old_ =
+        Input(&password_old_, "Current Password", &input_options_);
+    input_password_new_ =
+        Input(&password_new_, "New Password", &input_options_);
+    hide_password_checkbox_ = Checkbox("Hide password", &hide_password_);
+    apply_button_ = Button("Apply", [&] {
+      auto cmd = "passwd " + user_;
       FILE* fp = popen(cmd.c_str(), "w");
-      fprintf(fp, "%s\n", pass.data());
-      fprintf(fp, "%s\n", new_pass.data());
-      fprintf(fp, "%s\n", new_pass.data());
+      fprintf(fp, "%s\n", password_old_.data());
+      fprintf(fp, "%s\n", password_new_.data());
+      fprintf(fp, "%s\n", password_new_.data());
       pclose(fp);
     });
-    page = Renderer(Container::Vertical({
-                        input_p,
-                        input_np,
-                        change_,
-                    }),
-                    [&] {
-                      if (view) {
-                        return vbox({
-                            text("User: " + user),
-                            text("Pass: " + pass),
-                            text("New : " + new_pass),
-                            input_p->Render(),
-                            input_np->Render(),
-                            change_->Render(),
-                        });
-                      }
-                      return vbox({
-                          text("User: " + user),
-                          input_p->Render(),
-                          input_np->Render(),
-                          change_->Render(),
-                      });
-                    });
-    Add(page);
-  };
+
+    auto layout = Container::Vertical({
+        input_password_old_,
+        input_password_new_,
+        hide_password_checkbox_,
+        apply_button_,
+    });
+
+    layout = Renderer(layout, [&] {
+      return vbox({
+          hbox(text("User:"), text(user_)),
+          hbox(text("Old password:"), input_password_old_->Render()),
+          hbox(text("New password:"), input_password_new_->Render()),
+          hide_password_checkbox_->Render(),
+          apply_button_->Render(),
+      });
+    });
+
+    Add(layout);
+  }
   ~passwdImpl() = default;
   std::string Title() override { return "Password"; }
 
  private:
-  Component input_p;
-  Component input_np;
-  Component change_;
-  Component page;
-  std::string pass;
-  std::string new_pass;
-  std::string user;
-  bool view;
+  std::string password_old_;
+  std::string password_new_;
+  std::string user_;
+
+  Component input_password_old_;
+  Component input_password_new_;
+  Component hide_password_checkbox_;
+  Component apply_button_;
+  InputOption input_options_;
+  bool hide_password_ = false;
 };
 
 }  // namespace
@@ -75,4 +72,4 @@ Panel passwd() {
 
 }  // namespace panel
 
-}  // namespace ui
+}  // namespace ui