danvics/VerveDo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify code

Browse source
This commit is contained in:
Super12138 2024-01-06 08:50:09 +08:00
parent 60b23f1cf4
commit 2289d89d4f
6 changed files with 34 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/kotlin/cn/super12138/todo/views/BaseActivity.kt Normal file
View file

@ -0,0 +1,20 @@
package cn.super12138.todo.views
import android.os.Build
import android.os.Bundle
import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
open class BaseActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
// enableEdgeToEdge()
super.onCreate(savedInstanceState)
// 适配刘海屏
val lp = window.attributes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
lp.layoutInDisplayCutoutMode =
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
}
window.attributes = lp
}
}

14
app/src/main/kotlin/cn/super12138/todo/views/about/AboutActivity.kt
View file

@ -4,27 +4,17 @@ import android.content.Intent
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.view.WindowManager
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import cn.super12138.todo.constant.Constants
import cn.super12138.todo.databinding.ActivityAboutBinding
import cn.super12138.todo.views.BaseActivity
import showToast
class AboutActivity : AppCompatActivity() {
class AboutActivity : BaseActivity() {
private lateinit var binding: ActivityAboutBinding
private var clickCount = 0
override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
// 适配刘海屏
val lp = window.attributes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
lp.layoutInDisplayCutoutMode =
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
}
window.attributes = lp
binding = ActivityAboutBinding.inflate(layoutInflater)
setContentView(binding.root)

14
app/src/main/kotlin/cn/super12138/todo/views/crash/CrashActivity.kt
View file

@ -1,31 +1,21 @@
package cn.super12138.todo.views.crash
import android.os.Build
import android.os.Bundle
import android.view.ViewGroup
import android.view.WindowManager
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updateLayoutParams
import cn.super12138.todo.databinding.ActivityCrashBinding
import cn.super12138.todo.views.BaseActivity
class CrashActivity : AppCompatActivity() {
class CrashActivity : BaseActivity() {
private lateinit var binding: ActivityCrashBinding
override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
// 适配刘海屏
val lp = window.attributes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
lp.layoutInDisplayCutoutMode =
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
}
window.attributes = lp
binding = ActivityCrashBinding.inflate(layoutInflater)
setContentView(binding.root)

15
app/src/main/kotlin/cn/super12138/todo/views/main/MainActivity.kt
View file

@ -1,33 +1,22 @@
package cn.super12138.todo.views.main
// 2023.11.18立项
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.view.WindowManager
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import cn.super12138.todo.R
import cn.super12138.todo.ToDoApplication
import cn.super12138.todo.databinding.ActivityMainBinding
import cn.super12138.todo.logic.Repository
import cn.super12138.todo.views.BaseActivity
import cn.super12138.todo.views.settings.SettingsActivity
class MainActivity : AppCompatActivity() {
class MainActivity : BaseActivity() {
private lateinit var binding: ActivityMainBinding
override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
// 适配刘海屏
val lp = window.attributes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
lp.layoutInDisplayCutoutMode =
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
}
window.attributes = lp
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)

15
app/src/main/kotlin/cn/super12138/todo/views/settings/SettingsActivity.kt
View file

@ -1,27 +1,19 @@
package cn.super12138.todo.views.settings
import android.os.Build
import android.os.Bundle
import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.app.AppCompatDelegate
import androidx.preference.ListPreference
import androidx.preference.PreferenceFragmentCompat
import cn.super12138.todo.R
import cn.super12138.todo.databinding.ActivitySettingsBinding
import cn.super12138.todo.views.BaseActivity
class SettingsActivity : AppCompatActivity() {
class SettingsActivity : BaseActivity() {
private lateinit var binding: ActivitySettingsBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// 适配刘海屏
val lp = window.attributes
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
lp.layoutInDisplayCutoutMode =
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
}
window.attributes = lp
binding = ActivitySettingsBinding.inflate(layoutInflater)
setContentView(binding.root)
@ -39,7 +31,6 @@ class SettingsActivity : AppCompatActivity() {
}
}
class SettingsFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.preferences, rootKey)

11
app/src/main/kotlin/cn/super12138/todo/views/todo/ToDoFragment.kt
View file

@ -43,14 +43,13 @@ class ToDoFragment : Fragment() {
todoList.add(ToDo(todo.uuid, todo.context, todo.subject))
}
/*ViewCompat.setOnApplyWindowInsetsListener(binding.todoList) { view, windowInsets ->
/*ViewCompat.setOnApplyWindowInsetsListener(binding.addItem) { view, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
leftMargin = insets.left
bottomMargin = insets.bottom
rightMargin = insets.right
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
}*/
@ -64,10 +63,10 @@ class ToDoFragment : Fragment() {
val todoViewModel =
ViewModelProvider(requireActivity()).get(ToDoFragmentViewModel::class.java)
if (todoList.size == 0) {
todoViewModel.emptyTipVis.value = View.VISIBLE
}
binding.addItem.setOnClickListener {
ToDoDialogBinding = DialogAddTodoBinding.inflate(layoutInflater)