Tweak directory structure

This commit is contained in:
tarsin committed 2023-01-22 16:24:02 +08:00
1 parent 92c94aa22a
commit bf13bbf506
7 files changed
+14 -17

No files matched your search

+1 -1
View File
@@ -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"/>
@@ -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
@@ -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
@@ -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 {
@@ -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
@@ -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
@@ -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