diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5911b2f13..4e6173154 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
         android:theme="@style/AppTheme"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.LoginActivity"
+            android:name=".ui.login.LoginActivity"
             android:exported="false"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize"/>
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
index 301d0440a..a7b2569ac 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
@@ -58,6 +58,7 @@ import com.hippo.ehviewer.client.parser.GalleryListUrlParser
 import com.hippo.ehviewer.client.parser.GalleryPageUrlParser
 import com.hippo.ehviewer.databinding.ActivityMainBinding
 import com.hippo.ehviewer.download.DownloadService
+import com.hippo.ehviewer.ui.login.LoginActivity
 import com.hippo.ehviewer.ui.scene.BaseScene
 import com.hippo.ehviewer.ui.scene.GalleryDetailScene
 import com.hippo.ehviewer.ui.scene.GalleryListScene
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/CookieSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/CookieSignInScreen.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
index aea4486c3..a0d9d5a33 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/CookieSignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/CookieSignInScreen.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.login
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
@@ -53,7 +53,7 @@ import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
+import com.hippo.ehviewer.ui.login.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
 import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
similarity index 83%
rename from app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
index 411665638..71e09c08f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
@@ -1,19 +1,15 @@
-package com.hippo.ehviewer.ui
+package com.hippo.ehviewer.ui.login
 
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.navigation.ActivityNavigator
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
-import com.hippo.ehviewer.ui.compose.CookieSignInScene
-import com.hippo.ehviewer.ui.compose.SelectSiteScreen
-import com.hippo.ehviewer.ui.compose.SignInScreen
-import com.hippo.ehviewer.ui.compose.WebviewSignInScreen
+import com.hippo.ehviewer.ui.EhActivity
 
-class LoginActivity : ComponentActivity() {
+class LoginActivity : EhActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/SelectSiteScreen.kt
similarity index 99%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/login/SelectSiteScreen.kt
index 73547183a..d9ba2383d 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/SelectSiteScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/SelectSiteScreen.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.login
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/SignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/SignInScreen.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
index 7fc9a571d..88ff4157f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/SignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/SignInScreen.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.login
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
@@ -57,9 +57,9 @@ import com.hippo.ehviewer.UrlOpener
 import com.hippo.ehviewer.client.EhEngine
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.LoginActivity.Companion.COOKIE_SIGN_IN_ROUTE_NAME
-import com.hippo.ehviewer.ui.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
-import com.hippo.ehviewer.ui.LoginActivity.Companion.WEBVIEW_SIGN_IN_ROUTE_NAME
+import com.hippo.ehviewer.ui.login.LoginActivity.Companion.COOKIE_SIGN_IN_ROUTE_NAME
+import com.hippo.ehviewer.ui.login.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
+import com.hippo.ehviewer.ui.login.LoginActivity.Companion.WEBVIEW_SIGN_IN_ROUTE_NAME
 import com.hippo.util.ExceptionUtils
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.withUIContext
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/WebviewSignInScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt
similarity index 97%
rename from app/src/main/java/com/hippo/ehviewer/ui/compose/WebviewSignInScreen.kt
rename to app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt
index 4d35c14dc..6ea4b9f6f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/compose/WebviewSignInScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/login/WebviewSignInScreen.kt
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.ui.compose
+package com.hippo.ehviewer.ui.login
 
 import android.annotation.SuppressLint
 import android.graphics.Color
@@ -14,7 +14,7 @@ import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhUrl
 import com.hippo.ehviewer.client.EhUtils
-import com.hippo.ehviewer.ui.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
+import com.hippo.ehviewer.ui.login.LoginActivity.Companion.SELECT_SITE_ROUTE_NAME
 import com.hippo.ehviewer.widget.DialogWebChromeClient
 import okhttp3.Cookie
 import okhttp3.HttpUrl