Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Adaptive apps codelab preparation #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 11, 2025
Merged

Adaptive apps codelab preparation #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1af2e2c
Remove Adaptive Layouts
sashalukin Jun 10, 2025
27949ce
Remove Drag and drop support
sashalukin Jun 10, 2025
37fcf3a
Remove sending message with the "Enter" key
sashalukin Jun 10, 2025
08bc1be
Remove context menu on media files
sashalukin Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions app/src/main/java/com/google/android/samples/socialite/ui/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Text
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
Expand Down Expand Up @@ -120,7 +118,6 @@ fun MainNavigation(
NavDisplay(
backStack = backStack,
onBack = { repeat(it) { backStack.removeLastOrNull() } },
sceneStrategy = rememberListDetailSceneStrategy(),
entryDecorators = listOf(
sharedEntryInSceneNavEntryDecorator,
rememberSceneSetupNavEntryDecorator(),
Expand All @@ -139,7 +136,6 @@ fun MainNavigation(

is Pane.ChatsList -> NavEntry(
key = backStackKey,
metadata = ListDetailSceneStrategy.listPane(),
) {
ChatList(
onOpenChatRequest = { request ->
Expand All @@ -157,7 +153,6 @@ fun MainNavigation(

is Pane.ChatThread -> NavEntry(
key = backStackKey,
metadata = ListDetailSceneStrategy.detailPane(),
) {
ChatScreen(
chatId = backStackKey.chatId,
Expand Down
8 changes: 1 addition & 7 deletions app/src/main/java/com/google/android/samples/socialite/ui/chat/ChatScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ import com.google.android.samples.socialite.model.Contact
import com.google.android.samples.socialite.ui.SocialTheme
import com.google.android.samples.socialite.ui.chat.component.InputBar
import com.google.android.samples.socialite.ui.chat.component.MessageBubble
import com.google.android.samples.socialite.ui.chat.component.mediaItemDropTarget
import com.google.android.samples.socialite.ui.chat.component.scrollWithKeyboards
import com.google.android.samples.socialite.ui.components.tryRequestFocus
import com.google.android.samples.socialite.ui.rememberIconPainter

Expand Down Expand Up @@ -185,10 +183,6 @@ private fun ChatContent(
Scaffold(
modifier = modifier
.nestedScroll(scrollBehavior.nestedScrollConnection)
.scrollWithKeyboards(
scrollState = scrollState,
coroutineScope = rememberCoroutineScope(),
)
.focusProperties {
onEnter = {
focusRequester.tryRequestFocus().onFailure { }
Expand All @@ -204,7 +198,7 @@ private fun ChatContent(
},
) { innerPadding ->
Column(
modifier = Modifier.mediaItemDropTarget(onMediaItemAttached = onMediaItemAttached),
// TODO: Add drag and drop support
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The mediaItemDropTarget functionality for dragging and dropping media items onto the chat area has been removed and replaced with a TODO comment. This is a clear removal of a user-facing feature. The TODO is a good way to track its potential re-implementation.

) {
val layoutDirection = LocalLayoutDirection.current
MessageList(
Expand Down
46 changes: 0 additions & 46 deletions app/src/main/java/com/google/android/samples/socialite/ui/chat/component/ContextMenuArea.kt
View file
Open in desktop

This file was deleted.

Loading
Loading