yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start moving to new compose login activity

Browse Source
This commit is contained in:
tarsin committed 2023-01-11 13:12:16 +08:00
1 parent 8e39449856
commit 97d1bd7685
2 files changed
+14 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
+2 -3
View File
@@ -211,6 +211,8 @@ class MainActivity : EhActivity() {
}
override fun onCreate(savedInstanceState: Bundle?) {
if (EhUtils.needSignedIn())
startActivity(Intent(this, LoginActivity::class.java))
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
@@ -227,9 +229,6 @@ class MainActivity : EhActivity() {
}
}
}
if (EhUtils.needSignedIn()) {
navController.navigate(R.id.signInScene)
}
binding.drawView.addDrawerListener(mDrawerOnBackPressedCallback)
binding.navView.setupWithNavController(navController)
if (savedInstanceState == null) {
app/src/main/res/navigation/nav_graph.xml
+12 -16
View File
@@ -11,38 +11,38 @@
<fragment
android:id="@+id/nav_homepage"
android:name="com.hippo.ehviewer.ui.scene.GalleryListScene"
android:label="GalleryListScene" >
android:label="GalleryListScene">
<argument
android:name="action"
app:argType="string"
android:defaultValue="action_homepage" />
android:defaultValue="action_homepage"
app:argType="string" />
</fragment>
<fragment
android:id="@+id/nav_subscription"
android:name="com.hippo.ehviewer.ui.scene.GalleryListScene"
android:label="GalleryListScene" >
android:label="GalleryListScene">
<argument
android:name="action"
app:argType="string"
android:defaultValue="action_subscription" />
android:defaultValue="action_subscription"
app:argType="string" />
</fragment>
<fragment
android:id="@+id/nav_whats_hot"
android:name="com.hippo.ehviewer.ui.scene.GalleryListScene"
android:label="GalleryListScene" >
android:label="GalleryListScene">
<argument
android:name="action"
app:argType="string"
android:defaultValue="action_whats_hot" />
android:defaultValue="action_whats_hot"
app:argType="string" />
</fragment>
<fragment
android:id="@+id/nav_toplist"
android:name="com.hippo.ehviewer.ui.scene.GalleryListScene"
android:label="GalleryListScene" >
android:label="GalleryListScene">
<argument
android:name="action"
app:argType="string"
android:defaultValue="action_top_list" />
android:defaultValue="action_top_list"
app:argType="string" />
</fragment>
<fragment
android:id="@+id/galleryDetailScene"
@@ -92,8 +92,4 @@
android:id="@+id/cookieSignInScene"
android:name="com.hippo.ehviewer.ui.scene.CookieSignInScene"
android:label="CookieSignInScene" />
<activity
android:id="@+id/loginActivity"
android:name="com.hippo.ehviewer.ui.LoginActivity"
android:label="LoginActivity" />
</navigation>