fix: remove PreferenceViewBase

teletha · Dec 1, 2023 · 5fa859b · 5fa859b
1 parent 6639b05
commit 5fa859b
Show file tree

Hide file tree

Showing 7 changed files with 150 additions and 157 deletions.
diff --git a/src/main/java/viewtify/keys/KeyBindingSettingView.java b/src/main/java/viewtify/keys/KeyBindingSettingView.java
@@ -19,11 +19,11 @@
 import viewtify.ui.UITableColumn;
 import viewtify.ui.UITableView;
 import viewtify.ui.UIText;
+import viewtify.ui.View;
 import viewtify.ui.ViewDSL;
 import viewtify.ui.helper.User;
-import viewtify.ui.view.PreferenceViewBase;
 
-public class KeyBindingSettingView extends PreferenceViewBase {
+public class KeyBindingSettingView extends View {
 
     private UIText<String> filter;
 
@@ -37,7 +37,7 @@ public class KeyBindingSettingView extends PreferenceViewBase {
      * {@inheritDoc}
      */
     @Override
-    public Variable<String> category() {
+    public Variable<String> title() {
         return en("Keyborad Operation");
     }
 

diff --git a/src/main/java/viewtify/ui/View.java b/src/main/java/viewtify/ui/View.java
@@ -25,6 +25,7 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.Window;
+
 import kiss.Disposable;
 import kiss.Extensible;
 import kiss.I;
@@ -104,6 +105,24 @@ public String id() {
         return parent == null ? name() : parent.name() + IDSeparator + name();
     }
 
+    /**
+     * The title of this {@link View}.
+     * 
+     * @return
+     */
+    public Variable<String> title() {
+        return Variable.empty();
+    }
+
+    /**
+     * The icon of this {@link View}.
+     * 
+     * @return
+     */
+    public Variable<String> icon() {
+        return Variable.empty();
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/src/main/java/viewtify/ui/calendar/CalendarSettingView.java b/src/main/java/viewtify/ui/calendar/CalendarSettingView.java
@@ -23,10 +23,9 @@
 import viewtify.ui.UIComboBox;
 import viewtify.ui.View;
 import viewtify.ui.ViewDSL;
-import viewtify.ui.view.PreferenceViewBase;
 import viewtify.util.FXUtils;
 
-public class CalendarSettingView extends PreferenceViewBase {
+public class CalendarSettingView extends View {
 
     private UIComboBox<DayOfWeek> firstDoW;
 
@@ -42,7 +41,7 @@ public class CalendarSettingView extends PreferenceViewBase {
      * {@inheritDoc}
      */
     @Override
-    public Variable<String> category() {
+    public Variable<String> title() {
         return en("Calendar");
     }
 

diff --git a/src/main/java/viewtify/ui/toast/ToastSettingView.java b/src/main/java/viewtify/ui/toast/ToastSettingView.java
@@ -12,19 +12,20 @@
 import java.util.stream.IntStream;
 
 import javafx.util.Duration;
+
 import kiss.Variable;
 import viewtify.model.Preferences;
 import viewtify.style.FormStyles;
 import viewtify.ui.UIButton;
 import viewtify.ui.UICheckSwitch;
 import viewtify.ui.UIComboBox;
 import viewtify.ui.UISpinner;
+import viewtify.ui.View;
 import viewtify.ui.ViewDSL;
-import viewtify.ui.view.PreferenceViewBase;
 import viewtify.util.Corner;
 import viewtify.util.ScreenSelector;
 
-public class ToastSettingView extends PreferenceViewBase {
+public class ToastSettingView extends View {
 
     /** The desktop configuration UI. */
     private UICheckSwitch enableNotification;
@@ -54,7 +55,7 @@ public class ToastSettingView extends PreferenceViewBase {
      * {@inheritDoc}
      */
     @Override
-    public Variable<String> category() {
+    public Variable<String> title() {
         return en("Notification");
     }
 

diff --git a/src/main/java/viewtify/ui/view/AppearanceSettingView.java b/src/main/java/viewtify/ui/view/AppearanceSettingView.java
@@ -22,9 +22,10 @@
 import viewtify.style.FormStyles;
 import viewtify.ui.UIComboBox;
 import viewtify.ui.UISpinner;
+import viewtify.ui.View;
 import viewtify.ui.ViewDSL;
 
-public class AppearanceSettingView extends PreferenceViewBase {
+public class AppearanceSettingView extends View {
 
     /** The theme selector. */
     public UIComboBox<Theme> theme;
@@ -45,7 +46,7 @@ public class AppearanceSettingView extends PreferenceViewBase {
      * {@inheritDoc}
      */
     @Override
-    public Variable<String> category() {
+    public Variable<String> title() {
         return en("Appearance and Language");
     }
 

diff --git a/src/main/java/viewtify/ui/view/PreferenceViewBase.java b/src/main/java/viewtify/ui/view/PreferenceViewBase.java