mirror of
https://github.com/bitfireAT/davx5-ose
synced 2024-10-15 15:59:18 +00:00
Tasks intro page: "I don't need tasks" checkbox not visible in landscape mode (#530)
* 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:
parent
2ac81b6342
commit
0c834a5c42
|
@ -20,7 +20,7 @@ class TasksActivity: AppCompatActivity() {
|
|||
|
||||
setContent {
|
||||
MdcTheme {
|
||||
TasksCard(model)
|
||||
TasksCard(model = model)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -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
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue