Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-01-28 01:29:23 +01:00
Code Issues Releases Wiki Activity

disable fade out of sidemenu scrollbar

Browse Source
This commit is contained in:
tateisu 2020-12-22 13:27:39 +09:00
parent 00b05d8646
commit 362e026a76
4 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/jp/juggler/subwaytooter/Column.kt
View File

@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.atomic.AtomicLong
import java.util.regex.Pattern
import kotlin.collections.ArrayList
import kotlin.math.max
enum class ColumnPagingType {
@ -563,11 +564,11 @@ class Column(
////////////////////////////////////////////////////////////////
private fun canHandleStreamingMessage () = !is_dispose.get() && canStartStreaming()
private fun canHandleStreamingMessage() = !is_dispose.get() && canStartStreaming()
private fun runOnMainLooperForStreamingEvent(proc : () -> Unit){
private fun runOnMainLooperForStreamingEvent(proc: () -> Unit) {
runOnMainLooper {
if(!canHandleStreamingMessage() )
if (!canHandleStreamingMessage())
return@runOnMainLooper
proc()
}
@ -576,7 +577,7 @@ class Column(
val streamCallback = object : StreamCallback {
override fun onListeningStateChanged(status: StreamStatus) {
if(!canHandleStreamingMessage() ) return
if (!canHandleStreamingMessage()) return
if (status == StreamStatus.Open) {
updateMisskeyCapture()
@ -587,8 +588,8 @@ class Column(
}
}
override fun onTimelineItem(item: TimelineItem, channelId: String?,stream:JsonArray?) {
if(!canHandleStreamingMessage() ) return
override fun onTimelineItem(item: TimelineItem, channelId: String?, stream: JsonArray?) {
if (!canHandleStreamingMessage()) return
when (item) {
is TootConversationSummary -> {
@ -695,7 +696,7 @@ class Column(
override fun onAnnouncementUpdate(item: TootAnnouncement) {
runOnMainLooperForStreamingEvent {
if( type != ColumnType.HOME)
if (type != ColumnType.HOME)
return@runOnMainLooperForStreamingEvent
val list = announcements
@ -719,7 +720,7 @@ class Column(
override fun onAnnouncementDelete(id: EntityId) {
runOnMainLooperForStreamingEvent {
announcements?.iterator()?.let{
announcements?.iterator()?.let {
while (it.hasNext()) {
val item = it.next()
if (item.id != id) continue
@ -766,23 +767,25 @@ class Column(
}
}
private val mergeStreamingMessage: Runnable = object : Runnable {
private val mergeStreamingMessage = object : Runnable {
override fun run() {
// 前回マージしてから暫くは待機してリトライ
val handler = app_state.handler
val now = SystemClock.elapsedRealtime()
val remain = last_show_stream_data.get() + 333L - now
if (remain > 0) {
// 未初期化や初期ロード中ならキューをクリアして何もしない
if (!canHandleStreamingMessage() ) {
stream_data_queue.clear()
handler.removeCallbacks(this)
handler.postDelayed(this, remain)
return
}
// 前回マージしてから暫くは待機してリトライ
// カラムがビジー状態なら待機してリトライ
if( !canStartStreaming() || bRefreshLoading){
val now = SystemClock.elapsedRealtime()
var remain = last_show_stream_data.get() + 333L - now
if (bRefreshLoading) remain = max(333L, remain)
if (remain > 0) {
handler.removeCallbacks(this)
handler.postDelayed(this, 333L)
handler.postDelayed(this, remain)
return
}
@ -1548,7 +1551,6 @@ class Column(
}
fun removeNotificationOne(target_account: SavedAccount, notification: TootNotification) {
if (!isNotificationColumn) return
@ -2582,7 +2584,7 @@ class Column(
} else if (isSearchColumn) {
// 検索カラムはリフレッシュもストリーミングもないが、表示開始のタイミングでリストの再描画を行いたい
fireShowContent(reason = "Column onStart isSearchColumn", reset = true)
} else if( canStartStreaming() && streamSpec !=null ){
} else if (canStartStreaming() && streamSpec != null) {
// ギャップつきでストリーミング開始
this.bPutGap = true
fireShowColumnStatus()

3
app/src/main/java/jp/juggler/subwaytooter/SideMenuAdapter.kt
View File

@ -431,7 +431,8 @@ class SideMenuAdapter(
selector = StateListDrawable()
divider = null
dividerHeight = 0
isScrollbarFadingEnabled = false
val pad_tb = (actMain.density * 12f + 0.5f).toInt()
setPadding(0, pad_tb, 0, pad_tb)
clipToPadding = false

1
app/src/main/java/jp/juggler/subwaytooter/action/Action_Notification.kt
View File

@ -8,6 +8,7 @@ import jp.juggler.subwaytooter.api.TootApiResult
import jp.juggler.subwaytooter.api.TootTask
import jp.juggler.subwaytooter.api.TootTaskRunner
import jp.juggler.subwaytooter.api.entity.TootNotification
import jp.juggler.subwaytooter.isNotificationColumn
import jp.juggler.subwaytooter.table.SavedAccount
import jp.juggler.util.showToast
import jp.juggler.util.toFormRequestBody

7
app/src/main/java/jp/juggler/subwaytooter/streaming/StreamConnection.kt
View File

@ -187,7 +187,6 @@ class StreamConnection(
private fun handleMastodonMessage(obj: JsonObject, text: String) {
val stream = obj.jsonArray("stream")
if(stream!=null) log.w("stream=${stream}")
when (val event = obj.string("event")) {
null, "" ->
@ -274,15 +273,15 @@ class StreamConnection(
override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
manager.enqueue {
log.v("$name WebSocket onClosed code=$code, reason=$reason")
log.w("$name WebSocket onClosed code=$code, reason=$reason")
status = StreamStatus.Closed
}
}
override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
manager.enqueue {
if (t is SocketException && t.message == "Socket is closed") {
log.w("$name ${t.message}")
if (t is SocketException && t.message?.contains("closed") ==true) {
log.w("$name socket closed.")
} else {
log.e(t, "$name WebSocket onFailure.")
}