tint sub popup menu

ekibun · Apr 19, 2020 · 3d3bd05 · 3d3bd05
1 parent 4bb1b1d
commit 3d3bd05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/java/soko/ekibun/bangumi/util/ResourceUtil.kt b/app/src/main/java/soko/ekibun/bangumi/util/ResourceUtil.kt
@@ -86,14 +86,19 @@ object ResourceUtil{
         return typedValue
     }
 
-    fun checkMenu(context: Context, menu: Menu, isChecked: (MenuItem) -> Boolean) {
+    fun checkMenu(context: Context, menu: Menu?, isChecked: (MenuItem) -> Boolean): Boolean {
+        if (menu == null) return false
+        var hasCheckedItem = false
         menu.forEach {
+            val checked = isChecked(it) || checkMenu(context, it.subMenu, isChecked)
+            hasCheckedItem = hasCheckedItem || checked
             it.title = SpannableString(it.title.toString()).also { span ->
-                if (isChecked(it)) span.setSpan(
+                if (checked) span.setSpan(
                     ForegroundColorSpan(resolveColorAttr(context, R.attr.colorAccent)),
                     0, span.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE
                 )
             }
         }
+        return hasCheckedItem
     }
 }
diff --git a/app/src/main/res/layout/item_calendar.xml b/app/src/main/res/layout/item_calendar.xml
@@ -36,6 +36,8 @@
             app:layout_constraintTop_toTopOf="parent"/>
 
     <TextView
+            android:visibility="gone"
+            tools:visibility="visible"
             android:transitionName="title"
             android:id="@+id/item_chase"
             android:layout_width="wrap_content"