Merge branch 'do-not-move-hot-buffers' into v1.10-dev

ubergeek42 · Dec 25, 2024 · 5d775e9 · 5d775e9
2 parents 6a3457c + a5ae9be
commit 5d775e9
Show file tree

Hide file tree

Showing 24 changed files with 543 additions and 98 deletions.
diff --git a/app/src/main/inkscape/ic_bufferlist_arrow_down.svg b/app/src/main/inkscape/ic_bufferlist_arrow_down.svg
diff --git a/app/src/main/inkscape/ic_bufferlist_arrow_up.svg b/app/src/main/inkscape/ic_bufferlist_arrow_up.svg
diff --git a/app/src/main/inkscape/optimized/ic_bufferlist_arrow_down.svg b/app/src/main/inkscape/optimized/ic_bufferlist_arrow_down.svg
diff --git a/app/src/main/inkscape/optimized/ic_bufferlist_arrow_up.svg b/app/src/main/inkscape/optimized/ic_bufferlist_arrow_up.svg
diff --git a/app/src/main/java/com/ubergeek42/WeechatAndroid/WeechatActivity.kt b/app/src/main/java/com/ubergeek42/WeechatAndroid/WeechatActivity.kt
@@ -269,7 +269,6 @@ class WeechatActivity : AppCompatActivity(), CutePageChangeListener,
         Network.get().register(this, null)  // no callback, simply make sure that network info is correct while we are showing
         EventBus.getDefault().register(this)
         connectionState = EventBus.getDefault().getStickyEvent(StateChangedEvent::class.java).state
-        updateHotCount(BufferList.totalHotMessageCount)
         started = true
         P.storeThemeOrColorSchemeColors(this)
         applyColorSchemeToViews()
@@ -500,6 +499,7 @@ class WeechatActivity : AppCompatActivity(), CutePageChangeListener,
         uiMenu = menu
         updateMenuItems()
         makeMenuReflectConnectionStatus()
+        // `onCreateOptionsMenu` is called *after* onStart, when `updateHotCount` was already called
         updateHotCount(hotNumber)
         return super.onCreateOptionsMenu(menu)
     }
@@ -669,6 +669,8 @@ class WeechatActivity : AppCompatActivity(), CutePageChangeListener,
         }
     }
 
+    fun isBufferListVisible() = !slidy || isPagerNoticeablyObscured
+
     // set the kitty image that appears when no pages are open
     private var kittyImageResourceId = -1
     @MainThread @Cat private fun setKittyImage(resourceId: Int) {