Skip to content

Make some text items selectable. #376

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
martinbonnin merged 1 commit into from
Apr 14, 2025
Merged

Make some text items selectable. #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 30 additions & 20 deletions shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/SessionDetailLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
Expand Down Expand Up @@ -204,17 +205,20 @@ private fun SessionDetails(
onApplyForAppClinic: () -> Unit,
) {


Column(
Modifier
.verticalScroll(state = rememberScrollState())
.padding(16.dp)
.then(modifier)
) {

Text(
text = sessionDetails.session.title,
style = MaterialTheme.typography.headlineLarge
)
SelectionContainer {
Text(
text = sessionDetails.session.title,
style = MaterialTheme.typography.headlineLarge
)
}

Row(
modifier = Modifier.padding(top = 16.dp),
Expand All @@ -233,12 +237,14 @@ private fun SessionDetails(
)
}

Text(
modifier = Modifier.padding(top = 16.dp),
text = sessionDetails.session.description.orEmpty(),
textAlign = TextAlign.Start,
style = MaterialTheme.typography.bodyLarge,
)
SelectionContainer {
Text(
modifier = Modifier.padding(top = 16.dp),
text = sessionDetails.session.description.orEmpty(),
textAlign = TextAlign.Start,
style = MaterialTheme.typography.bodyLarge,
)
}

if(sessionDetails.session.isAppClinic()) {
Button(
Expand Down Expand Up @@ -385,20 +391,24 @@ private fun Speaker(
)
}

Text(
text = speaker.getFullNameAndCompany(),
style = MaterialTheme.typography.titleLarge,
)

speaker.bio?.let { bio ->
SelectionContainer {
Text(
modifier = Modifier.padding(),
text = bio,
textAlign = TextAlign.Start,
style = MaterialTheme.typography.bodyMedium,
text = speaker.getFullNameAndCompany(),
style = MaterialTheme.typography.titleLarge,
)
}

speaker.bio?.let { bio ->
SelectionContainer {
Text(
modifier = Modifier.padding(),
text = bio,
textAlign = TextAlign.Start,
style = MaterialTheme.typography.bodyMedium,
)
}
}

SocialButtons(
speaker = speaker,
openLink = openLink
Expand Down
23 changes: 14 additions & 9 deletions shared/ui/src/commonMain/kotlin/com/androidmakers/ui/speakers/SpeakerDetailsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
Expand Down Expand Up @@ -110,16 +111,20 @@ fun SpeakerDetailsScreen(
)
}

Text(
text = speaker.name.orEmpty(),
style = MaterialTheme.typography.headlineLarge
)
SelectionContainer {
Text(
text = speaker.name.orEmpty(),
style = MaterialTheme.typography.headlineLarge
)
}

Text(
text = speaker.bio.orEmpty(),
textAlign = TextAlign.Start,
style = MaterialTheme.typography.bodyLarge,
)
SelectionContainer {
Text(
text = speaker.bio.orEmpty(),
textAlign = TextAlign.Start,
style = MaterialTheme.typography.bodyLarge,
)
}

SocialButtons(
speaker = speaker,
Expand Down