From 1ea252cccbd3cfd5c02a99b91b9775a04d782eee Mon Sep 17 00:00:00 2001 From: mcbabo Date: Fri, 19 Sep 2025 18:15:29 +0200 Subject: [PATCH 1/2] Add camera padding if screen is landscape --- .../bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt | 5 +++++ .../bitfire/icsdroid/ui/screen/EditSubscriptionScreen.kt | 6 ++++++ .../at/bitfire/icsdroid/ui/screen/SubscriptionsScreen.kt | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt b/app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt index e0f90e3a..a9a7c3e6 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt @@ -17,10 +17,15 @@ import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawing +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.PagerState import androidx.compose.foundation.pager.rememberPagerState diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/screen/EditSubscriptionScreen.kt b/app/src/main/java/at/bitfire/icsdroid/ui/screen/EditSubscriptionScreen.kt index 297c8ad8..e6552b28 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/screen/EditSubscriptionScreen.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/screen/EditSubscriptionScreen.kt @@ -8,9 +8,14 @@ import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawing +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons @@ -150,6 +155,7 @@ fun EditSubscriptionScreen( .verticalScroll(rememberScrollState()) .padding(paddingValues) .padding(16.dp) + .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)) .imePadding() ) { SubscriptionSettingsComposable( diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/screen/SubscriptionsScreen.kt b/app/src/main/java/at/bitfire/icsdroid/ui/screen/SubscriptionsScreen.kt index 47542518..a44afc40 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/screen/SubscriptionsScreen.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/screen/SubscriptionsScreen.kt @@ -11,9 +11,14 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawing +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons @@ -242,7 +247,8 @@ private fun CalendarListContent( PullToRefreshBox( modifier = Modifier - .padding(paddingValues), + .padding(paddingValues) + .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)), state = pullRefreshState, isRefreshing = isRefreshing, onRefresh = onRefreshRequested From 3ef5ceb6805c9a58072830e9d5d39a3dc9b32e3e Mon Sep 17 00:00:00 2001 From: mcbabo Date: Fri, 19 Sep 2025 18:19:01 +0200 Subject: [PATCH 2/2] added missing inset --- .../java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt b/app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt index a9a7c3e6..f7a36f3c 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/screen/AddSubscriptionScreen.kt @@ -299,6 +299,7 @@ fun AddSubscriptionScreen( modifier = Modifier .fillMaxSize() .padding(paddingValues) + .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)) ) { page -> when (page) { 0 -> EnterUrlComposable(