v0.5.2 update.

YenalyLiew · Nov 9, 2022 · 46d967a · 46d967a
1 parent 658732a
commit 46d967a
Show file tree

Hide file tree

Showing 19 changed files with 488 additions and 204 deletions.
diff --git a/README.md b/README.md
@@ -40,6 +40,10 @@ Comment is supported right now but comment like or dislike and some other functi
 
 ## 更新内容
 
+### v0.5.2
+
+修复“没有登录失败的校验”的问题。
+
 ### v0.5.1
 
 修复搜索栏逻辑问题。

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -16,7 +16,7 @@ android {
         minSdk = 24
         targetSdk = 33
         versionCode = createVersionCode()
-        versionName = createVersionName(major = 0, minor = 5, patch = 1)
+        versionName = createVersionName(major = 0, minor = 5, patch = 2)
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/AboutActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/AboutActivity.kt
@@ -114,16 +114,6 @@ class AboutActivity : AbsAboutActivity() {
                             ), gapWidth = 4.dp
                         )
                     }
-                    newline(2)
-                    "切換清晰度退出全屏會導致影片重置".span {
-                        quote(
-                            Color.rgb(
-                                (0..255).random(),
-                                (0..255).random(),
-                                (0..255).random()
-                            ), gapWidth = 4.dp
-                        )
-                    }
                 }
             ))
         }

diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/LoginActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/LoginActivity.kt
@@ -10,6 +10,7 @@ import android.webkit.CookieManager
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.core.os.BuildCompat.PrereleaseSdkCheck
 import androidx.databinding.DataBindingUtil
 import com.itxca.spannablex.spannable
 import com.yenaly.han1meviewer.HANIME_BASE_URL
@@ -29,6 +30,7 @@ class LoginActivity : FrameActivity() {
         SystemStatusUtil.fullScreen(window, true)
     }
 
+    @PrereleaseSdkCheck
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_login)
@@ -88,7 +90,7 @@ class LoginActivity : FrameActivity() {
                     view: WebView,
                     request: WebResourceRequest
                 ): Boolean {
-                    if (request.isRedirect && request.url.toString().contains(HANIME_BASE_URL)) {
+                    if (request.isRedirect && request.url.toString() == HANIME_BASE_URL) {
                         val url = request.url
                         val cookieManager = CookieManager.getInstance().getCookie(url.host)
                         Log.d("login_cookie", cookieManager.toString())

diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/MainActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/MainActivity.kt
@@ -5,8 +5,6 @@ import android.content.Intent
 import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
@@ -23,13 +21,15 @@ import coil.transform.CircleCropTransformation
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.itxca.spannablex.spannable
-import com.yenaly.han1meviewer.*
-import com.yenaly.han1meviewer.util.checkNeedUpdate
+import com.yenaly.han1meviewer.R
+import com.yenaly.han1meviewer.VIDEO_CODE
 import com.yenaly.han1meviewer.databinding.ActivityMainBinding
+import com.yenaly.han1meviewer.isAlreadyLogin
 import com.yenaly.han1meviewer.logic.model.VersionModel
 import com.yenaly.han1meviewer.logic.state.WebsiteState
 import com.yenaly.han1meviewer.logout
 import com.yenaly.han1meviewer.ui.viewmodel.MainViewModel
+import com.yenaly.han1meviewer.util.checkNeedUpdate
 import com.yenaly.yenaly_libs.base.YenalyActivity
 import com.yenaly.yenaly_libs.utils.*
 import kotlinx.coroutines.launch
@@ -63,6 +63,22 @@ class MainActivity : YenalyActivity<ActivityMainBinding, MainViewModel>() {
      */
     override fun initData(savedInstanceState: Bundle?) {
         setSupportActionBar(binding.toolbar)
+
+        // 暂时先这样
+        addMenu(R.menu.menu_main_toolbar) { item ->
+            when (item.itemId) {
+                R.id.tb_search -> {
+                    startActivity<SearchActivity>()
+                    return@addMenu true
+                }
+                R.id.tb_previews -> {
+                    startActivity<PreviewActivity>()
+                    return@addMenu true
+                }
+            }
+            return@addMenu item.onNavDestinationSelected(navController)
+        }
+
         supportActionBar?.let {
             it.title = spannable {
                 "H".span {
@@ -140,25 +156,6 @@ class MainActivity : YenalyActivity<ActivityMainBinding, MainViewModel>() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_main_toolbar, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.tb_search -> {
-                startActivity<SearchActivity>()
-                return true
-            }
-            R.id.tb_previews -> {
-                startActivity<PreviewActivity>()
-                return true
-            }
-        }
-        return item.onNavDestinationSelected(navController) || super.onOptionsItemSelected(item)
-    }
-
     override fun onSupportNavigateUp(): Boolean {
         return navController.navigateUp() || super.onSupportNavigateUp()
     }

diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/activity/VideoActivity.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/activity/VideoActivity.kt
@@ -163,12 +163,9 @@ class VideoActivity : YenalyActivity<ActivityVideoBinding, VideoViewModel>(),
 
     private fun initViewPager() {
 
-        binding.videoVp.setUpFragmentStateAdapter(this, 2) { position ->
-            when (position) {
-                0 -> VideoIntroductionFragment()
-                1 -> CommentFragment().makeBundle(COMMENT_TYPE to VIDEO_COMMENT_PREFIX)
-                else -> null
-            }
+        binding.videoVp.setUpFragmentStateAdapter(this) {
+            addFragment { VideoIntroductionFragment() }
+            addFragment { CommentFragment().makeBundle(COMMENT_TYPE to VIDEO_COMMENT_PREFIX) }
         }
 
         binding.videoTl.attach(binding.videoVp) { tab, position ->

diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/DownloadFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/DownloadFragment.kt
@@ -1,7 +1,6 @@
 package com.yenaly.han1meviewer.ui.fragment.home
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import com.yenaly.han1meviewer.R
 import com.yenaly.han1meviewer.databinding.FragmentTabViewPagerOnlyBinding
 import com.yenaly.han1meviewer.ui.fragment.home.download.DownloadedFragment
@@ -28,12 +27,9 @@ class DownloadFragment : YenalyFragment<FragmentTabViewPagerOnlyBinding, Downloa
 
     private fun initViewPager() {
 
-        binding.viewPager.setUpFragmentStateAdapter(this, 2) { position ->
-            when (position) {
-                0 -> DownloadingFragment()
-                1 -> DownloadedFragment()
-                else -> null
-            }
+        binding.viewPager.setUpFragmentStateAdapter(this) {
+            addFragment { DownloadingFragment() }
+            addFragment { DownloadedFragment() }
         }
 
         binding.tabLayout.attach(binding.viewPager) { tab, position ->

diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyFavVideoFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyFavVideoFragment.kt
@@ -5,9 +5,6 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import android.widget.TextView
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.whenStarted
@@ -46,7 +43,20 @@ class MyFavVideoFragment : YenalyFragment<FragmentPageListBinding, MyListViewMod
     override fun initData(savedInstanceState: Bundle?) {
 
         (activity as? MainActivity)?.setToolbarSubtitle(getString(R.string.fav_video))
-        setHasOptionsMenu(true)
+
+        addMenu(R.menu.menu_my_list_toolbar, viewLifecycleOwner) { menuItem ->
+            when (menuItem.itemId) {
+                R.id.tb_help -> {
+                    MaterialAlertDialogBuilder(requireContext())
+                        .setTitle("使用注意！")
+                        .setMessage("左劃可以取消喜愛！")
+                        .setPositiveButton("OK", null)
+                        .show()
+                    return@addMenu true
+                }
+            }
+            return@addMenu false
+        }
 
         binding.rvPageList.apply {
             layoutManager = GridLayoutManager(context, VIDEO_IN_ONE_LINE)
@@ -151,25 +161,6 @@ class MyFavVideoFragment : YenalyFragment<FragmentPageListBinding, MyListViewMod
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        menu.clear()
-        inflater.inflate(R.menu.menu_my_list_toolbar, menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.tb_help -> {
-                MaterialAlertDialogBuilder(requireContext())
-                    .setTitle("使用注意！")
-                    .setMessage("左劃可以取消喜愛！")
-                    .setPositiveButton("OK", null)
-                    .show()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         binding.rvPageList.layoutManager = GridLayoutManager(context, VIDEO_IN_ONE_LINE)

diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyPlayListFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyPlayListFragment.kt
@@ -1,9 +1,6 @@
 package com.yenaly.han1meviewer.ui.fragment.home
 
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.yenaly.han1meviewer.R
 import com.yenaly.han1meviewer.databinding.FragmentPageListBinding
@@ -19,30 +16,23 @@ import com.yenaly.yenaly_libs.base.YenalyFragment
 class MyPlayListFragment : YenalyFragment<FragmentPageListBinding, MyListViewModel>() {
     override fun initData(savedInstanceState: Bundle?) {
         (activity as? MainActivity)?.setToolbarSubtitle(getString(R.string.play_list))
-        setHasOptionsMenu(true)
 
+        addMenu(R.menu.menu_my_list_toolbar, viewLifecycleOwner) { menuItem ->
+            when (menuItem.itemId) {
+                R.id.tb_help -> {
+                    MaterialAlertDialogBuilder(requireContext())
+                        .setTitle("使用注意！")
+                        .setMessage("我還沒做這塊，如果有想幫忙的非常歡迎！")
+                        .setPositiveButton("OK", null)
+                        .show()
+                    return@addMenu true
+                }
+            }
+            return@addMenu false
+        }
     }
 
     override fun liveDataObserve() {
 
     }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        menu.clear()
-        inflater.inflate(R.menu.menu_my_list_toolbar, menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.tb_help -> {
-                MaterialAlertDialogBuilder(requireContext())
-                    .setTitle("使用注意！")
-                    .setMessage("我還沒做這塊，如果有想幫忙的非常歡迎！")
-                    .setPositiveButton("OK", null)
-                    .show()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
 }
diff --git a/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyWatchLaterFragment.kt b/app/src/main/java/com/yenaly/han1meviewer/ui/fragment/home/MyWatchLaterFragment.kt
@@ -5,9 +5,6 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import android.widget.TextView
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.whenStarted
@@ -46,7 +43,20 @@ class MyWatchLaterFragment : YenalyFragment<FragmentPageListBinding, MyListViewM
     override fun initData(savedInstanceState: Bundle?) {
 
         (activity as? MainActivity)?.setToolbarSubtitle(getString(R.string.watch_later))
-        setHasOptionsMenu(true)
+
+        addMenu(R.menu.menu_my_list_toolbar, viewLifecycleOwner) { menuItem ->
+            when (menuItem.itemId) {
+                R.id.tb_help -> {
+                    MaterialAlertDialogBuilder(requireContext())
+                        .setTitle("使用注意！")
+                        .setMessage("左劃可以取消待看！")
+                        .setPositiveButton("OK", null)
+                        .show()
+                    return@addMenu true
+                }
+            }
+            return@addMenu false
+        }
 
         binding.rvPageList.apply {
             layoutManager = GridLayoutManager(context, VIDEO_IN_ONE_LINE)
@@ -150,25 +160,6 @@ class MyWatchLaterFragment : YenalyFragment<FragmentPageListBinding, MyListViewM
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        menu.clear()
-        inflater.inflate(R.menu.menu_my_list_toolbar, menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.tb_help -> {
-                MaterialAlertDialogBuilder(requireContext())
-                    .setTitle("使用注意！")
-                    .setMessage("左劃可以取消待看！")
-                    .setPositiveButton("OK", null)
-                    .show()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         binding.rvPageList.layoutManager = GridLayoutManager(context, VIDEO_IN_ONE_LINE)