Merge pull request #1081 from wangwang-code/patch-8-31-3

V3 作者资料页与工作环境卡片内容过长时自动独占一行

Author: SoxiaLiSA

app/src/main/java/ceui/lisa/activities/UserV3InfoFragment.kt

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.core.view.isVisible
+import androidx.core.view.doOnPreDraw
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -282,13 +283,80 @@ class UserV3InfoFragment : Fragment() {
         chips.add(Triple("Premium", if (user.is_premium == true) "★ Premium User" else "Standard", false))
         chips.add(Triple("Pixiv URL", "https://www.pixiv.net/users/${user.id}", true))
 
-        val grid = binding.profileGrid
+        renderChipGrid(
+            binding.profileGrid,
+            chips.size,
+            createChip = { createProfileChip(chips[it]) },
+            isFullWidth = { chips[it].first == "Pixiv URL" }
+        )
+    }
+
+    private fun createProfileChip(data: Triple<String, String, Boolean>): View {
+        val bd = ItemV3ProfileChipBinding.inflate(LayoutInflater.from(requireContext()))
+        bd.chipLabel.text = data.first
+        bd.chipValue.text = data.second
+        if (data.second == "★ Premium User") {
+            bd.chipValue.setTextColor(0xFFFFC233.toInt())
+        }
+        if (data.second.startsWith("http://") || data.second.startsWith("https://")) {
+            // 不用 autoLinkMask/LinkMovementMethod:LinkMovementMethod 继承
+            // ScrollingMovementMethod,横拖 URL 会跟外层 ViewPager2 抢手势,整页
+            // 跟着滑(issue #917)。改成整块点击打开 + 复用 textColorLink 的链接色,
+            // 跟 addSocialChip 的 tap-to-open 一致。
+            bd.chipValue.setTextColor(bd.chipValue.linkTextColors)
+            bd.root.setOnClickListener { openUrl(data.second) }
+        }
+        return bd.root
+    }
+
+    /**
+     * 子卡片先按「半行宽度」量自己的期望宽度，两个都放得下才并列，否则独占一行，而不是强行
+     * 并列截断。判断依赖 grid 的真实宽度：首次绑定时父卡片刚从 gone 切 visible，grid 还没量过，
+     * 要等这一次 measure/layout 跑完才有数，所以放到 preDraw 里摆（layout 已完成、还没画）。
+     * 不能拿屏幕宽度估算——平板双栏 / 分屏下 widthPixels 是整屏宽，估出来比实际宽一倍，长文本
+     * 照样被并列截断，等于没修。
+     *
+     * 也不能用 doOnLayout：OnLayoutChangeListener 是在 grid 自己的 layout() 里回调的，回调里
+     * addView 打上的 FORCE_LAYOUT 标记会在 layout() 收尾时被清掉，ViewRootImpl 判定「无需第二趟」，
+     * 首帧 grid 是空的，要等别的东西触发下一次 layout 才出现。preDraw 里 addView 走的是正常的
+     * requestLayout → 下一帧重排，OneShotPreDrawListener 随 view detach 自动摘除。
+     */
+    private fun renderChipGrid(
+        grid: LinearLayout,
+        chipCount: Int,
+        createChip: (Int) -> View,
+        isFullWidth: (Int) -> Boolean = { false },
+    ) {
+        grid.doOnPreDraw { layoutChipGrid(grid, chipCount, createChip, isFullWidth) }
+    }
+
+    private fun layoutChipGrid(
+        grid: LinearLayout,
+        chipCount: Int,
+        createChip: (Int) -> View,
+        isFullWidth: (Int) -> Boolean,
+    ) {
         grid.removeAllViews()
         val density = resources.displayMetrics.density
         val rowGap = (10 * density).toInt()
         val chipGap = (5 * density).toInt()
+
+        // 并列时 chip1 有 marginEnd、chip2 有 marginStart，一行让出两份 chipGap。
+        val halfSlotWidth = ((grid.width - chipGap * 2) / 2).coerceAtLeast(0)
+
+        fun fitsHalfSlot(chip: View): Boolean {
+            val bd = ItemV3ProfileChipBinding.bind(chip)
+            val labelWidth = bd.chipLabel.paint.measureText(
+                bd.chipLabel.text.toString().uppercase()
+            )
+            val valueWidth = bd.chipValue.paint.measureText(bd.chipValue.text.toString())
+            val desiredWidth = maxOf(labelWidth, valueWidth).toInt() +
+                bd.root.paddingLeft + bd.root.paddingRight
+            return desiredWidth <= halfSlotWidth
+        }
+
         var i = 0
-        while (i < chips.size) {
+        while (i < chipCount) {
             val row = LinearLayout(requireContext()).apply {
                 orientation = LinearLayout.HORIZONTAL
                 layoutParams = LinearLayout.LayoutParams(
@@ -297,50 +365,45 @@ class UserV3InfoFragment : Fragment() {
                 ).apply { bottomMargin = rowGap }
             }
 
-            val chip1 = createProfileChip(chips[i])
-            val isLastSingle = i + 1 >= chips.size
-            val isFullWidth = chips[i].first == "Pixiv URL"
+            val chip1 = createChip(i)
+            val isLastSingle = i + 1 >= chipCount
+            val fullWidth = isFullWidth(i)
+            val chip1Fits = !fullWidth && !isLastSingle && fitsHalfSlot(chip1)
+            val chip2 = if (chip1Fits) createChip(i + 1) else null
+            val canPair = chip1Fits && chip2 != null && fitsHalfSlot(chip2)
 
-            if (isFullWidth || isLastSingle) {
-                chip1.layoutParams =
-                    LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f)
-                row.addView(chip1)
-            } else {
+            if (canPair) {
                 chip1.layoutParams =
                     LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f).apply {
                         marginEnd = chipGap
                     }
                 row.addView(chip1)
 
-                val chip2 = createProfileChip(chips[i + 1])
-                chip2.layoutParams =
+                val chip2View = checkNotNull(chip2)
+                chip2View.layoutParams =
                     LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f).apply {
                         marginStart = chipGap
                     }
-                row.addView(chip2)
+                row.addView(chip2View)
                 i++
+            } else {
+                // 独占一行时允许文本换行，长文本不再被单行省略
+                makeChipWrappable(chip1)
+                chip1.layoutParams =
+                    LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f)
+                row.addView(chip1)
             }
             grid.addView(row)
             i++
         }
     }
 
-    private fun createProfileChip(data: Triple<String, String, Boolean>): View {
-        val bd = ItemV3ProfileChipBinding.inflate(LayoutInflater.from(requireContext()))
-        bd.chipLabel.text = data.first
-        bd.chipValue.text = data.second
-        if (data.second == "★ Premium User") {
-            bd.chipValue.setTextColor(0xFFFFC233.toInt())
-        }
-        if (data.second.startsWith("http://") || data.second.startsWith("https://")) {
-            // 不用 autoLinkMask/LinkMovementMethod:LinkMovementMethod 继承
-            // ScrollingMovementMethod,横拖 URL 会跟外层 ViewPager2 抢手势,整页
-            // 跟着滑(issue #917)。改成整块点击打开 + 复用 textColorLink 的链接色,
-            // 跟 addSocialChip 的 tap-to-open 一致。
-            bd.chipValue.setTextColor(bd.chipValue.linkTextColors)
-            bd.root.setOnClickListener { openUrl(data.second) }
-        }
-        return bd.root
+    @android.annotation.SuppressLint("InlinedApi")
+    private fun makeChipWrappable(chip: View) {
+        val bd = ItemV3ProfileChipBinding.bind(chip)
+        bd.chipValue.maxLines = Int.MAX_VALUE
+        bd.chipValue.ellipsize = null
+        bd.chipValue.breakStrategy = android.graphics.text.LineBreaker.BREAK_STRATEGY_HIGH_QUALITY
     }
 
     private fun setupWorkspaceCard(workspace: WorkspaceBean?) {
@@ -363,47 +426,11 @@ class UserV3InfoFragment : Fragment() {
         if (items.isEmpty()) return
 
         binding.workspaceCard.visibility = View.VISIBLE
-        val grid = binding.workspaceGrid
-        grid.removeAllViews()
-        val density = resources.displayMetrics.density
-        val rowGap = (10 * density).toInt()
-        val chipGap = (5 * density).toInt()
-
-        var i = 0
-        while (i < items.size) {
-            val row = LinearLayout(requireContext()).apply {
-                orientation = LinearLayout.HORIZONTAL
-                layoutParams = LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,
-                    LinearLayout.LayoutParams.WRAP_CONTENT
-                ).apply { bottomMargin = rowGap }
-            }
-
-            val isLastSingle = i + 1 >= items.size
-            val chip1 = createWorkspaceChip(items[i])
-
-            if (isLastSingle) {
-                chip1.layoutParams =
-                    LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f)
-                row.addView(chip1)
-            } else {
-                chip1.layoutParams =
-                    LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f).apply {
-                        marginEnd = chipGap
-                    }
-                row.addView(chip1)
-
-                val chip2 = createWorkspaceChip(items[i + 1])
-                chip2.layoutParams =
-                    LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f).apply {
-                        marginStart = chipGap
-                    }
-                row.addView(chip2)
-                i++
-            }
-            grid.addView(row)
-            i++
-        }
+        renderChipGrid(
+            binding.workspaceGrid,
+            items.size,
+            createChip = { createWorkspaceChip(items[it]) }
+        )
 
         binding.workspaceHeaderToggle.setOnClickListener {
             val isVisible = binding.workspaceGrid.visibility == View.VISIBLE