From c435b7f42d0b9deb8913cb03217013915a9ffef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Tue, 19 Nov 2019 21:35:38 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20Android=20=E3=81=AC=E3=82=8B=E3=81=BD=20i?= =?UTF-8?q?n=20Regist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/metallic/chiaki/regist/RegistExecuteActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt b/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt index 4136248..09a7070 100644 --- a/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt +++ b/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt @@ -59,8 +59,9 @@ class RegistExecuteActivity: AppCompatActivity() logTextView.setHorizontallyScrolling(true) logTextView.movementMethod = ScrollingMovementMethod() viewModel.logText.observe(this, Observer { + val textLayout = logTextView.layout ?: return@Observer logTextView.text = it - val scrollY = logTextView.layout.getLineBottom(logTextView.lineCount - 1) - logTextView.height + logTextView.paddingTop + logTextView.paddingBottom + val scrollY = textLayout.getLineBottom(logTextView.lineCount - 1) - logTextView.height + logTextView.paddingTop + logTextView.paddingBottom logTextView.scrollTo(0, max(scrollY, 0)) })