mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-07-22 03:01:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Tasks intro page: "I don't need tasks" checkbox not visible in landscape mode (#530)

Browse source 
* Added optional modifier

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

* Fixed model argument name

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

* Added bottom padding for bottom bar

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

---------

Signed-off-by: Arnau Mora <arnyminerz@proton.me>
This commit is contained in:
Arnau Mora 2024-01-16 14:11:39 -08:00 committed by GitHub
parent 2ac81b6342
commit 0c834a5c42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/at/bitfire/davdroid/ui/TasksActivity.kt
View file

@ -20,7 +20,7 @@ class TasksActivity: AppCompatActivity() {
setContent {
MdcTheme {
TasksCard(model)
TasksCard(model = model)
}
}
}

2
app/src/main/kotlin/at/bitfire/davdroid/ui/TasksFragment.kt
View file

@ -158,6 +158,7 @@ class TasksModel @Inject constructor(
@OptIn(ExperimentalTextApi::class)
@Composable
fun TasksCard(
modifier: Modifier = Modifier,
model: TasksModel = viewModel()
) {
val context = LocalContext.current
@ -200,6 +201,7 @@ fun TasksCard(
}
Scaffold(
modifier = modifier,
snackbarHost = { SnackbarHost(snackbarHostState) }
) { paddingValues ->
Column(

10
app/src/main/kotlin/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt
View file

@ -9,14 +9,18 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.padding
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.compose.ui.res.dimensionResource
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import at.bitfire.davdroid.resource.TaskUtils
import at.bitfire.davdroid.settings.SettingsManager
import at.bitfire.davdroid.ui.TasksCard
import at.bitfire.davdroid.ui.TasksModel
import com.github.appintro.R
import com.google.accompanist.themeadapter.material.MdcTheme
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject
@ -30,7 +34,11 @@ class TasksIntroFragment : Fragment() {
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
setContent {
MdcTheme {
TasksCard(model)
TasksCard(
modifier = Modifier
.padding(bottom = dimensionResource(R.dimen.appintro2_bottombar_height)),
model = model
)
}
}
}