[optimize|fix]优化沉浸式padding添加位置；修复文件名过长导致无法下载的问题

Author: SkyD666

app/src/main/java/com/skyd/imomoe/ext/ViewExt.kt

@@ -93,7 +93,7 @@ fun View.addFitsSystemWindows(
         var newPaddingRight = v.paddingRight
         if (top) newPaddingTop = ins.getInsets(WindowInsetsCompat.Type.statusBars()).top
         if (bottom) newPaddingBottom = ins.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
-        if (left) newPaddingLeft = ins.getInsets(WindowInsetsCompat.Type.statusBars()).left
+        if (left) newPaddingLeft = ins.getInsets(WindowInsetsCompat.Type.displayCutout()).left
         if (right) newPaddingRight = ins.getInsets(WindowInsetsCompat.Type.navigationBars()).right
 
         v.updatePadding(

app/src/main/java/com/skyd/imomoe/ext/ViewPagerExt.kt

@@ -126,10 +126,13 @@ class AnimeDownloadService : LifecycleService() {
         val storeDirectoryPath = intent.getStringExtra(STORE_DIRECTORY_PATH_KEY).orEmpty()
         val animeTitle = intent.getStringExtra(ANIME_TITLE).orEmpty()
         val animeEpisode = intent.getStringExtra(ANIME_EPISODE).orEmpty()
-        val fileName = downloadUrl.substringAfterLast("/", animeEpisode).ifBlank { animeEpisode }
 
         coroutineScope.launch {
             runCatching {
+                val fileName = downloadUrl
+                    .substringAfterLast("/", animeEpisode)
+                    .ifBlank { animeEpisode }
+                    .toMD5()
                 val contentType = RetrofitManager
                     .get()
                     .create(HtmlService::class.java)

app/src/main/java/com/skyd/imomoe/util/download/downloadanime/AnimeDownloadService.kt

@@ -2,6 +2,7 @@ package com.skyd.imomoe.view.activity
 
 import android.os.Bundle
 import androidx.activity.viewModels
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import com.skyd.imomoe.R
 import com.skyd.imomoe.config.Api
@@ -86,6 +87,7 @@ class AnimeDetailActivity : BaseActivity<ActivityAnimeDetailBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        WindowInsetsControllerCompat(window, mBinding.root).isAppearanceLightStatusBars = false
 
         viewModel.partUrl = intent.getStringExtra("partUrl").orEmpty()
 

app/src/main/java/com/skyd/imomoe/view/activity/AnimeDetailActivity.kt

@@ -43,7 +43,6 @@ class ConfigDataSourceActivity : BaseActivity<ActivityConfigDataSourceBinding>()
         mBinding.apply {
             ablConfigDataSourceActivity.hideToolbarWhenCollapsed(tbConfigDataSourceActivity)
             ablConfigDataSourceActivity.addFitsSystemWindows(right = true, top = true)
-            vp2ConfigDataSourceActivity.fitsSystemWindows2()
 
             tbConfigDataSourceActivity.apply {
                 setNavigationOnClickListener { finish() }
@@ -65,11 +64,12 @@ class ConfigDataSourceActivity : BaseActivity<ActivityConfigDataSourceBinding>()
             vp2ConfigDataSourceActivity.adapter = adapter
 
             val tabLayoutMediator = TabLayoutMediator(
-                tlConfigDataSourceActivity, vp2ConfigDataSourceActivity//.getViewPager()
+                tlConfigDataSourceActivity, vp2ConfigDataSourceActivity
             ) { tab, position ->
                 tab.text = tabLayoutTitle[position % 2]
             }
             tabLayoutMediator.attach()
+            adapter.notifyDataSetChanged()
         }
 
         viewModel.deleteSource.collectWithLifecycle(this) {

app/src/main/java/com/skyd/imomoe/view/activity/ConfigDataSourceActivity.kt

@@ -7,13 +7,16 @@ import android.content.ServiceConnection
 import android.os.Bundle
 import android.os.IBinder
 import androidx.activity.viewModels
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.arialyy.aria.core.task.DownloadTask
 import com.skyd.imomoe.databinding.ActivityDownloadManagerBinding
 import com.skyd.imomoe.ext.addFitsSystemWindows
 import com.skyd.imomoe.ext.collectWithLifecycle
 import com.skyd.imomoe.state.DataState
 import com.skyd.imomoe.util.download.downloadanime.AnimeDownloadService
+import com.skyd.imomoe.view.adapter.decoration.AnimeShowItemDecoration
+import com.skyd.imomoe.view.adapter.spansize.AnimeShowSpanSize
 import com.skyd.imomoe.view.adapter.variety.VarietyAdapter
 import com.skyd.imomoe.view.adapter.variety.proxy.AnimeDownload1Proxy
 import com.skyd.imomoe.viewmodel.DownloadManagerViewModel
@@ -46,8 +49,11 @@ class DownloadManagerActivity : BaseActivity<ActivityDownloadManagerBinding>() {
             ablDownloadManagerActivity.addFitsSystemWindows(right = true, top = true)
 
             rvDownloadManagerActivity.addFitsSystemWindows(right = true, bottom = true)
-            rvDownloadManagerActivity.layoutManager =
-                LinearLayoutManager(this@DownloadManagerActivity)
+            rvDownloadManagerActivity.layoutManager = GridLayoutManager(
+                this@DownloadManagerActivity,
+                AnimeShowSpanSize.MAX_SPAN_SIZE
+            ).apply { spanSizeLookup = AnimeShowSpanSize(adapter) }
+            rvDownloadManagerActivity.addItemDecoration(AnimeShowItemDecoration())
             rvDownloadManagerActivity.adapter = adapter
         }
 

app/src/main/java/com/skyd/imomoe/view/activity/DownloadManagerActivity.kt

@@ -44,6 +44,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), EventBusSubscriber {
         val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
 
+        if (resources.getBoolean(R.bool.is_landscape)) {
+            mBinding.nvMainActivity.addFitsSystemWindows(top = true, bottom = true, left = true)
+        } else {
+            mBinding.nvMainActivity.addFitsSystemWindows(bottom = true, left = true)
+        }
+
         if (lastReadUserNoticeVersion() < Const.Common.USER_NOTICE_VERSION) {
             showMessageDialog(
                 title = getString(R.string.user_notice_update),
@@ -75,7 +81,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), EventBusSubscriber {
 
         mBinding.vp2MainActivity.also {
             it.adapter = adapter
-            it.fitsSystemWindows2()
             it.offscreenPageLimit = adapter.itemCount
             it.isUserInputEnabled = false
         }

app/src/main/java/com/skyd/imomoe/view/activity/MainActivity.kt

@@ -19,6 +19,7 @@ class AnimeShowSpanSize(val adapter: VarietyAdapter) : GridLayoutManager.SpanSiz
                 is AnimeDescribe1Bean,
                 is AnimeInfo1Bean,
                 is SearchHistory1Bean,
+                is AnimeDownload1Bean,
                 is HorizontalRecyclerView1Bean -> MAX_SPAN_SIZE
                 is AnimeEpisode1Bean,
                 is AnimeCover8Bean,
@@ -40,6 +41,7 @@ class AnimeShowSpanSize(val adapter: VarietyAdapter) : GridLayoutManager.SpanSiz
                 is AnimeCover5Bean,
                 is AnimeCover11Bean,
                 is SearchHistory1Bean,
+                is AnimeDownload1Bean,
                 is HorizontalRecyclerView1Bean -> MAX_SPAN_SIZE
                 is AnimeEpisode1Bean,
                 is AnimeCover8Bean,

app/src/main/java/com/skyd/imomoe/view/adapter/spansize/AnimeShowSpanSize.kt

@@ -4,8 +4,10 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
+import android.os.Bundle
 import android.os.IBinder
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -97,6 +99,11 @@ class DataSourceMarketFragment : BaseFragment<FragmentDataSourceMarketBinding>()
         )
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        mBinding.root.addFitsSystemWindows(right = true, bottom = true)
+    }
+
     override fun onResume() {
         super.onResume()
         if (isFirstLoadData) {
@@ -107,7 +114,6 @@ class DataSourceMarketFragment : BaseFragment<FragmentDataSourceMarketBinding>()
 
     private fun initData() {
         mBinding.apply {
-            root.addFitsSystemWindows(right = true, bottom = true)
             rvDataSourceMarketFragment.layoutManager = LinearLayoutManager(activity)
             rvDataSourceMarketFragment.adapter = adapter
 

app/src/main/java/com/skyd/imomoe/view/fragment/DataSourceMarketFragment.kt

@@ -9,6 +9,7 @@ import android.view.ViewStub
 import androidx.fragment.app.viewModels
 import com.google.android.material.tabs.TabLayoutMediator
 import com.skyd.imomoe.databinding.FragmentEverydayAnimeBinding
+import com.skyd.imomoe.ext.addFitsSystemWindows
 import com.skyd.imomoe.ext.collectWithLifecycle
 import com.skyd.imomoe.ext.hideToolbarWhenCollapsed
 import com.skyd.imomoe.state.DataState
@@ -62,6 +63,8 @@ class EverydayAnimeFragment : BaseFragment<FragmentEverydayAnimeBinding>(), Even
         super.onViewCreated(view, savedInstanceState)
 
         mBinding.run {
+            ablEverydayAnimeFragment.addFitsSystemWindows(right = true, top = true)
+            vp2EverydayAnimeFragment.addFitsSystemWindows(right = true)
             vp2EverydayAnimeFragment.offscreenPageLimit = offscreenPageLimit
             srlEverydayAnimeFragment.setOnRefreshListener { refresh() }