fix:更新中文资源声明；更新gitignore；升级插件，处理 warning

.gitignore

@@ -9,3 +9,57 @@
 .cxx
 .buildSrc/build/
 .buildSrc/.gradle/
+
+# 生成的文件
+bin/
+gen/
+out/
+
+# Gradle文件
+.gradle/
+build/
+*/build/
+gradlew
+gradlew.bat
+gradle/wrapper/gradle-wrapper.jar
+
+# 本地配置文件
+local.properties
+*.log
+
+# Android Studio导航编辑器临时文件
+.navigation/
+
+# Android Studio捕获的文件
+captures/
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore文件
+*.jks
+*.keystore
+
+# Google服务配置
+google-services.json
+
+# Proguard
+proguard/
+
+# 日志文件
+*.log
+
+# 备份文件
+*~
+*.bak
+
+# Android Profiling
+*.hprof
+
+# 其他临时文件
+*.tmp
+*.temp

app/build.gradle.kts

@@ -39,7 +39,7 @@ android {
         // resConfigs("en", "zh", "zh-rCN")
         androidResources {
             // 声明应用支持的语言区域（BCP 47 格式）
-            localeFilters.addAll(listOf("en", "zh", "zh-CN"))
+            localeFilters.addAll(listOf("en", "zh", "zh-rCN"))
         }
 
         ndk {

app/src/main/java/com/yechaoa/wanandroid_jetpack/base/BaseVmActivity.kt

@@ -31,7 +31,7 @@ abstract class BaseVmActivity<VB : ViewBinding, VM : BaseViewModel>(inflate: (La
      * 初始化ViewModel
      */
     private fun initViewModel() {
-        mViewModel = ViewModelProvider(this).get(viewModelClass())
+        mViewModel = ViewModelProvider(this)[viewModelClass()]
     }
 
     /**
@@ -44,12 +44,12 @@ abstract class BaseVmActivity<VB : ViewBinding, VM : BaseViewModel>(inflate: (La
      */
     open fun observe() {
         // 需要登录，跳转登录页
-        mViewModel.needLogin.observe(this, {
+        mViewModel.needLogin.observe(this) {
             if (it) {
                 SpUtil.setBoolean(MyConfig.IS_LOGIN, false)
                 startActivity(Intent(this, LoginActivity::class.java))
             }
-        })
+        }
     }
 
     /**

app/src/main/java/com/yechaoa/wanandroid_jetpack/base/BaseVmFragment.kt

@@ -42,7 +42,7 @@ abstract class BaseVmFragment<VB : ViewBinding, VM : BaseViewModel>(inflate: (La
      * 初始化ViewModel
      */
     private fun initViewModel() {
-        mViewModel = ViewModelProvider(this).get(viewModelClass())
+        mViewModel = ViewModelProvider(this)[viewModelClass()]
     }
 
     /**
@@ -55,12 +55,12 @@ abstract class BaseVmFragment<VB : ViewBinding, VM : BaseViewModel>(inflate: (La
      */
     open fun observe() {
         // 需要登录，跳转登录页
-        mViewModel.needLogin.observe(viewLifecycleOwner, {
+        mViewModel.needLogin.observe(viewLifecycleOwner) {
             if (it) {
                 SpUtil.setBoolean(MyConfig.IS_LOGIN, false)
                 startActivity(Intent(requireActivity(), LoginActivity::class.java))
             }
-        })
+        }
     }
 
     /**

app/src/main/java/com/yechaoa/wanandroid_jetpack/ui/collect/CollectActivity.kt

@@ -96,7 +96,7 @@ class CollectActivity : BaseVmActivity<ActivityCollectBinding, CollectViewModel>
                 ToastUtil.show("取消成功")
                 mCollectAdapter.data.removeAt(mPosition)
                 mCollectAdapter.notifyItemRemoved(mPosition)
-                if (mCollectAdapter.data.size == 0) {
+                if (mCollectAdapter.data.isEmpty()) {
                     mCollectAdapter.setEmptyView(R.layout.layout_empty_view)
                 }
             }

app/src/main/java/com/yechaoa/wanandroid_jetpack/ui/detail/DetailActivity.kt

@@ -2,7 +2,6 @@ package com.yechaoa.wanandroid_jetpack.ui.detail
 
 import android.annotation.SuppressLint
 import android.graphics.Bitmap
-import android.graphics.Color
 import android.os.Build
 import android.text.Html
 import android.view.Gravity
@@ -13,6 +12,7 @@ import android.widget.FrameLayout
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.RequiresApi
+import androidx.core.graphics.toColorInt
 import com.just.agentweb.AgentWeb
 import com.just.agentweb.WebViewClient
 import com.yechaoa.wanandroid_jetpack.base.BaseActivity
@@ -75,8 +75,8 @@ class DetailActivity : BaseActivity<ActivityDetailBinding>(ActivityDetailBinding
         val mTextView = TextView(frameLayout.context)
         mTextView.text = title
         mTextView.textSize = 16f
-        mTextView.setTextColor(Color.parseColor("#727779"))
-        frameLayout.setBackgroundColor(Color.parseColor("#272b2d"))
+        mTextView.setTextColor("#727779".toColorInt())
+        frameLayout.setBackgroundColor("#272b2d".toColorInt())
         val mFlp = FrameLayout.LayoutParams(-2, -2)
         mFlp.gravity = Gravity.CENTER_HORIZONTAL
         val scale: Float = frameLayout.context.resources.displayMetrics.density

app/src/main/java/com/yechaoa/wanandroid_jetpack/ui/login/LoginActivity.kt

@@ -21,7 +21,6 @@ import com.yechaoa.yutilskt.ActivityUtil
 import com.yechaoa.yutilskt.SpUtil
 import com.yechaoa.yutilskt.ToastUtil
 import com.yechaoa.yutilskt.YUtils
-import java.util.*
 
 class LoginActivity : BaseVmActivity<ActivityLoginBinding, LoginViewModel>(ActivityLoginBinding::inflate) {
 
@@ -138,7 +137,9 @@ class LoginActivity : BaseVmActivity<ActivityLoginBinding, LoginViewModel>(Activ
         return spanBuilder
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onBackPressed() {
+        super.onBackPressed()
         ActivityUtil.closeAllActivity()
     }
 

app/src/main/java/com/yechaoa/wanandroid_jetpack/ui/main/MainActivity.kt

@@ -24,6 +24,9 @@ import com.yechaoa.yutilskt.ActivityUtil
 import com.yechaoa.yutilskt.ShareUtil
 import com.yechaoa.yutilskt.SpUtil
 import com.yechaoa.yutilskt.ToastUtil
+import androidx.core.view.get
+import androidx.activity.OnBackPressedCallback
+
 
 class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::inflate) {
 
@@ -41,6 +44,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
         initActionBarDrawer()
 
         initFragments()
+
+        setupBackPressedCallback()
     }
 
     /**
@@ -125,36 +130,38 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
 
             override fun onPageSelected(position: Int) {
-                mAppBarMainBinding.contentMain.bottomNavigation.menu.getItem(position).isChecked = true
-                when (position) {
-                    0 -> mAppBarMainBinding.toolbar.title = resources.getString(R.string.title_home)
-                    1 -> mAppBarMainBinding.toolbar.title = resources.getString(R.string.title_tree)
-                    2 -> mAppBarMainBinding.toolbar.title = resources.getString(R.string.title_navi)
-                    else -> mAppBarMainBinding.toolbar.title = resources.getString(R.string.title_project)
-                }
+                mAppBarMainBinding.contentMain.bottomNavigation.menu[position].isChecked = true
+                mAppBarMainBinding.toolbar.title = resources.getString(
+                    when (position) {
+                        MainTab.HOME.position -> MainTab.HOME.titleResId
+                        MainTab.TREE.position -> MainTab.TREE.titleResId
+                        MainTab.NAVI.position -> MainTab.NAVI.titleResId
+                        else -> MainTab.PROJECT.titleResId
+                    }
+                )
             }
         })
 
         /**
          * bottom_navigation 点击事件
          */
-        mAppBarMainBinding.contentMain.bottomNavigation.setOnNavigationItemSelectedListener {
+        mAppBarMainBinding.contentMain.bottomNavigation.setOnItemSelectedListener {
             when (it.itemId) {
                 R.id.navigation_home -> {
-                    mAppBarMainBinding.contentMain.viewPager.currentItem = 0
-                    return@setOnNavigationItemSelectedListener true
+                    mAppBarMainBinding.contentMain.viewPager.currentItem = MainTab.HOME.position
+                    return@setOnItemSelectedListener true
                 }
                 R.id.navigation_tree -> {
-                    mAppBarMainBinding.contentMain.viewPager.currentItem = 1
-                    return@setOnNavigationItemSelectedListener true
+                    mAppBarMainBinding.contentMain.viewPager.currentItem = MainTab.TREE.position
+                    return@setOnItemSelectedListener true
                 }
                 R.id.navigation_navi -> {
-                    mAppBarMainBinding.contentMain.viewPager.currentItem = 2
-                    return@setOnNavigationItemSelectedListener true
+                    mAppBarMainBinding.contentMain.viewPager.currentItem = MainTab.NAVI.position
+                    return@setOnItemSelectedListener true
                 }
                 R.id.navigation_project -> {
-                    mAppBarMainBinding.contentMain.viewPager.currentItem = 3
-                    return@setOnNavigationItemSelectedListener true
+                    mAppBarMainBinding.contentMain.viewPager.currentItem = MainTab.PROJECT.position
+                    return@setOnItemSelectedListener true
                 }
             }
             false
@@ -181,16 +188,34 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
     /**
      * 拦截返回事件，自处理
      */
-    override fun onBackPressed() {
-        if (mBinding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            mBinding.drawerLayout.closeDrawer(GravityCompat.START)
-        } else {
-            if ((System.currentTimeMillis() - mExitTime) > 2000) {
-                ToastUtil.show("再按一次退出" + resources.getString(R.string.wanandroid))
-                mExitTime = System.currentTimeMillis()
-            } else {
-                ActivityUtil.closeAllActivity()
+    private fun setupBackPressedCallback() {
+        val callback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (mBinding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+                    mBinding.drawerLayout.closeDrawer(GravityCompat.START)
+                } else {
+                    if ((System.currentTimeMillis() - mExitTime) > 2000) {
+                        ToastUtil.show("再按一次退出" + resources.getString(R.string.wanandroid))
+                        mExitTime = System.currentTimeMillis()
+                    } else {
+                        ActivityUtil.closeAllActivity()
+                    }
+                }
             }
         }
+        onBackPressedDispatcher.addCallback(this, callback)
+    }
+
+    @Suppress("OVERRIDE_DEPRECATION")
+    override fun onBackPressed() {
+        super.onBackPressed()
     }
-}
+}
+
+//底部导航栏
+enum class MainTab(val position: Int, val titleResId: Int) {
+    HOME(0, R.string.title_home),
+    TREE(1, R.string.title_tree),
+    NAVI(2, R.string.title_navi),
+    PROJECT(3, R.string.title_project)
+}

app/src/main/java/com/yechaoa/wanandroid_jetpack/ui/main/home/HomeFragment.kt

@@ -9,8 +9,8 @@ import com.yechaoa.wanandroid_jetpack.ui.detail.DetailActivity
 import com.yechaoa.yutilskt.DisplayUtil
 import com.yechaoa.yutilskt.ToastUtil
 import com.youth.banner.indicator.CircleIndicator
-import com.youth.banner.transformer.*
-import java.util.*
+import com.youth.banner.transformer.AlphaPageTransformer
+import com.youth.banner.transformer.ScaleInTransformer
 import kotlin.math.roundToInt
 
 class HomeFragment : BaseVmFragment<FragmentHomeBinding, HomeViewModel>(FragmentHomeBinding::inflate) {
@@ -70,7 +70,7 @@ class HomeFragment : BaseVmFragment<FragmentHomeBinding, HomeViewModel>(Fragment
 
     override fun observe() {
         super.observe()
-        mViewModel.bannerList.observe(this, { bannerList ->
+        mViewModel.bannerList.observe(this) { bannerList ->
             //动态设置高度
             val layoutParams = mBinding.banner.layoutParams
             layoutParams.height = (DisplayUtil.getScreenWidth() / 1.99).roundToInt()
@@ -92,33 +92,33 @@ class HomeFragment : BaseVmFragment<FragmentHomeBinding, HomeViewModel>(Fragment
                 }
                 startActivity(intent)
             }
-        })
+        }
 
-        mViewModel.articleList.observe(this, {
+        mViewModel.articleList.observe(this) {
             mCurrentSize = it.size
             if (0 == mCurrentPage) {
                 mArticleAdapter.setList(it)
             } else {
                 mArticleAdapter.addData(it)
                 mArticleAdapter.loadMoreModule.loadMoreComplete()
             }
-        })
+        }
 
-        mViewModel.collectState.observe(this, {
+        mViewModel.collectState.observe(this) {
             if (it) {
                 ToastUtil.show("收藏成功")
                 mArticleAdapter.data[mPosition].collect = true
                 mArticleAdapter.notifyItemChanged(mPosition)
             }
-        })
+        }
 
-        mViewModel.unCollectState.observe(this, {
+        mViewModel.unCollectState.observe(this) {
             if (it) {
                 ToastUtil.show("取消成功")
                 mArticleAdapter.data[mPosition].collect = false
                 mArticleAdapter.notifyItemChanged(mPosition)
             }
-        })
+        }
     }
 
 }

app/src/main/java/com/yechaoa/wanandroid_jetpack/ui/main/navi/NaviFragment.kt

@@ -1,10 +1,10 @@
 package com.yechaoa.wanandroid_jetpack.ui.main.navi
 
 import android.content.Intent
-import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.TextView
+import androidx.core.graphics.toColorInt
 import com.yechaoa.wanandroid_jetpack.R
 import com.yechaoa.wanandroid_jetpack.base.BaseVmFragment
 import com.yechaoa.wanandroid_jetpack.data.bean.Article
@@ -40,7 +40,7 @@ class NaviFragment : BaseVmFragment<FragmentNaviBinding, NaviViewModel>(Fragment
 
     override fun observe() {
         super.observe()
-        mViewModel.naviList.observe(this, {
+        mViewModel.naviList.observe(this) {
             mNaviList = it
             mTabAdapter = MyTabAdapter(mNaviList)
             mBinding.verticalTabLayout.setTabAdapter(mTabAdapter)
@@ -49,7 +49,7 @@ class NaviFragment : BaseVmFragment<FragmentNaviBinding, NaviViewModel>(Fragment
              */
             mArticles = mNaviList[0].articles
             setFlowLayout(mArticles)
-        })
+        }
     }
 
     /**
@@ -108,7 +108,7 @@ class NaviFragment : BaseVmFragment<FragmentNaviBinding, NaviViewModel>(Fragment
         override fun getTitle(position: Int): ITabView.TabTitle {
             return ITabView.TabTitle.Builder()
                 .setContent(naviList[position].name)
-                .setTextColor(Color.parseColor("#FF9800"), Color.parseColor("#757575"))
+                .setTextColor("#FF9800".toColorInt(), "#757575".toColorInt())
                 .setTextSize(16)
                 .build()
         }