Convert CreationDateControlSet to compose

pull/1931/head
Alex Baker 3 years ago
parent ef308d6c14
commit 9b3f5a0c65

@ -1,33 +1,44 @@
package org.tasks.ui package org.tasks.ui
import android.view.ViewGroup import androidx.compose.foundation.layout.Column
import android.widget.TextView import androidx.compose.foundation.layout.padding
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import org.tasks.R import org.tasks.R
import org.tasks.databinding.ControlSetCreationDateBinding
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
import javax.inject.Inject import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
class CreationDateControlSet : TaskEditControlFragment() { class CreationDateControlSet : TaskEditControlComposeFragment() {
@Inject lateinit var locale: Locale @Inject lateinit var locale: Locale
@Inject lateinit var preferences: Preferences
private lateinit var date: TextView @Composable
override fun Body() {
override fun bind(parent: ViewGroup?) = Column(modifier = Modifier.padding(vertical = 20.dp)) {
ControlSetCreationDateBinding.inflate(layoutInflater, parent, true).let { val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm", locale)
val formatter = SimpleDateFormat( "yyyy-MM-dd HH:mm", locale) viewModel.creationDate?.let {
date = it.creationDate Text(
var dateRecords = context?.getString( R.string.sort_created_group, formatter.format( viewModel.creationDate!!)) + "\n" + text = stringResource(id = R.string.sort_created_group, formatter.format(it))
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!!)) viewModel.modificationDate?.let {
date.text = dateRecords Text(
it.root text = stringResource(id = R.string.sort_modified_group, formatter.format(it))
)
}
viewModel.completionDate?.takeIf { it > 0 }?.let {
Text(
text = stringResource(id = R.string.sort_completion_group, formatter.format(it))
)
}
} }
}
override val icon = R.drawable.ic_outline_info_24px override val icon = R.drawable.ic_outline_info_24px

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/creation_date"
style="@style/TaskEditTextPrimary"
android:hint="@string/no_due_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="viewStart" />
Loading…
Cancel
Save