Refine code
This commit is contained in:
parent
e12cfb9617
commit
b9cd32c0fe
9 changed files with 4 additions and 28 deletions
|
|
@ -1,19 +1,13 @@
|
||||||
package cn.super12138.todo.views
|
package cn.super12138.todo.views
|
||||||
|
|
||||||
import android.graphics.Color
|
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.View
|
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
import androidx.activity.SystemBarStyle
|
|
||||||
import androidx.activity.enableEdgeToEdge
|
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.appcompat.app.AppCompatDelegate
|
import androidx.appcompat.app.AppCompatDelegate
|
||||||
import androidx.core.view.ViewCompat
|
|
||||||
import androidx.core.view.WindowCompat
|
import androidx.core.view.WindowCompat
|
||||||
import androidx.viewbinding.ViewBinding
|
import androidx.viewbinding.ViewBinding
|
||||||
import cn.super12138.todo.constant.GlobalValues
|
import cn.super12138.todo.constant.GlobalValues
|
||||||
import com.google.android.material.internal.EdgeToEdgeUtils
|
|
||||||
|
|
||||||
abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
|
abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
|
||||||
lateinit var binding: T
|
lateinit var binding: T
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.super12138.todo.views.todo
|
package cn.super12138.todo.views.todo
|
||||||
|
|
||||||
import android.view.HapticFeedbackConstants
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
|
@ -29,7 +28,6 @@ class ToDoAdapter(
|
||||||
val todoContext: TextView = view.findViewById(R.id.todo_content)
|
val todoContext: TextView = view.findViewById(R.id.todo_content)
|
||||||
val todoSubject: TextView = view.findViewById(R.id.todo_subject)
|
val todoSubject: TextView = view.findViewById(R.id.todo_subject)
|
||||||
val checkToDoBtn: Button = view.findViewById(R.id.check_item_btn)
|
val checkToDoBtn: Button = view.findViewById(R.id.check_item_btn)
|
||||||
// val delToDoBtn: Button = view.findViewById(R.id.delete_item_btn)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.super12138.todo.views.todo
|
package cn.super12138.todo.views.todo
|
||||||
|
|
||||||
import android.content.Intent
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
|
@ -20,7 +19,6 @@ import cn.super12138.todo.databinding.FragmentTodoBinding
|
||||||
import cn.super12138.todo.logic.Repository
|
import cn.super12138.todo.logic.Repository
|
||||||
import cn.super12138.todo.utils.VibrationUtils
|
import cn.super12138.todo.utils.VibrationUtils
|
||||||
import cn.super12138.todo.views.bottomsheet.ToDoBottomSheet
|
import cn.super12138.todo.views.bottomsheet.ToDoBottomSheet
|
||||||
import cn.super12138.todo.views.crash.CrashActivity
|
|
||||||
import cn.super12138.todo.views.progress.ProgressFragmentViewModel
|
import cn.super12138.todo.views.progress.ProgressFragmentViewModel
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:tint="#FFFFFF"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
|
|
||||||
|
|
||||||
</vector>
|
|
||||||
|
|
@ -20,9 +20,9 @@
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
android:id="@+id/todo_sheet_title"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/todo_sheet_title"
|
|
||||||
android:text="@string/add_task"
|
android:text="@string/add_task"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
|
|
||||||
|
|
@ -72,8 +72,8 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:visibility="gone"
|
android:textSize="12sp"
|
||||||
android:textSize="12sp" />
|
android:visibility="gone" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
<string name="delete_confirm">即将删除全部待办,是否继续?</string>
|
<string name="delete_confirm">即将删除全部待办,是否继续?</string>
|
||||||
<string name="tasks_textfield_hint">待办内容</string>
|
<string name="tasks_textfield_hint">待办内容</string>
|
||||||
<string name="delete_one">删除</string>
|
<string name="delete_one">删除</string>
|
||||||
<string name="delete_all">删除全部代办</string>
|
|
||||||
<string name="check_one">标记为已完成</string>
|
<string name="check_one">标记为已完成</string>
|
||||||
<string name="no_tasks">无待办事项</string>
|
<string name="no_tasks">无待办事项</string>
|
||||||
<!--<string name="delete_undo">撤销</string>-->
|
<!--<string name="delete_undo">撤销</string>-->
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
<string name="delete_confirm">Are you sure you want to delete all tasks?</string>
|
<string name="delete_confirm">Are you sure you want to delete all tasks?</string>
|
||||||
<string name="tasks_textfield_hint">Tasks</string>
|
<string name="tasks_textfield_hint">Tasks</string>
|
||||||
<string name="delete_one">Delete</string>
|
<string name="delete_one">Delete</string>
|
||||||
<string name="delete_all">Delete all tasks</string>
|
|
||||||
<string name="check_one">Checked this task</string>
|
<string name="check_one">Checked this task</string>
|
||||||
<string name="no_tasks">No tasks</string>
|
<string name="no_tasks">No tasks</string>
|
||||||
<!--<string name="delete_undo">Undo</string>-->
|
<!--<string name="delete_undo">Undo</string>-->
|
||||||
|
|
|
||||||
|
|
@ -51,8 +51,8 @@
|
||||||
app:summary="@string/view_all_tasks_summary"
|
app:summary="@string/view_all_tasks_summary"
|
||||||
app:title="@string/view_all_tasks_label" />
|
app:title="@string/view_all_tasks_label" />
|
||||||
<Preference
|
<Preference
|
||||||
app:key="about"
|
|
||||||
app:icon="@drawable/ic_about"
|
app:icon="@drawable/ic_about"
|
||||||
|
app:key="about"
|
||||||
app:title="@string/about_label" />
|
app:title="@string/about_label" />
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
Loading…
Reference in a new issue