Просмотр исходного кода

更新界面
增加搜索进度
增加初次使用引导界面

HapeLee 1 год назад
Родитель
Сommit
9819a14dbb

+ 6 - 0
app/src/main/java/io/legato/kazusa/ui/welcome/WebDavFragment.kt

@@ -43,6 +43,12 @@ class WebDavFragment : BaseFragment(R.layout.fragment_webdav_auth) {
     private var restoreJob: Job? = null
     private var restoreJob: Job? = null
     private val waitDialog by lazy { WaitDialog(requireContext()) }
     private val waitDialog by lazy { WaitDialog(requireContext()) }
 
 
+    interface WebDavActions {
+        fun onSaveWebDavConfig()
+    }
+
+    var listener: WebDavActions? = null
+
     private val restoreDoc = registerForActivityResult(HandleFileContract()) {
     private val restoreDoc = registerForActivityResult(HandleFileContract()) {
         it.uri?.let { uri ->
         it.uri?.let { uri ->
             waitDialog.setText("恢复中…")
             waitDialog.setText("恢复中…")

+ 13 - 1
app/src/main/java/io/legato/kazusa/ui/welcome/WelcomeActivity.kt

@@ -17,6 +17,8 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>() {
 
 
     override val binding by viewBinding(ActivityWelcomeBinding::inflate)
     override val binding by viewBinding(ActivityWelcomeBinding::inflate)
 
 
+    private val webDavFragment: WebDavFragment
+        get() = pages[1] as WebDavFragment
     private val pages = listOf(
     private val pages = listOf(
         PrivacyFragment(),
         PrivacyFragment(),
         WebDavFragment(),
         WebDavFragment(),
@@ -69,6 +71,13 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>() {
         // 初始化按钮文字
         // 初始化按钮文字
         binding.btnNext.text = "阅读并同意"
         binding.btnNext.text = "阅读并同意"
 
 
+        (webDavFragment).listener = object : WebDavFragment.WebDavActions {
+            override fun onSaveWebDavConfig() {
+                webDavFragment.saveWebDavConfig()
+            }
+        }
+
+
         binding.btnNext.setOnClickListener {
         binding.btnNext.setOnClickListener {
             val current = binding.viewPager.currentItem
             val current = binding.viewPager.currentItem
             when (current) {
             when (current) {
@@ -82,7 +91,10 @@ class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>() {
                     finishSetup()
                     finishSetup()
                 }
                 }
 
 
-                else -> binding.viewPager.currentItem = current + 1
+                else -> {
+                    webDavFragment.listener?.onSaveWebDavConfig()
+                    binding.viewPager.currentItem = current + 1
+                }
             }
             }
         }
         }
     }
     }