Search IME issues

tamaskozmer · tamaskozmer · commit d3ad24a67e27 · 2026-03-13T19:23:17.000+01:00
Assignment detials unnecessary paddings for discussions in Teacher
diff --git a/apps/student/src/main/java/com/instructure/student/features/discussion/list/DiscussionListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/discussion/list/DiscussionListFragment.kt
@@ -53,7 +53,7 @@ import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
 import com.instructure.pandautils.utils.applyBottomAndRightSystemBarMargin
-import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.collectOneOffEvents
@@ -251,7 +251,8 @@ open class DiscussionListFragment : ParentFragment(), Bookmarkable {
         with(binding) {
             setupToolbarMenu(discussionListToolbar)
             discussionListToolbar.applyTopSystemBarInsets()
-            swipeRefreshLayout.applyBottomSystemBarInsets()
+            swipeRefreshLayout.applyImeAndSystemBarInsets()
+            discussionRecyclerView.clipToPadding = false
             discussionListToolbar.title = title()
             discussionListToolbar.setupAsBackButton(this@DiscussionListFragment)
             val searchHint =
diff --git a/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt b/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt
@@ -99,9 +99,11 @@ class FileSearchFragment : ParentFragment(), FileSearchView {
         searchHeader.applyTopSystemBarInsets()
         ViewCompat.setOnApplyWindowInsetsListener(fileSearchRecyclerView) { view, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            view.updatePadding(bottom = systemBars.bottom)
+            val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+            view.updatePadding(bottom = maxOf(systemBars.bottom, ime.bottom))
             insets
         }
+        fileSearchRecyclerView.clipToPadding = false
         if (fileSearchRecyclerView.isAttachedToWindow) {
             ViewCompat.requestApplyInsets(fileSearchRecyclerView)
         }
diff --git a/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt
@@ -39,7 +39,7 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
-import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.isTablet
@@ -135,7 +135,8 @@ class PageListFragment : ParentFragment(), Bookmarkable {
         recyclerAdapter?.let {
             configureRecyclerView(rootView!!, requireContext(), it, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView)
         }
-        recyclerBinding.swipeRefreshLayout.applyBottomSystemBarInsets()
+        recyclerBinding.swipeRefreshLayout.applyImeAndSystemBarInsets()
+        recyclerBinding.listView.clipToPadding = false
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
diff --git a/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListFragment.kt
@@ -41,7 +41,7 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
-import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.isTablet
@@ -101,7 +101,8 @@ class QuizListFragment : ParentFragment(), Bookmarkable {
             R.id.emptyView,
             R.id.listView
         )
-        recyclerBinding.swipeRefreshLayout.applyBottomSystemBarInsets()
+        recyclerBinding.swipeRefreshLayout.applyImeAndSystemBarInsets()
+        recyclerBinding.listView.clipToPadding = false
     }
 
     override fun applyTheme() {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/details/AssignmentDetailsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/details/AssignmentDetailsFragment.kt
@@ -191,7 +191,6 @@ class AssignmentDetailsFragment : BasePresenterFragment<
 
     private fun setupViews(assignment: Assignment) = with(binding) {
         if (!isInModulesPager) {
-            swipeRefreshLayout.applyBottomSystemBarMargin()
             viewDiscussionButton.applyBottomSystemBarMargin()
         }
 
@@ -389,6 +388,7 @@ class AssignmentDetailsFragment : BasePresenterFragment<
             viewDiscussionButton.setTextColor(ThemePrefs.buttonTextColor)
             viewDiscussionButton.setVisible()
         } else {
+            swipeRefreshLayout.applyBottomSystemBarMargin()
             viewDiscussionButton.setGone()
         }
     }
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/files/search/FileSearchFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/files/search/FileSearchFragment.kt
@@ -120,9 +120,11 @@ class FileSearchFragment : BaseSyncFragment<
         searchHeader.applyTopSystemBarInsets()
         ViewCompat.setOnApplyWindowInsetsListener(fileSearchRecyclerView) { view, insets ->
             val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            view.updatePadding(bottom = systemBars.bottom)
+            val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+            view.updatePadding(bottom = maxOf(systemBars.bottom, ime.bottom))
             insets
         }
+        fileSearchRecyclerView.clipToPadding = false
         if (fileSearchRecyclerView.isAttachedToWindow) {
             ViewCompat.requestApplyInsets(fileSearchRecyclerView)
         }
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt
@@ -43,7 +43,7 @@ import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
 import com.instructure.pandautils.utils.applyBottomAndRightSystemBarMargin
-import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.applyDisplayCutoutInsets
 import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
@@ -229,7 +229,8 @@ open class DiscussionsListFragment : BaseExpandableSyncFragment<
 
     private fun setupToolbar() = with(binding) {
         discussionListToolbar.applyTopSystemBarInsets()
-        swipeRefreshLayout.applyBottomSystemBarInsets()
+        swipeRefreshLayout.applyImeAndSystemBarInsets()
+        discussionRecyclerView.clipToPadding = false
         discussionListToolbar.title = if(isAnnouncements) getString(R.string.tab_announcements) else getString(R.string.tab_discussions)
         discussionListToolbar.subtitle = canvasContext.name
         discussionListToolbar.setupBackButton(this@DiscussionsListFragment)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageListFragment.kt
@@ -36,7 +36,7 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
-import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.applyBottomSystemBarMargin
 import com.instructure.pandautils.utils.applyDisplayCutoutInsets
 import com.instructure.pandautils.utils.applyTopSystemBarInsets
@@ -198,7 +198,7 @@ class PageListFragment : BaseSyncFragment<Page, PageListPresenter, PageListView,
     }
 
     private fun setupViews() = with(binding) {
-        pageRecyclerView.applyBottomSystemBarInsets()
+        pageRecyclerView.applyImeAndSystemBarInsets()
         pageRecyclerView.clipToPadding = false
 
         createNewPage.setGone()
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/PeopleListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/PeopleListFragment.kt
@@ -36,7 +36,7 @@ import com.instructure.pandautils.fragments.BaseSyncFragment
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.applyDisplayCutoutInsets
 import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
@@ -118,7 +118,8 @@ class PeopleListFragment : BaseSyncFragment<User, PeopleListPresenter, PeopleLis
     private fun setupViews() = with(binding) {
         val canvasContext = nonNullArgs.getParcelable<CanvasContext>(Const.CANVAS_CONTEXT)
         peopleListToolbar.applyTopSystemBarInsets()
-        swipeRefreshLayoutContainerBinding.swipeRefreshLayout.applyBottomSystemBarInsets()
+        swipeRefreshLayoutContainerBinding.swipeRefreshLayout.applyImeAndSystemBarInsets()
+        swipeRefreshLayoutContainerBinding.recyclerView.clipToPadding = false
         peopleListToolbar.setTitle(R.string.tab_people)
         peopleListToolbar.subtitle = canvasContext!!.name
         if (peopleListToolbar.menu.size() == 0) peopleListToolbar.inflateMenu(R.menu.menu_people_list)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizListFragment.kt
@@ -34,7 +34,7 @@ import com.instructure.pandautils.fragments.BaseExpandableSyncFragment
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
-import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.applyDisplayCutoutInsets
 import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
@@ -170,7 +170,8 @@ class QuizListFragment : BaseExpandableSyncFragment<
 
     private fun setupToolbar() = with(binding) {
         quizListToolbar.applyTopSystemBarInsets()
-        swipeRefreshLayout.applyBottomSystemBarInsets()
+        swipeRefreshLayout.applyImeAndSystemBarInsets()
+        quizRecyclerView.clipToPadding = false
         quizListToolbar.title = getString(R.string.tab_quizzes)
         quizListToolbar.subtitle = canvasContext.name
         quizListToolbar.setupBackButton(this@QuizListFragment)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasScaffold.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasScaffold.kt
@@ -19,8 +19,10 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.union
 import androidx.compose.material.DrawerDefaults
 import androidx.compose.material.FabPosition
 import androidx.compose.material.MaterialTheme
@@ -68,7 +70,7 @@ fun CanvasScaffold(
     drawerScrimColor: Color = DrawerDefaults.scrimColor,
     backgroundColor: Color = MaterialTheme.colors.background,
     contentColor: Color = contentColorFor(backgroundColor),
-    contentWindowInsets: WindowInsets = WindowInsets.navigationBars.only(WindowInsetsSides.Bottom),
+    contentWindowInsets: WindowInsets = WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).union(WindowInsets.ime),
     content: @Composable (PaddingValues) -> Unit
 ) {
     Scaffold(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/edit/EditDashboardFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/edit/EditDashboardFragment.kt
@@ -37,7 +37,7 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
-import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import dagger.hilt.android.AndroidEntryPoint
@@ -74,7 +74,8 @@ class EditDashboardFragment : BaseCanvasFragment() {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
         binding.toolbar.applyTopSystemBarInsets()
-        binding.swipeRefreshLayout.applyBottomSystemBarInsets()
+        binding.swipeRefreshLayout.applyImeAndSystemBarInsets()
+        binding.recyclerView.clipToPadding = false
     }
 
     override fun onHiddenChanged(hidden: Boolean) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/customize/CustomizeCourseScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/customize/CustomizeCourseScreen.kt
@@ -22,16 +22,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-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.height
-import androidx.compose.foundation.layout.ime
-import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
@@ -128,7 +122,6 @@ fun CustomizeCourseScreenContent(
     }
 
     CanvasScaffold(
-        contentWindowInsets = WindowInsets.ime.union(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom)),
         backgroundColor = colorResource(id = R.color.backgroundLightest)
     ) { padding ->
         Box(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/InboxComposeScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/InboxComposeScreen.kt
@@ -28,18 +28,12 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.ime
-import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.ClickableText
@@ -117,7 +111,6 @@ fun InboxComposeScreen(
     CanvasTheme {
         CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
-            contentWindowInsets = WindowInsets.ime.union(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom)),
             topBar = {
                 CanvasAppBar(
                     title = title,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/comments/commentlibrary/SpeedGraderCommentLibraryScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/comments/commentlibrary/SpeedGraderCommentLibraryScreen.kt
@@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -106,7 +107,7 @@ private fun SpeedGraderCommentLibraryScreen(
 ) {
     Scaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
-        contentWindowInsets = WindowInsets(0, 0, 0, 0),
+        contentWindowInsets = WindowInsets.ime,
         topBar = {
             CanvasThemedAppBar(
                 title = stringResource(id = R.string.toolbarCommentLibrary),
@@ -150,7 +151,7 @@ private fun SpeedGraderCommentLibraryContent(
         } else {
             LazyColumn(
                 contentPadding = PaddingValues(horizontal = 16.dp),
-                modifier = modifier
+                modifier = Modifier
                     .weight(1f)
                     .fillMaxWidth()
                     .testTag("commentLibraryListColumn"),

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,11 @@ class FileSearchFragment : ParentFragment(), FileSearchView {`
`99`	`99`	`searchHeader.applyTopSystemBarInsets()`
`100`	`100`	`ViewCompat.setOnApplyWindowInsetsListener(fileSearchRecyclerView) { view, insets ->`
`101`	`101`	`val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())`
`102`		`- view.updatePadding(bottom = systemBars.bottom)`
	`102`	`+ val ime = insets.getInsets(WindowInsetsCompat.Type.ime())`
	`103`	`+ view.updatePadding(bottom = maxOf(systemBars.bottom, ime.bottom))`
`103`	`104`	`insets`
`104`	`105`	`}`
	`106`	`+ fileSearchRecyclerView.clipToPadding = false`
`105`	`107`	`if (fileSearchRecyclerView.isAttachedToWindow) {`
`106`	`108`	`ViewCompat.requestApplyInsets(fileSearchRecyclerView)`
`107`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,6 @@ class AssignmentDetailsFragment : BasePresenterFragment<`
`191`	`191`
`192`	`192`	`private fun setupViews(assignment: Assignment) = with(binding) {`
`193`	`193`	`if (!isInModulesPager) {`
`194`		`- swipeRefreshLayout.applyBottomSystemBarMargin()`
`195`	`194`	`viewDiscussionButton.applyBottomSystemBarMargin()`
`196`	`195`	`}`
`197`	`196`
`@@ -389,6 +388,7 @@ class AssignmentDetailsFragment : BasePresenterFragment<`
`389`	`388`	`viewDiscussionButton.setTextColor(ThemePrefs.buttonTextColor)`
`390`	`389`	`viewDiscussionButton.setVisible()`
`391`	`390`	`} else {`
	`391`	`+ swipeRefreshLayout.applyBottomSystemBarMargin()`
`392`	`392`	`viewDiscussionButton.setGone()`
`393`	`393`	`}`
`394`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,11 @@ class FileSearchFragment : BaseSyncFragment<`
`120`	`120`	`searchHeader.applyTopSystemBarInsets()`
`121`	`121`	`ViewCompat.setOnApplyWindowInsetsListener(fileSearchRecyclerView) { view, insets ->`
`122`	`122`	`val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())`
`123`		`- view.updatePadding(bottom = systemBars.bottom)`
	`123`	`+ val ime = insets.getInsets(WindowInsetsCompat.Type.ime())`
	`124`	`+ view.updatePadding(bottom = maxOf(systemBars.bottom, ime.bottom))`
`124`	`125`	`insets`
`125`	`126`	`}`
	`127`	`+ fileSearchRecyclerView.clipToPadding = false`
`126`	`128`	`if (fileSearchRecyclerView.isAttachedToWindow) {`
`127`	`129`	`ViewCompat.requestApplyInsets(fileSearchRecyclerView)`
`128`	`130`	`}`