From a0d096f77f933e7a9c921ab69d47a973ff2786b6 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 2 May 2026 14:17:12 +0800
Subject: [PATCH] Add scroll gap for danmaku setting

---
 .../res/layout/view_danmaku_density.xml       | 36 +++++++++++++++++++
 .../android/tv/setting/DanmakuSetting.java    | 16 +++++++--
 .../tv/ui/dialog/DanmakuSettingPanel.java     |  1 +
 app/src/main/res/values-zh-rCN/strings.xml    |  5 +--
 app/src/main/res/values-zh-rTW/strings.xml    |  5 +--
 app/src/main/res/values/strings.xml           |  3 +-
 .../res/layout/view_danmaku_density.xml       | 34 ++++++++++++++++++
 7 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/app/src/leanback/res/layout/view_danmaku_density.xml b/app/src/leanback/res/layout/view_danmaku_density.xml
index a8c9fd756..1ef4eafd1 100644
--- a/app/src/leanback/res/layout/view_danmaku_density.xml
+++ b/app/src/leanback/res/layout/view_danmaku_density.xml
@@ -78,6 +78,42 @@
         android:valueTo="1.0"
         app:tickVisible="false" />
 
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="24dp"
+        android:paddingTop="4dp">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/danmaku_scroll_gap_ratio"
+            android:textAppearance="?attr/textAppearanceBodyLarge" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/scrollGapValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceBodyMedium"
+            android:textColor="?attr/colorPrimary" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+    <com.google.android.material.slider.Slider
+        android:id="@+id/scrollGapSlider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="12dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:stepSize="0.1"
+        android:valueFrom="0"
+        android:valueTo="5.0"
+        app:tickVisible="false" />
+
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/java/com/fongmi/android/tv/setting/DanmakuSetting.java b/app/src/main/java/com/fongmi/android/tv/setting/DanmakuSetting.java
index 5903a0feb..1eb0bfe2c 100644
--- a/app/src/main/java/com/fongmi/android/tv/setting/DanmakuSetting.java
+++ b/app/src/main/java/com/fongmi/android/tv/setting/DanmakuSetting.java
@@ -154,7 +154,7 @@ public class DanmakuSetting {
     }
 
     public static float getScrollAreaRatio() {
-        return Prefers.getFloat("danmaku_scroll_area_ratio", 0.75f);
+        return Prefers.getFloat("danmaku_scroll_area_ratio", 0.5f);
     }
 
     public static void putScrollAreaRatio(float value) {
@@ -193,6 +193,14 @@ public class DanmakuSetting {
         Prefers.put("danmaku_line_spacing", value);
     }
 
+    public static float getScrollGapRatio() {
+        return Prefers.getFloat("danmaku_scroll_gap_ratio", 0f);
+    }
+
+    public static void putScrollGapRatio(float value) {
+        Prefers.put("danmaku_scroll_gap_ratio", value);
+    }
+
     public static boolean isShowScroll() {
         return Prefers.getBoolean("danmaku_show_scroll", true);
     }
@@ -280,10 +288,11 @@ public class DanmakuSetting {
         DanmakuConfig config = DanmakuConfig.DEFAULT;
         putMaxOnScreen(config.maxOnScreen);
         putScrollAreaRatio(config.scrollAreaRatio);
+        putScrollGapRatio(config.scrollGapRatio);
+        putLineSpacing(config.lineSpacing);
         putMaxScrollLines(config.maxScrollLines);
         putMaxTopLines(config.maxTopLines);
         putMaxBottomLines(config.maxBottomLines);
-        putLineSpacing(config.lineSpacing);
     }
 
     public static void resetDisplay() {
@@ -314,10 +323,11 @@ public class DanmakuSetting {
                 .setTimeOffsetMs(getTimeOffsetMs())
                 .setMaxOnScreen(getMaxOnScreen())
                 .setScrollAreaRatio(getScrollAreaRatio())
+                .setScrollGapRatio(getScrollGapRatio())
+                .setLineSpacing(getLineSpacing())
                 .setMaxScrollLines(getMaxScrollLines())
                 .setMaxTopLines(getMaxTopLines())
                 .setMaxBottomLines(getMaxBottomLines())
-                .setLineSpacing(getLineSpacing())
                 .setShowScroll(isShowScroll())
                 .setShowTop(isShowTop())
                 .setShowBottom(isShowBottom())
diff --git a/app/src/main/java/com/fongmi/android/tv/ui/dialog/DanmakuSettingPanel.java b/app/src/main/java/com/fongmi/android/tv/ui/dialog/DanmakuSettingPanel.java
index e4361cdcb..400b34b02 100644
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/DanmakuSettingPanel.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/DanmakuSettingPanel.java
@@ -72,6 +72,7 @@ final class DanmakuSettingPanel {
         var density = binding.density;
         setupInt(density.maxOnScreenSlider, density.maxOnScreenValue, DanmakuSetting.getMaxOnScreen(), String::valueOf, DanmakuSetting::putMaxOnScreen);
         setupFloat(density.scrollAreaSlider, density.scrollAreaValue, DanmakuSetting.getScrollAreaRatio(), "%.2f", DanmakuSetting::putScrollAreaRatio);
+        setupFloat(density.scrollGapSlider, density.scrollGapValue, DanmakuSetting.getScrollGapRatio(), "%.1f", DanmakuSetting::putScrollGapRatio);
         setupFloat(density.lineSpacingSlider, density.lineSpacingValue, DanmakuSetting.getLineSpacing(), "%.1f", DanmakuSetting::putLineSpacing);
         setupInt(density.maxScrollLinesSlider, density.maxScrollLinesValue, DanmakuSetting.getMaxScrollLines(), this::linesText, DanmakuSetting::putMaxScrollLines);
         setupInt(density.maxTopLinesSlider, density.maxTopLinesValue, DanmakuSetting.getMaxTopLines(), this::linesText, DanmakuSetting::putMaxTopLines);
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9d9e15c1a..af3ee58ea 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -84,11 +84,12 @@
     <string name="danmaku_fixed_duration">固定显示时间</string>
     <string name="danmaku_time_offset">时间偏移</string>
     <string name="danmaku_max_on_screen">最多同时显示</string>
-    <string name="danmaku_scroll_area_ratio">滚动区域比例</string>
+    <string name="danmaku_scroll_area_ratio">滚动区域</string>
     <string name="danmaku_max_scroll_lines">最大滚动行数</string>
     <string name="danmaku_max_top_lines">最大顶部行数</string>
     <string name="danmaku_max_bottom_lines">最大底部行数</string>
-    <string name="danmaku_line_spacing">行距倍率</string>
+    <string name="danmaku_line_spacing">垂直间距</string>
+    <string name="danmaku_scroll_gap_ratio">水平间距</string>
     <string name="danmaku_show_scroll">滚动弹幕</string>
     <string name="danmaku_show_top">顶部固定</string>
     <string name="danmaku_show_bottom">底部固定</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 203cacf39..714e8699a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -84,11 +84,12 @@
     <string name="danmaku_fixed_duration">固定顯示時間</string>
     <string name="danmaku_time_offset">時間偏移</string>
     <string name="danmaku_max_on_screen">最多同時顯示</string>
-    <string name="danmaku_scroll_area_ratio">滾動區域比例</string>
+    <string name="danmaku_scroll_area_ratio">滾動區域</string>
     <string name="danmaku_max_scroll_lines">最大滾動行數</string>
     <string name="danmaku_max_top_lines">最大頂部行數</string>
     <string name="danmaku_max_bottom_lines">最大底部行數</string>
-    <string name="danmaku_line_spacing">行距倍率</string>
+    <string name="danmaku_line_spacing">垂直間距</string>
+    <string name="danmaku_scroll_gap_ratio">水平間距</string>
     <string name="danmaku_show_scroll">滾動彈幕</string>
     <string name="danmaku_show_top">頂部固定</string>
     <string name="danmaku_show_bottom">底部固定</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d89fe4406..51e5d4afe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,7 +88,8 @@
     <string name="danmaku_max_scroll_lines">Max scroll rows</string>
     <string name="danmaku_max_top_lines">Max top rows</string>
     <string name="danmaku_max_bottom_lines">Max bottom rows</string>
-    <string name="danmaku_line_spacing">Line spacing</string>
+    <string name="danmaku_line_spacing">Line gap</string>
+    <string name="danmaku_scroll_gap_ratio">Row gap</string>
     <string name="danmaku_show_scroll">Scrolling</string>
     <string name="danmaku_show_top">Top pinned</string>
     <string name="danmaku_show_bottom">Bottom pinned</string>
diff --git a/app/src/mobile/res/layout/view_danmaku_density.xml b/app/src/mobile/res/layout/view_danmaku_density.xml
index a536be561..675d632f5 100644
--- a/app/src/mobile/res/layout/view_danmaku_density.xml
+++ b/app/src/mobile/res/layout/view_danmaku_density.xml
@@ -73,6 +73,40 @@
         android:valueTo="1.0"
         app:tickVisible="false" />
 
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingHorizontal="24dp"
+        android:paddingTop="4dp">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/danmaku_scroll_gap_ratio"
+            android:textAppearance="?attr/textAppearanceBodyLarge" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/scrollGapValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?attr/textAppearanceBodyMedium"
+            android:textColor="?attr/colorPrimary" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+    <com.google.android.material.slider.Slider
+        android:id="@+id/scrollGapSlider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="12dp"
+        android:stepSize="0.1"
+        android:valueFrom="0"
+        android:valueTo="5.0"
+        app:tickVisible="false" />
+
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"