archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow display of task's creation/modification/completion using a single row.

Browse Source
pull/1839/head
Yuri Dario 2 years ago
parent bb4ce22542
commit 7a17dc3719
7 changed files with 8 additions and 100 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.kt
Unescape Escape View File

@ -55,8 +55,6 @@ class TaskEditControlSetFragmentManager @Inject constructor(
ListFragment.TAG -> ListFragment()
SubtaskControlSet.TAG -> SubtaskControlSet()
CreationDateControlSet.TAG -> CreationDateControlSet()
CompletionDateControlSet.TAG -> CompletionDateControlSet()
ModificationDateControlSet.TAG -> ModificationDateControlSet()
else -> throw RuntimeException("Unsupported fragment")
}
@ -93,9 +91,7 @@ class TaskEditControlSetFragmentManager @Inject constructor(
R.id.row_11,
R.id.row_12,
R.id.row_13,
R.id.row_14,
R.id.row_15,
R.id.row_16
R.id.row_14
)
private val TASK_EDIT_CONTROL_SET_FRAGMENTS = intArrayOf(
DeadlineControlSet.TAG,
@ -110,8 +106,6 @@ class TaskEditControlSetFragmentManager @Inject constructor(
TagsControlSet.TAG,
RepeatControlSet.TAG,
CreationDateControlSet.TAG,
ModificationDateControlSet.TAG,
CompletionDateControlSet.TAG,
CommentBarFragment.TAG,
ListFragment.TAG,
SubtaskControlSet.TAG

38
app/src/main/java/org/tasks/ui/CompletionDateControlSet.kt
Unescape Escape View File

@ -1,38 +0,0 @@
package org.tasks.ui
import android.view.ViewGroup
import android.widget.TextView
import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R
import org.tasks.databinding.ControlSetDeadlineBinding
import org.tasks.locale.Locale
import org.tasks.preferences.Preferences
import java.text.SimpleDateFormat
import javax.inject.Inject
@AndroidEntryPoint
class CompletionDateControlSet : TaskEditControlFragment() {
@Inject lateinit var locale: Locale
@Inject lateinit var preferences: Preferences
private lateinit var date: TextView
override fun bind(parent: ViewGroup?) =
ControlSetDeadlineBinding.inflate(layoutInflater, parent, true).let {
var formatter: SimpleDateFormat = SimpleDateFormat( "yyyy-MM-dd HH:mm")
date = it.dueDate
if (viewModel.completionDate!! != 0L)
date.text = formatter.format( viewModel.completionDate!!);
else
date.text = " "
it.root
}
override val icon = R.drawable.ic_outline_schedule_24px
override fun controlId() = TAG
companion object {
const val TAG = R.string.TEA_ctrl_completion_date
}
}

8
app/src/main/java/org/tasks/ui/CreationDateControlSet.kt
Unescape Escape View File

@ -19,9 +19,13 @@ class CreationDateControlSet : TaskEditControlFragment() {
override fun bind(parent: ViewGroup?) =
ControlSetDeadlineBinding.inflate(layoutInflater, parent, true).let {
var formatter: SimpleDateFormat = SimpleDateFormat( "yyyy-MM-dd HH:mm")
val formatter: SimpleDateFormat = SimpleDateFormat( "yyyy-MM-dd HH:mm")
date = it.dueDate
date.text = formatter.format( viewModel.creationDate!!);
var dateRecords = context?.getString( R.string.sort_created_group, formatter.format( viewModel.creationDate!!)) + "\n" +
context?.getString( R.string.sort_modified_group, formatter.format( viewModel.modificationDate!!))
if (viewModel.completionDate!! != 0L)
dateRecords += "\n" + context?.getString( R.string.sort_completion_group, formatter.format( viewModel.completionDate!!))
date.text = dateRecords
it.root
}

35
app/src/main/java/org/tasks/ui/ModificationDateControlSet.kt
Unescape Escape View File

@ -1,35 +0,0 @@
package org.tasks.ui
import android.view.ViewGroup
import android.widget.TextView
import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R
import org.tasks.databinding.ControlSetDeadlineBinding
import org.tasks.locale.Locale
import org.tasks.preferences.Preferences
import java.text.SimpleDateFormat
import javax.inject.Inject
@AndroidEntryPoint
class ModificationDateControlSet : TaskEditControlFragment() {
@Inject lateinit var locale: Locale
@Inject lateinit var preferences: Preferences
private lateinit var date: TextView
override fun bind(parent: ViewGroup?) =
ControlSetDeadlineBinding.inflate(layoutInflater, parent, true).let {
var formatter: SimpleDateFormat = SimpleDateFormat( "yyyy-MM-dd HH:mm")
date = it.dueDate
date.text = formatter.format( viewModel.modificationDate!!);
it.root
}
override val icon = R.drawable.ic_outline_schedule_24px
override fun controlId() = TAG
companion object {
const val TAG = R.string.TEA_ctrl_modification_date
}
}

10
app/src/main/res/layout/fragment_task_edit.xml
Unescape Escape View File

@ -156,16 +156,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@+id/row_15"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@+id/row_16"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/comments"
android:layout_width="match_parent"

6
app/src/main/res/values/keys.xml
Unescape Escape View File

@ -249,8 +249,6 @@
<item>@string/TEA_control_gcal</item>
<item>@string/TEA_control_timer</item>
<item>@string/TEA_creation_date</item>
<item>@string/TEA_modification_date</item>
<item>@string/TEA_completion_date</item>
<item>@string/TEA_control_hidden_section</item>
</string-array>
@ -270,8 +268,6 @@
<string name="TEA_ctrl_gcal">TEA_ctrl_gcal</string>
<string name="TEA_ctrl_google_task_list">TEA_ctrl_gtask</string>
<string name="TEA_ctrl_creation_date">TEA_ctrl_creation_date</string>
<string name="TEA_ctrl_modification_date">TEA_ctrl_modification_date</string>
<string name="TEA_ctrl_completion_date">TEA_ctrl_completion_date</string>
<string name="p_show_hidden_tasks">show_hidden_tasks</string>
<string name="p_show_completed_tasks">show_completed_tasks</string>
<string name="p_reverse_sort">reverse_sort</string>
@ -294,8 +290,6 @@
<item>@string/TEA_ctrl_gcal</item>
<item>@string/TEA_ctrl_timer_pref</item>
<item>@string/TEA_ctrl_creation_date</item>
<item>@string/TEA_ctrl_modification_date</item>
<item>@string/TEA_ctrl_completion_date</item>
<item>@string/TEA_ctrl_hide_section_pref</item>
</string-array>

3
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -68,8 +68,6 @@ File %1$s contained %2$s.\n\n
<string name="TEA_control_timer">Timer Controls</string>
<string name="TEA_control_hidden_section">----Hide Always----</string>
<string name="TEA_creation_date">Creation date</string>
<string name="TEA_completion_date">Completion date</string>
<string name="TEA_modification_date">Modification date</string>
<string name="TEA_load_more">Load more…</string>
<string name="CRA_ignore">Ignore</string>
<string name="CRA_title">Need a meeting list?</string>
@ -623,6 +621,7 @@ File %1$s contained %2$s.\n\n
<string name="sort_due_group">Due %s</string>
<string name="sort_created_group">Created %s</string>
<string name="sort_modified_group">Modified %s</string>
<string name="sort_completion_group">Completion %s</string>
<string name="on_launch">On launch</string>
<string name="open_last_viewed_list">Open last viewed list</string>
<string name="local_lists">Local lists</string>

Write Preview
Loading…
Cancel
Save