mirror of https://github.com/tasks/tasks
Added TaskEditScreen - WIP
Alex Baker
1 year ago
parent
833eb81114
commit
95ae988fd7
@ -0,0 +1,141 @@
|
||||
package org.tasks.compose.edit
|
||||
|
||||
import android.content.res.Configuration.UI_MODE_NIGHT_YES
|
||||
import androidx.compose.animation.ExperimentalAnimationApi
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
|
||||
import androidx.compose.material.icons.outlined.Clear
|
||||
import androidx.compose.material.icons.outlined.Delete
|
||||
import androidx.compose.material.icons.outlined.Save
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.viewinterop.AndroidViewBinding
|
||||
import com.todoroo.astrid.activity.TaskEditFragment.Companion.gesturesDisabled
|
||||
import org.tasks.R
|
||||
import org.tasks.compose.BeastModeBanner
|
||||
import org.tasks.data.entity.UserActivity
|
||||
import org.tasks.databinding.TaskEditCommentBarBinding
|
||||
import org.tasks.extensions.Context.findActivity
|
||||
import org.tasks.files.FileHelper
|
||||
import org.tasks.themes.TasksTheme
|
||||
import org.tasks.ui.TaskEditViewModel
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
|
||||
@Composable
|
||||
fun TaskEditScreen(
|
||||
viewState: TaskEditViewModel.ViewState,
|
||||
comments: List<UserActivity>,
|
||||
save: () -> Unit,
|
||||
discard: () -> Unit,
|
||||
onBackPressed: () -> Unit,
|
||||
delete: () -> Unit,
|
||||
openBeastModeSettings: () -> Unit,
|
||||
dismissBeastMode: () -> Unit,
|
||||
deleteComment: (UserActivity) -> Unit,
|
||||
content: @Composable (Int) -> Unit,
|
||||
) {
|
||||
Scaffold(
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
navigationIcon = {
|
||||
if (viewState.isReadOnly) {
|
||||
IconButton(onClick = { onBackPressed() }) {
|
||||
Icon(
|
||||
imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
|
||||
contentDescription = stringResource(R.string.back)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
IconButton(onClick = { save() }) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Save,
|
||||
contentDescription = stringResource(R.string.save)
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
title = {},
|
||||
actions = {
|
||||
if (viewState.isReadOnly) {
|
||||
return@TopAppBar
|
||||
}
|
||||
if (!viewState.isNew) {
|
||||
IconButton(onClick = { delete() }) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Delete,
|
||||
contentDescription = stringResource(R.string.delete_task),
|
||||
)
|
||||
}
|
||||
}
|
||||
if (viewState.backButtonSavesTask) {
|
||||
IconButton(onClick = { discard() }) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Clear,
|
||||
contentDescription = stringResource(R.string.menu_discard_changes),
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
)
|
||||
},
|
||||
bottomBar = {
|
||||
if (viewState.showComments && !viewState.isReadOnly) {
|
||||
AndroidViewBinding(TaskEditCommentBarBinding::inflate)
|
||||
}
|
||||
},
|
||||
) { paddingValues ->
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.gesturesDisabled(viewState.isReadOnly)
|
||||
.padding(paddingValues)
|
||||
.fillMaxSize()
|
||||
.verticalScroll(rememberScrollState()),
|
||||
) {
|
||||
viewState.displayOrder.forEach { tag ->
|
||||
content(tag)
|
||||
HorizontalDivider()
|
||||
}
|
||||
if (viewState.showComments) {
|
||||
val context = LocalContext.current
|
||||
CommentsRow(
|
||||
comments = comments,
|
||||
deleteComment = deleteComment,
|
||||
openImage = {
|
||||
val activity = context.findActivity() ?: return@CommentsRow
|
||||
FileHelper.startActionView(activity, it)
|
||||
}
|
||||
)
|
||||
}
|
||||
BeastModeBanner(
|
||||
visible = viewState.showBeastModeHint,
|
||||
showSettings = openBeastModeSettings,
|
||||
dismiss = dismissBeastMode,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(showBackground = true)
|
||||
@Preview(showBackground = true, uiMode = UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun TaskEditScreenPreview() {
|
||||
TasksTheme {
|
||||
// TaskEditScreen(
|
||||
//
|
||||
// )
|
||||
}
|
||||
}
|
||||
@ -1,67 +0,0 @@
|
||||
package org.tasks.fragments
|
||||
|
||||
import android.content.Context
|
||||
import com.todoroo.astrid.activity.BeastModePreferences
|
||||
import com.todoroo.astrid.files.FilesControlSet
|
||||
import com.todoroo.astrid.repeats.RepeatControlSet
|
||||
import com.todoroo.astrid.tags.TagsControlSet
|
||||
import com.todoroo.astrid.timers.TimerControlSet
|
||||
import com.todoroo.astrid.ui.ReminderControlSet
|
||||
import com.todoroo.astrid.ui.StartDateControlSet
|
||||
import dagger.hilt.android.qualifiers.ActivityContext
|
||||
import org.tasks.R
|
||||
import org.tasks.preferences.Preferences
|
||||
import org.tasks.ui.CalendarControlSet
|
||||
import org.tasks.ui.LocationControlSet
|
||||
import org.tasks.ui.SubtaskControlSet
|
||||
import javax.inject.Inject
|
||||
|
||||
class TaskEditControlSetFragmentManager @Inject constructor(
|
||||
@ActivityContext context: Context,
|
||||
preferences: Preferences?
|
||||
) {
|
||||
val controlSetFragments: MutableMap<String, Int> = LinkedHashMap()
|
||||
val displayOrder: List<String>
|
||||
var visibleSize = 0
|
||||
|
||||
init {
|
||||
displayOrder = BeastModePreferences.constructOrderedControlList(preferences, context)
|
||||
val hideAlwaysTrigger = context.getString(R.string.TEA_ctrl_hide_section_pref)
|
||||
visibleSize = 0
|
||||
while (visibleSize < displayOrder.size) {
|
||||
if (displayOrder[visibleSize] == hideAlwaysTrigger) {
|
||||
displayOrder.removeAt(visibleSize)
|
||||
break
|
||||
}
|
||||
visibleSize++
|
||||
}
|
||||
for (resId in TASK_EDIT_CONTROL_SET_FRAGMENTS) {
|
||||
controlSetFragments[context.getString(resId)] = resId
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
val TAG_DESCRIPTION = R.string.TEA_ctrl_notes_pref
|
||||
val TAG_CREATION = R.string.TEA_ctrl_creation_date
|
||||
val TAG_LIST = R.string.TEA_ctrl_google_task_list
|
||||
val TAG_PRIORITY = R.string.TEA_ctrl_importance_pref
|
||||
val TAG_DUE_DATE = R.string.TEA_ctrl_when_pref
|
||||
|
||||
private val TASK_EDIT_CONTROL_SET_FRAGMENTS = intArrayOf(
|
||||
TAG_DUE_DATE,
|
||||
TimerControlSet.TAG,
|
||||
TAG_DESCRIPTION,
|
||||
CalendarControlSet.TAG,
|
||||
TAG_PRIORITY,
|
||||
StartDateControlSet.TAG,
|
||||
ReminderControlSet.TAG,
|
||||
LocationControlSet.TAG,
|
||||
FilesControlSet.TAG,
|
||||
TagsControlSet.TAG,
|
||||
RepeatControlSet.TAG,
|
||||
TAG_CREATION,
|
||||
TAG_LIST,
|
||||
SubtaskControlSet.TAG
|
||||
)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue