@ -3,22 +3,49 @@ package org.tasks.tags
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android .widget.EditTex t
import android x.activity.compose.setConten t
import androidx.activity.viewModels
import androidx.core.widget.addTextChangedListener
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.material.TextField
import androidx.compose.material.TextFieldDefaults
import androidx.compose.material.TriStateCheckbox
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.state.ToggleableState
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewModelScope
import com.google.android.material.composethemeadapter.MdcTheme
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import org.tasks.R
import org.tasks.Strings.isNullOrEmpty
import org.tasks.Strings
import org.tasks.billing.Inventory
import org.tasks.data.TagData
import org.tasks.databinding.ActivityTagPickerBinding
import org.tasks.extensions.addBackPressedCallback
import org.tasks.injection.ThemedInjectingAppCompatActivity
import org.tasks.themes.ColorProvider
import org.tasks.themes.CustomIcons
import org.tasks.themes.Theme
import javax.inject.Inject
@ -28,81 +55,221 @@ class TagPickerActivity : ThemedInjectingAppCompatActivity() {
@Inject lateinit var inventory : Inventory
@Inject lateinit var colorProvider : ColorProvider
private val viewModel : TagPickerViewModel by viewModels ( )
private var taskIds : ArrayList < Long > ? = null
private lateinit var editText : EditText
override fun onCreate ( savedInstanceState : Bundle ? ) {
super . onCreate ( savedInstanceState )
val intent = intent
taskIds = intent . getSerializableExtra ( EXTRA _TASKS ) as ArrayList < Long > ?
if ( savedInstanceState == null ) {
intent . getParcelableArrayListExtra < TagData > ( EXTRA _SELECTED ) ?. let {
val selected = intent . getParcelableArrayListExtra < TagData > ( EXTRA _SELECTED )
if ( selected != null ) {
viewModel . setSelected (
it ,
intent . getParcelableArrayListExtra ( EXTRA _PARTIALLY _SELECTED )
selected , intent . getParcelableArrayListExtra < TagData > ( EXTRA _PARTIALLY _SELECTED )
)
}
}
val binding = ActivityTagPickerBinding . inflate ( layoutInflater )
editText = binding . searchInput . apply {
addTextChangedListener (
onTextChanged = { text , _ , _ , _ -> onSearch ( text ) }
)
}
setContentView ( binding . root )
val toolbar = binding . toolbar
toolbar . setNavigationIcon ( R . drawable . ic _outline _arrow _back _24px )
toolbar . setNavigationOnClickListener { onBackPressed ( ) }
val themeColor = theme . themeColor
themeColor . applyToNavigationBar ( this )
val recyclerAdapter = TagRecyclerAdapter ( this , viewModel , inventory , colorProvider ) { tagData , vh ->
onToggle ( tagData , vh )
}
val recyclerView = binding . recyclerView
recyclerView . adapter = recyclerAdapter
( recyclerView . itemAnimator as DefaultItemAnimator ? ) !! . supportsChangeAnimations = false
recyclerView . layoutManager = LinearLayoutManager ( this )
viewModel . observe ( this ) { recyclerAdapter . submitList ( it ) }
editText . setText ( viewModel . text )
addBackPressedCallback {
if ( isNullOrEmpty ( viewModel . text ) ) {
val data = Intent ( )
data . putExtra ( EXTRA _TASKS , taskIds )
data . putParcelableArrayListExtra (
EXTRA _PARTIALLY _SELECTED ,
viewModel . getPartiallySelected ( )
addBackPressedCallback { handleBackPressed ( ) }
viewModel . search ( " " )
setContent {
MdcTheme {
TagPicker (
viewModel ,
onBackClicked = { handleBackPressed ( ) } ,
getTagIcon = { tagData -> getIcon ( tagData ) } ,
getTagColor = { tagData -> getColor ( tagData ) }
)
data . putParcelableArrayListExtra ( EXTRA _SELECTED , viewModel . getSelected ( ) )
setResult ( Activity . RESULT _OK , data )
finish ( )
} else {
clear ( )
}
} /* setContent */
}
}
} /* onCreate */
private fun onToggle ( tagData : TagData , vh : TagPickerViewHolder ) = lifecycleScope . launch {
val newTag = tagData . id == null
val newState = viewModel . toggle ( tagData , vh . isChecked || newTag )
vh . updateCheckbox ( newState )
if ( newTag ) {
clear ( )
private fun handleBackPressed ( ) {
if ( Strings . isNullOrEmpty ( viewModel . searchText . value ) ) {
val data = Intent ( )
data . putExtra ( EXTRA _TASKS , taskIds )
data . putParcelableArrayListExtra ( EXTRA _PARTIALLY _SELECTED , viewModel . getPartiallySelected ( ) )
data . putParcelableArrayListExtra ( EXTRA _SELECTED , viewModel . getSelected ( ) )
setResult ( Activity . RESULT _OK , data )
finish ( )
} else {
viewModel . search ( " " )
}
}
} /* handleBackPressed */
private fun onSearch ( text : CharSequence ? ) {
viewModel . search ( text ?. toString ( ) ?: " " )
private fun getColor ( tagData : TagData ) : Color {
if ( tagData . getColor ( ) != 0 ) {
val themeColor = colorProvider . getThemeColor ( tagData . getColor ( ) !! , true )
if ( inventory . purchasedThemes ( ) || themeColor . isFree ) {
return Color ( themeColor . primaryColor )
}
}
return Color ( getColor ( R . color . icon _tint _with _alpha ) )
}
private fun clear ( ) {
editText . setText ( " " )
private fun getIcon ( tagData : TagData ) : Int
{
val iconIndex = tagData . getIcon ( )
var iconResource = R . drawable . ic _outline _label _24px
if ( ( iconIndex != null ) && ( iconIndex < 1000 || inventory . hasPro ) ) {
iconResource = CustomIcons . getIconResId ( iconIndex ) ?: R . drawable . ic _outline _label _24px
}
return iconResource
}
/* Copy of the TagPickerActivity's companion object */
companion object {
const val EXTRA _SELECTED = " extra_tags "
const val EXTRA _PARTIALLY _SELECTED = " extra_partial "
const val EXTRA _TASKS = " extra_tasks "
}
}
}
@Composable
internal fun TagPicker (
viewModel : TagPickerViewModel ,
onBackClicked : ( ) -> Unit ,
getTagIcon : ( TagData ) -> Int ,
getTagColor : ( TagData ) -> Color
) {
Box ( modifier = Modifier . fillMaxSize ( ) )
{
Column ( modifier = Modifier . padding ( horizontal = 12. dp ) ) {
Box ( modifier = Modifier . fillMaxWidth ( ) ) {
SearchBar ( viewModel , onBackClicked )
}
Box (
modifier = Modifier . weight ( 1f )
) {
PickerBox ( viewModel , viewModel . tagsList . observeAsState ( initial = emptyList ( ) ) , getTagIcon , getTagColor )
}
}
}
}
@Composable
internal fun SearchBar (
viewModel : TagPickerViewModel ,
onBack : ( ) -> Unit
) {
val searchPattern = remember { viewModel . searchText }
val invitation = LocalContext . current . getString ( R . string . enter _tag _name )
Row ( verticalAlignment = Alignment . CenterVertically ) {
Icon (
ImageVector . vectorResource ( id = R . drawable . ic _outline _arrow _back _24px ) ,
" Done " ,
modifier = Modifier
. padding ( 6. dp )
. clickable { onBack ( ) }
)
TextField (
value = searchPattern . value ,
onValueChange = { viewModel . search ( it ) } ,
placeholder = { Text ( invitation ) } ,
colors = TextFieldDefaults . textFieldColors (
textColor = MaterialTheme . colors . onBackground ,
backgroundColor = Color . Transparent ,
focusedIndicatorColor = Color . Transparent ,
unfocusedIndicatorColor = Color . Transparent
) ,
modifier = Modifier . padding ( start = 6. dp )
)
}
} /* SearchBar */
@Composable
internal fun PickerBox (
viewModel : TagPickerViewModel ,
tags : State < List < TagData > > ,
getTagIcon : ( TagData ) -> Int = { R . drawable . ic _outline _label _24px } ,
getTagColor : ( TagData ) -> Color = { Color . Gray }
) {
val onClick : ( TagData ) -> Unit = {
viewModel . viewModelScope . launch {
viewModel . toggle ( it , viewModel . getState ( it ) != ToggleableState . On ) }
}
val newItem : ( String ) -> Unit = {
viewModel . viewModelScope . launch { viewModel . createNew ( it ) ; viewModel . search ( " " ) }
}
LazyColumn {
if ( viewModel . tagToCreate . value != " " ) {
item ( key = - 1 ) {
val text = LocalContext . current . getString ( R . string . new _tag ) + " \" ${viewModel.tagToCreate.value} \" "
TagRow (
icon = ImageVector . vectorResource ( R . drawable . ic _outline _add _24px ) ,
iconColor = Color ( LocalContext . current . getColor ( R . color . icon _tint _with _alpha ) ) ,
text = text ,
onClick = { newItem ( viewModel . searchText . value ) }
)
}
}
items ( tags . value , key = { tag -> tag . id !! } )
{
val checked = remember { mutableStateOf ( viewModel . getState ( it ) ) }
val clickChecked : ( ) -> Unit = { onClick ( it ) ; checked . value = viewModel . getState ( it ) }
TagRow (
icon = ImageVector . vectorResource ( getTagIcon ( it ) ) ,
iconColor = getTagColor ( it ) ,
text = it . name !! ,
onClick = clickChecked
) {
TriStateCheckbox (
modifier = Modifier . padding ( 6. dp ) ,
state = checked . value ,
onClick = clickChecked
)
}
}
}
} /* PickerBox */
@Composable
internal fun TagRow (
icon : ImageVector ,
iconColor : Color ,
text : String ,
onClick : ( ) -> Unit ,
checkBox : @Composable RowScope . ( ) -> Unit = { }
) {
Row ( modifier = Modifier . fillMaxWidth ( ) . clickable { onClick ( ) } ,
verticalAlignment = Alignment . CenterVertically ,
) {
Icon (
imageVector = icon ,
contentDescription = " " ,
modifier = Modifier . padding ( 6. dp ) ,
tint = iconColor
)
Text (
text ,
modifier = Modifier . weight ( 1f ) . padding ( horizontal = 24. dp )
)
checkBox ( )
}
} /* TagRow */
/ *
internal fun genTestTags ( ) : List < TagData >
{
var idcc : Long = 1
return " alpha beta gamma delta kappa theta alfa1 beta1 gamma1 delta1 kappa1 theta1 "
. split ( " " )
. map { name -> TagData ( name ) . also { it . id = idcc ++ } }
}
@Composable
@Preview ( showBackground = true , backgroundColor = 0xffffff )
internal fun PickerBoxPreview ( ) {
val list = remember { mutableStateOf ( genTestTags ( ) ) }
PickerBox ( list , getTagColor = { Color . Green } )
}
* /
Alex Baker