diff --git a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt index 9bcc138..98e1b14 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt @@ -1,13 +1,16 @@ package cn.super12138.todo.views +import android.graphics.Color import android.os.Build import android.os.Bundle import android.view.WindowManager +import androidx.activity.SystemBarStyle import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.viewbinding.ViewBinding import cn.super12138.todo.constant.GlobalValues +import com.google.android.material.internal.EdgeToEdgeUtils abstract class BaseActivity : AppCompatActivity() { lateinit var binding: T @@ -15,7 +18,7 @@ abstract class BaseActivity : AppCompatActivity() { /*if (GlobalValues.springFestivalTheme) { setTheme(R.style.Theme_SpringFestival) }*/ - enableEdgeToEdge() + enableEdgeToEdge(navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)) super.onCreate(savedInstanceState) binding = getViewBinding() setContentView(binding.root) diff --git a/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt b/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt index 2eb7e7f..46b6237 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt @@ -18,16 +18,6 @@ class CrashActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - ViewCompat.setOnApplyWindowInsetsListener(binding.exitApp) { view, windowInsets -> - val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) - view.updateLayoutParams { - leftMargin = if (insets.left == 0) 16 else insets.left - bottomMargin = if (insets.bottom == 0) 48 else insets.bottom + 32 - rightMargin = if (insets.right == 0) 48 else insets.right + 32 - } - WindowInsetsCompat.CONSUMED - } - val crashLogs = intent.getStringExtra("crash_logs") val deviceBrand = Build.BRAND diff --git a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt index 3d086f1..3fc4b87 100644 --- a/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt +++ b/app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt @@ -1,9 +1,13 @@ package cn.super12138.todo.views.todo +import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.updateLayoutParams import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.lifecycle.Observer @@ -16,6 +20,7 @@ import cn.super12138.todo.databinding.FragmentTodoBinding import cn.super12138.todo.logic.Repository import cn.super12138.todo.utils.VibrationUtils import cn.super12138.todo.views.bottomsheet.ToDoBottomSheet +import cn.super12138.todo.views.crash.CrashActivity import cn.super12138.todo.views.progress.ProgressFragmentViewModel import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.launch @@ -38,16 +43,15 @@ class ToDoFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - /*ViewCompat.setOnApplyWindowInsetsListener(binding.addItem) { view, windowInsets -> + ViewCompat.setOnApplyWindowInsetsListener(binding.addItem) { v, windowInsets -> val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) - view.updateLayoutParams { + v.updateLayoutParams { leftMargin = if (insets.left == 0) 16 else insets.left bottomMargin = if (insets.bottom == 0) 48 else insets.bottom + 32 rightMargin = if (insets.right == 0) 48 else insets.right + 32 } WindowInsetsCompat.CONSUMED - }*/ - + } val todoList = todoViewModel.todoList val layoutManager = LinearLayoutManager(ToDoApp.context) @@ -69,6 +73,8 @@ class ToDoFragment : Fragment() { val toDoBottomSheet = ToDoBottomSheet() toDoBottomSheet.show(parentFragmentManager, ToDoBottomSheet.TAG) + + startActivity(Intent(ToDoApp.context, CrashActivity::class.java)) } binding.addItem.setOnLongClickListener { diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml new file mode 100644 index 0000000..d24e796 --- /dev/null +++ b/app/src/main/res/values-v29/themes.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file