Refactor dialog modality handling to MessageDialog

Moved modality state and related methods from the Dialog base class to MessageDialog. Dialog now requires derived classes to implement GetModality and SetModality as pure virtual methods. Platform-specific MessageDialog implementations now manage their own modality state.

Author: lijy91

src/dialog.cpp

@@ -4,14 +4,6 @@ namespace nativeapi {
 
 Dialog::~Dialog() = default;
 
-DialogModality Dialog::GetModality() const {
-  return modality_;
-}
-
-void Dialog::SetModality(DialogModality modality) {
-  modality_ = modality;
-}
-
 bool Dialog::Open() {
   return false;  // Base class implementation - should be overridden
 }

src/dialog.h

@@ -76,7 +76,7 @@ class Dialog {
    *
    * @return The current DialogModality setting
    */
-  virtual DialogModality GetModality() const;
+  virtual DialogModality GetModality() const = 0;
 
   /**
    * @brief Set the modality of the dialog.
@@ -97,7 +97,7 @@ class Dialog {
    * dialog->Open();                                    // Open as modal dialog
    * ```
    */
-  virtual void SetModality(DialogModality modality);
+  virtual void SetModality(DialogModality modality) = 0;
 
   /**
    * @brief Open the dialog according to its modality setting.
@@ -131,12 +131,6 @@ class Dialog {
    * @return true if the dialog was successfully closed, false otherwise
    */
   virtual bool Close();
-
- protected:
-  /**
-   * @brief Current modality setting.
-   */
-  DialogModality modality_ = DialogModality::None;
 };
 
 }  // namespace nativeapi

src/message_dialog.h

@@ -81,6 +81,20 @@ class MessageDialog : public Dialog {
    */
   std::string GetMessage() const;
 
+  /**
+   * @brief Get the current modality setting of the dialog.
+   *
+   * @return The current DialogModality setting
+   */
+  DialogModality GetModality() const override;
+
+  /**
+   * @brief Set the modality of the dialog.
+   *
+   * @param modality The modality type to set
+   */
+  void SetModality(DialogModality modality) override;
+
   /**
    * @brief Open the dialog.
    *
@@ -112,6 +126,11 @@ class MessageDialog : public Dialog {
    * message-dialog-specific implementation details.
    */
   std::unique_ptr<Impl> pimpl_;
+
+  /**
+   * @brief Current modality setting.
+   */
+  DialogModality modality_ = DialogModality::None;
 };
 
 }  // namespace nativeapi

src/platform/android/message_dialog_android.cpp

@@ -66,6 +66,14 @@ std::string MessageDialog::GetMessage() const {
   return pimpl_->GetMessage();
 }
 
+DialogModality MessageDialog::GetModality() const {
+  return modality_;
+}
+
+void MessageDialog::SetModality(DialogModality modality) {
+  modality_ = modality;
+}
+
 bool MessageDialog::Open() {
   DialogModality modality = GetModality();
   return pimpl_->Open(modality);

src/platform/ios/message_dialog_ios.mm

@@ -74,6 +74,14 @@ bool Close() {
   return pimpl_->GetMessage();
 }
 
+DialogModality MessageDialog::GetModality() const {
+  return modality_;
+}
+
+void MessageDialog::SetModality(DialogModality modality) {
+  modality_ = modality;
+}
+
 bool MessageDialog::Open() {
   DialogModality modality = GetModality();
   return pimpl_->Open(modality);

src/platform/linux/message_dialog_linux.cpp

@@ -177,6 +177,14 @@ std::string MessageDialog::GetMessage() const {
   return pimpl_->GetMessage();
 }
 
+DialogModality MessageDialog::GetModality() const {
+  return modality_;
+}
+
+void MessageDialog::SetModality(DialogModality modality) {
+  modality_ = modality;
+}
+
 bool MessageDialog::Open() {
   DialogModality modality = GetModality();
   return pimpl_->Open(modality);

src/platform/macos/message_dialog_macos.mm

@@ -151,6 +151,14 @@ bool Close() {
   return pimpl_->GetMessage();
 }
 
+DialogModality MessageDialog::GetModality() const {
+  return modality_;
+}
+
+void MessageDialog::SetModality(DialogModality modality) {
+  modality_ = modality;
+}
+
 bool MessageDialog::Open() {
   DialogModality modality = GetModality();
   return pimpl_->Open(modality);

src/platform/ohos/message_dialog_ohos.cpp

@@ -65,6 +65,14 @@ std::string MessageDialog::GetMessage() const {
   return pimpl_->GetMessage();
 }
 
+DialogModality MessageDialog::GetModality() const {
+  return modality_;
+}
+
+void MessageDialog::SetModality(DialogModality modality) {
+  modality_ = modality;
+}
+
 bool MessageDialog::Open() {
   DialogModality modality = GetModality();
   return pimpl_->Open(modality);

src/platform/windows/message_dialog_windows.cpp

@@ -84,6 +84,14 @@ std::string MessageDialog::GetMessage() const {
   return pimpl_->GetMessage();
 }
 
+DialogModality MessageDialog::GetModality() const {
+  return modality_;
+}
+
+void MessageDialog::SetModality(DialogModality modality) {
+  modality_ = modality;
+}
+
 bool MessageDialog::Open() {
   DialogModality modality = GetModality();
   return pimpl_->Open(modality);