From f7aa6d006ee798737323521a1cf81d11538881b5 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Tue, 7 Nov 2023 16:46:55 +0100 Subject: [PATCH] Add header to login activity with current url --- .../activities/LoginActivity.kt | 13 ++++++ app/src/main/res/layout/activity_login.xml | 40 +++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt index 23040dad..d2bddb7a 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt @@ -7,6 +7,8 @@ import android.webkit.ConsoleMessage import android.webkit.CookieManager import android.webkit.WebChromeClient import android.webkit.WebView +import android.widget.ImageButton +import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import com.futo.platformplayer.* @@ -23,6 +25,8 @@ import kotlinx.serialization.json.Json class LoginActivity : AppCompatActivity() { private lateinit var _webView: WebView; + private lateinit var _textUrl: TextView; + private lateinit var _buttonClose: ImageButton; override fun onCreate(savedInstanceState: Bundle?) { @@ -30,6 +34,13 @@ class LoginActivity : AppCompatActivity() { setContentView(R.layout.activity_login); setNavigationBarColorAndIcons(); + _textUrl = findViewById(R.id.text_url); + _buttonClose = findViewById(R.id.button_close); + _buttonClose.setOnClickListener { + finish(); + } + + _webView = findViewById(R.id.web_view); _webView.settings.javaScriptEnabled = true; CookieManager.getInstance().setAcceptCookie(true); @@ -60,6 +71,8 @@ class LoginActivity : AppCompatActivity() { }; var isFirstLoad = true; webViewClient.onPageLoaded.subscribe { view, url -> + _textUrl.setText(url ?: ""); + if(!isFirstLoad) return@subscribe; isFirstLoad = false; diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 8bffe366..fd35ed06 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,11 +1,43 @@ - - + + + + - \ No newline at end of file + android:layout_height="0dp" + app:layout_constraintTop_toBottomOf="@id/header" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintBottom_toBottomOf="parent"/> + \ No newline at end of file