|
|
@ -1,5 +1,6 @@
|
|
|
|
package org.tasks.compose
|
|
|
|
package org.tasks.compose
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import android.content.res.Configuration
|
|
|
|
import androidx.compose.animation.AnimatedVisibility
|
|
|
|
import androidx.compose.animation.AnimatedVisibility
|
|
|
|
import androidx.compose.animation.ExperimentalAnimationApi
|
|
|
|
import androidx.compose.animation.ExperimentalAnimationApi
|
|
|
|
import androidx.compose.animation.expandVertically
|
|
|
|
import androidx.compose.animation.expandVertically
|
|
|
@ -16,51 +17,60 @@ import androidx.compose.material.MaterialTheme
|
|
|
|
import androidx.compose.material.Text
|
|
|
|
import androidx.compose.material.Text
|
|
|
|
import androidx.compose.material.TextButton
|
|
|
|
import androidx.compose.material.TextButton
|
|
|
|
import androidx.compose.runtime.Composable
|
|
|
|
import androidx.compose.runtime.Composable
|
|
|
|
import androidx.compose.runtime.LaunchedEffect
|
|
|
|
|
|
|
|
import androidx.compose.runtime.MutableState
|
|
|
|
|
|
|
|
import androidx.compose.runtime.getValue
|
|
|
|
|
|
|
|
import androidx.compose.runtime.mutableStateOf
|
|
|
|
|
|
|
|
import androidx.compose.runtime.saveable.rememberSaveable
|
|
|
|
|
|
|
|
import androidx.compose.runtime.setValue
|
|
|
|
|
|
|
|
import androidx.compose.ui.Alignment
|
|
|
|
import androidx.compose.ui.Alignment
|
|
|
|
import androidx.compose.ui.Modifier
|
|
|
|
import androidx.compose.ui.Modifier
|
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
|
|
|
|
|
import androidx.compose.ui.tooling.preview.Preview
|
|
|
|
import androidx.compose.ui.unit.dp
|
|
|
|
import androidx.compose.ui.unit.dp
|
|
|
|
import kotlinx.coroutines.delay
|
|
|
|
import com.google.android.material.composethemeadapter.MdcTheme
|
|
|
|
import org.tasks.R
|
|
|
|
import org.tasks.R
|
|
|
|
import org.tasks.Tasks.Companion.IS_GENERIC
|
|
|
|
import org.tasks.Tasks
|
|
|
|
|
|
|
|
|
|
|
|
@ExperimentalAnimationApi
|
|
|
|
@ExperimentalAnimationApi
|
|
|
|
@Composable
|
|
|
|
@Composable
|
|
|
|
fun AnimatedBanner(
|
|
|
|
fun AnimatedBanner(
|
|
|
|
isVisible: MutableState<Boolean>,
|
|
|
|
visible: Boolean,
|
|
|
|
dismiss: () -> Unit,
|
|
|
|
content: @Composable () -> Unit,
|
|
|
|
subscribe: () -> Unit,
|
|
|
|
buttons: @Composable () -> Unit,
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
var show by rememberSaveable { mutableStateOf(false) }
|
|
|
|
|
|
|
|
if (isVisible.value) {
|
|
|
|
|
|
|
|
LaunchedEffect(key1 = isVisible, block = {
|
|
|
|
|
|
|
|
delay(500)
|
|
|
|
|
|
|
|
show = true
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
show = false
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
AnimatedVisibility(
|
|
|
|
AnimatedVisibility(
|
|
|
|
visible = show,
|
|
|
|
visible = visible,
|
|
|
|
enter = expandVertically(
|
|
|
|
enter = expandVertically(),
|
|
|
|
expandFrom = Alignment.Top
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
exit = shrinkVertically(),
|
|
|
|
exit = shrinkVertically(),
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
Column(
|
|
|
|
Column(
|
|
|
|
modifier = Modifier
|
|
|
|
modifier = Modifier
|
|
|
|
.fillMaxWidth(),
|
|
|
|
.fillMaxWidth(),
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
|
|
|
|
Divider()
|
|
|
|
Spacer(modifier = Modifier.height(16.dp))
|
|
|
|
Spacer(modifier = Modifier.height(16.dp))
|
|
|
|
|
|
|
|
content()
|
|
|
|
|
|
|
|
Row(
|
|
|
|
|
|
|
|
modifier = Modifier
|
|
|
|
|
|
|
|
.padding(vertical = 8.dp, horizontal = 16.dp)
|
|
|
|
|
|
|
|
.align(Alignment.End),
|
|
|
|
|
|
|
|
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
buttons()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Divider()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ExperimentalAnimationApi
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
|
|
|
fun SubscriptionNagBanner(
|
|
|
|
|
|
|
|
visible: Boolean,
|
|
|
|
|
|
|
|
subscribe: () -> Unit,
|
|
|
|
|
|
|
|
dismiss: () -> Unit,
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
AnimatedBanner(
|
|
|
|
|
|
|
|
visible = visible,
|
|
|
|
|
|
|
|
content = {
|
|
|
|
Text(
|
|
|
|
Text(
|
|
|
|
text = stringResource(
|
|
|
|
text = stringResource(
|
|
|
|
id = if (IS_GENERIC) {
|
|
|
|
id = if (Tasks.IS_GENERIC) {
|
|
|
|
R.string.enjoying_tasks
|
|
|
|
R.string.enjoying_tasks
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
R.string.tasks_needs_your_support
|
|
|
|
R.string.tasks_needs_your_support
|
|
|
@ -72,7 +82,7 @@ fun AnimatedBanner(
|
|
|
|
Spacer(modifier = Modifier.height(4.dp))
|
|
|
|
Spacer(modifier = Modifier.height(4.dp))
|
|
|
|
Text(
|
|
|
|
Text(
|
|
|
|
text = stringResource(
|
|
|
|
text = stringResource(
|
|
|
|
id = if (IS_GENERIC) {
|
|
|
|
id = if (Tasks.IS_GENERIC) {
|
|
|
|
R.string.tasks_needs_your_support
|
|
|
|
R.string.tasks_needs_your_support
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
R.string.support_development_subscribe
|
|
|
|
R.string.support_development_subscribe
|
|
|
@ -81,28 +91,69 @@ fun AnimatedBanner(
|
|
|
|
style = MaterialTheme.typography.body2,
|
|
|
|
style = MaterialTheme.typography.body2,
|
|
|
|
modifier = Modifier.padding(horizontal = 16.dp),
|
|
|
|
modifier = Modifier.padding(horizontal = 16.dp),
|
|
|
|
)
|
|
|
|
)
|
|
|
|
Row(
|
|
|
|
},
|
|
|
|
modifier = Modifier
|
|
|
|
buttons = {
|
|
|
|
.padding(vertical = 8.dp, horizontal = 16.dp)
|
|
|
|
TextButton(onClick = subscribe) {
|
|
|
|
.align(Alignment.End),
|
|
|
|
Text(text = stringResource(id = R.string.dismiss))
|
|
|
|
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
|
|
|
}
|
|
|
|
) {
|
|
|
|
TextButton(onClick = dismiss) {
|
|
|
|
TextButton(onClick = dismiss) {
|
|
|
|
val res = if (Tasks.IS_GENERIC) {
|
|
|
|
Text(text = stringResource(id = R.string.dismiss))
|
|
|
|
R.string.TLA_menu_donate
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
TextButton(onClick = subscribe) {
|
|
|
|
R.string.button_subscribe
|
|
|
|
Text(
|
|
|
|
|
|
|
|
text = stringResource(
|
|
|
|
|
|
|
|
id = if (IS_GENERIC) {
|
|
|
|
|
|
|
|
R.string.TLA_menu_donate
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
R.string.button_subscribe
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Text(text = stringResource(id = res))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Divider()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ExperimentalAnimationApi
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
|
|
|
fun BeastModeBanner(
|
|
|
|
|
|
|
|
visible: Boolean,
|
|
|
|
|
|
|
|
showSettings: () -> Unit,
|
|
|
|
|
|
|
|
dismiss: () -> Unit,
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
AnimatedBanner(
|
|
|
|
|
|
|
|
visible = visible,
|
|
|
|
|
|
|
|
content = {
|
|
|
|
|
|
|
|
Text(
|
|
|
|
|
|
|
|
text = stringResource(id = R.string.hint_customize_edit_title),
|
|
|
|
|
|
|
|
style = MaterialTheme.typography.body1,
|
|
|
|
|
|
|
|
modifier = Modifier.padding(horizontal = 16.dp),
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
Spacer(modifier = Modifier.height(4.dp))
|
|
|
|
|
|
|
|
Text(
|
|
|
|
|
|
|
|
text = stringResource(id = R.string.hint_customize_edit_body),
|
|
|
|
|
|
|
|
style = MaterialTheme.typography.body2,
|
|
|
|
|
|
|
|
modifier = Modifier.padding(horizontal = 16.dp),
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
buttons = {
|
|
|
|
|
|
|
|
TextButton(onClick = dismiss) {
|
|
|
|
|
|
|
|
Text(text = stringResource(id = R.string.dismiss))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
TextButton(onClick = showSettings) {
|
|
|
|
|
|
|
|
Text(text = stringResource(id = R.string.TLA_menu_settings))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ExperimentalAnimationApi
|
|
|
|
|
|
|
|
@Preview(showBackground = true)
|
|
|
|
|
|
|
|
@Preview(showBackground = true, backgroundColor = 0x202124, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
|
|
|
private fun BeastModePreview() = MdcTheme {
|
|
|
|
|
|
|
|
BeastModeBanner(visible = true, showSettings = {}, dismiss = {})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ExperimentalAnimationApi
|
|
|
|
|
|
|
|
@Preview(showBackground = true)
|
|
|
|
|
|
|
|
@Preview(showBackground = true, backgroundColor = 0x202124, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
|
|
|
|
|
|
|
@Composable
|
|
|
|
|
|
|
|
private fun SubscriptionNagPreview() = MdcTheme {
|
|
|
|
|
|
|
|
SubscriptionNagBanner(visible = true, subscribe = {}, dismiss = {})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|