From dde2eeddbaf07246da7c2c352e7d49ec63fddcd2 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 28 三月 2025 14:56:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/ui/reminder/ReminderSettingsFragment.kt | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/reminder/ReminderSettingsFragment.kt b/app/src/main/java/com/example/firstapp/ui/reminder/ReminderSettingsFragment.kt
index 5b26509..b0b459c 100644
--- a/app/src/main/java/com/example/firstapp/ui/reminder/ReminderSettingsFragment.kt
+++ b/app/src/main/java/com/example/firstapp/ui/reminder/ReminderSettingsFragment.kt
@@ -7,6 +7,7 @@
import android.view.ViewGroup
import android.widget.ArrayAdapter
import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
@@ -38,6 +39,8 @@
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
+ (activity as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
setupSpinner()
setupRecyclerView()
setupClickListeners()
@@ -45,7 +48,7 @@
}
private fun setupSpinner() {
- val types = arrayOf("驿站", "财务", "其他")
+ val types = arrayOf("快递", "还款", "其他")
val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, types)
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
binding.spinnerType.adapter = adapter
@@ -62,9 +65,9 @@
}
private fun setupClickListeners() {
- binding.btnClose.setOnClickListener {
- findNavController().navigateUp()
- }
+// binding.btnClose.setOnClickListener {
+// findNavController().navigateUp()
+// }
binding.btnAddReminder.setOnClickListener {
val type = binding.spinnerType.selectedItem.toString()
--
Gitblit v1.9.3