Skip to content

Commit 315f64b

Browse files
committed
More "not available" dialogs in Profile, fix click on author mention
1 parent 1a346a7 commit 315f64b

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationUiState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ data class Message(
4040
val content: String,
4141
val timestamp: String,
4242
val image: Int? = null,
43-
val authorImage: Int = if (author =="me") R.drawable.ali else R.drawable.someone_else
43+
val authorImage: Int = if (author == "me") R.drawable.ali else R.drawable.someone_else
4444
)

Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/UserInput.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ private fun UserInputSelector(
325325
onClick = onMessageSent,
326326
colors = buttonColors,
327327
border = border,
328-
// TODO: Workaround for https://issuetracker.google.com/158830170
329328
contentPadding = PaddingValues(0.dp)
330329
) {
331330
Text(
@@ -496,7 +495,6 @@ fun ExtendedSelectorInnerButton(
496495
shape = MaterialTheme.shapes.medium,
497496
enabled = selected,
498497
colors = colors,
499-
// TODO: Workaround for https://issuetracker.google.com//158830170
500498
contentPadding = PaddingValues(0.dp)
501499
) {
502500
Text(

Jetchat/app/src/main/java/com/example/compose/jetchat/profile/Profile.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ import androidx.compose.material.icons.outlined.Create
4444
import androidx.compose.material.icons.outlined.MoreVert
4545
import androidx.compose.runtime.Composable
4646
import androidx.compose.runtime.CompositionLocalProvider
47+
import androidx.compose.runtime.getValue
4748
import androidx.compose.runtime.key
49+
import androidx.compose.runtime.mutableStateOf
50+
import androidx.compose.runtime.remember
51+
import androidx.compose.runtime.setValue
4852
import androidx.compose.ui.Alignment
4953
import androidx.compose.ui.Modifier
5054
import androidx.compose.ui.layout.ContentScale
@@ -54,6 +58,7 @@ import androidx.compose.ui.res.stringResource
5458
import androidx.compose.ui.tooling.preview.Preview
5559
import androidx.compose.ui.unit.Dp
5660
import androidx.compose.ui.unit.dp
61+
import com.example.compose.jetchat.FunctionalityNotAvailablePopup
5762
import com.example.compose.jetchat.R
5863
import com.example.compose.jetchat.components.AnimatingFabContent
5964
import com.example.compose.jetchat.components.JetchatAppBar
@@ -68,6 +73,11 @@ import com.google.accompanist.insets.statusBarsPadding
6873
@Composable
6974
fun ProfileScreen(userData: ProfileScreenState, onNavIconPressed: () -> Unit = { }) {
7075

76+
var functionalityNotAvailablePopupShown by remember { mutableStateOf(false) }
77+
if (functionalityNotAvailablePopupShown) {
78+
FunctionalityNotAvailablePopup { functionalityNotAvailablePopupShown = false }
79+
}
80+
7181
val scrollState = rememberScrollState()
7282

7383
Column(modifier = Modifier.fillMaxSize()) {
@@ -84,7 +94,7 @@ fun ProfileScreen(userData: ProfileScreenState, onNavIconPressed: () -> Unit = {
8494
Icon(
8595
imageVector = Icons.Outlined.MoreVert,
8696
modifier = Modifier
87-
.clickable(onClick = {}) // TODO: Show not implemented dialog.
97+
.clickable(onClick = { functionalityNotAvailablePopupShown = true })
8898
.padding(horizontal = 12.dp, vertical = 16.dp)
8999
.height(24.dp),
90100
contentDescription = stringResource(id = R.string.more_options)

0 commit comments

Comments
 (0)