From e5b58770ced893cb24733efe42425d4fb7bcdda8 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Thu, 28 Apr 2022 20:38:51 +0200
Subject: [PATCH] improve LoginWebViewActivityUX (#2465)

---
 .../components/login/LoginWebViewActivity.kt   | 18 +++++++++++++++---
 app/src/main/res/layout/login_webview.xml      |  6 ++++++
 app/src/main/res/values/strings.xml            |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewActivity.kt
index 827b56208..58f745e79 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewActivity.kt
@@ -19,8 +19,10 @@ import androidx.activity.result.contract.ActivityResultContract
 import androidx.core.net.toUri
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.BuildConfig
+import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.databinding.LoginWebviewBinding
 import com.keylesspalace.tusky.di.Injectable
+import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.viewBinding
 import kotlinx.parcelize.Parcelize
 
@@ -87,7 +89,9 @@ class LoginWebViewActivity : BaseActivity(), Injectable {
 
         setSupportActionBar(binding.loginToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
+        supportActionBar?.setDisplayShowTitleEnabled(true)
+
+        setTitle(R.string.title_login)
 
         val webView = binding.loginWebView
         webView.settings.allowContentAccess = false
@@ -103,13 +107,17 @@ class LoginWebViewActivity : BaseActivity(), Injectable {
         val oauthUrl = data.oauthRedirectUrl
 
         webView.webViewClient = object : WebViewClient() {
+            override fun onPageFinished(view: WebView?, url: String?) {
+                binding.loginProgress.hide()
+            }
+
             override fun onReceivedError(
                 view: WebView,
                 request: WebResourceRequest,
                 error: WebResourceError
             ) {
                 Log.d("LoginWeb", "Failed to load ${data.url}: $error")
-                finish()
+                finishWithoutSlideOutAnimation()
             }
 
             override fun shouldOverrideUrlLoading(
@@ -165,10 +173,14 @@ class LoginWebViewActivity : BaseActivity(), Injectable {
         super.onDestroy()
     }
 
+    override fun finish() {
+        super.finishWithoutSlideOutAnimation()
+    }
+
     override fun requiresLogin() = false
 
     private fun sendResult(result: LoginResult) {
         setResult(Activity.RESULT_OK, OauthLogin.makeResultIntent(result))
-        finish()
+        finishWithoutSlideOutAnimation()
     }
 }
diff --git a/app/src/main/res/layout/login_webview.xml b/app/src/main/res/layout/login_webview.xml
index 22d7f3bd9..67d47d6f8 100644
--- a/app/src/main/res/layout/login_webview.xml
+++ b/app/src/main/res/layout/login_webview.xml
@@ -16,6 +16,12 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
+    <ProgressBar
+        android:id="@+id/loginProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"  />
+
     <WebView
         android:id="@+id/loginWebView"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e007c50e1..64ab3a1ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="error_media_upload_sending">The upload failed.</string>
     <string name="error_sender_account_gone">Error sending post.</string>
 
+    <string name="title_login">Login</string>
     <string name="title_home">Home</string>
     <string name="title_notifications">Notifications</string>
     <string name="title_public_local">Local</string>