mirror of
https://github.com/permissionlesstech/bitchat-android.git
synced 2026-07-25 05:05:20 +00:00
design
This commit is contained in:
@@ -215,11 +215,22 @@ private fun PrivateChatHeader(
|
|||||||
),
|
),
|
||||||
contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp)
|
contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp)
|
||||||
) {
|
) {
|
||||||
Text(
|
Row(
|
||||||
text = "← back",
|
verticalAlignment = Alignment.CenterVertically
|
||||||
style = MaterialTheme.typography.bodyMedium,
|
) {
|
||||||
color = colorScheme.primary
|
Icon(
|
||||||
)
|
imageVector = Icons.Filled.ArrowBack,
|
||||||
|
contentDescription = "Back",
|
||||||
|
modifier = Modifier.size(16.dp),
|
||||||
|
tint = colorScheme.primary
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(4.dp))
|
||||||
|
Text(
|
||||||
|
text = "back",
|
||||||
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
|
color = colorScheme.primary
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.weight(1f))
|
Spacer(modifier = Modifier.weight(1f))
|
||||||
@@ -268,11 +279,22 @@ private fun ChannelHeader(
|
|||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
) {
|
) {
|
||||||
IconButton(onClick = onBackClick) {
|
IconButton(onClick = onBackClick) {
|
||||||
Text(
|
Row(
|
||||||
text = "← back",
|
verticalAlignment = Alignment.CenterVertically
|
||||||
style = MaterialTheme.typography.bodyMedium,
|
) {
|
||||||
color = colorScheme.primary
|
Icon(
|
||||||
)
|
imageVector = Icons.Filled.ArrowBack,
|
||||||
|
contentDescription = "Back",
|
||||||
|
modifier = Modifier.size(16.dp),
|
||||||
|
tint = colorScheme.primary
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(4.dp))
|
||||||
|
Text(
|
||||||
|
text = "back",
|
||||||
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
|
color = colorScheme.primary
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.weight(1f))
|
Spacer(modifier = Modifier.weight(1f))
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
|
|||||||
import androidx.compose.foundation.text.BasicTextField
|
import androidx.compose.foundation.text.BasicTextField
|
||||||
import androidx.compose.foundation.text.KeyboardActions
|
import androidx.compose.foundation.text.KeyboardActions
|
||||||
import androidx.compose.foundation.text.KeyboardOptions
|
import androidx.compose.foundation.text.KeyboardOptions
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.filled.*
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@@ -97,20 +99,18 @@ fun MessageInput(
|
|||||||
),
|
),
|
||||||
contentAlignment = Alignment.Center
|
contentAlignment = Alignment.Center
|
||||||
) {
|
) {
|
||||||
Text(
|
Icon(
|
||||||
text = "↑",
|
imageVector = Icons.Filled.KeyboardArrowUp,
|
||||||
style = MaterialTheme.typography.titleMedium.copy(
|
contentDescription = "Send message",
|
||||||
fontSize = 20.sp,
|
modifier = Modifier.size(20.dp),
|
||||||
fontWeight = FontWeight.Bold
|
tint = if (selectedPrivatePeer != null) {
|
||||||
),
|
|
||||||
color = if (selectedPrivatePeer != null) {
|
|
||||||
// Black arrow on orange in private mode
|
// Black arrow on orange in private mode
|
||||||
Color.Black
|
Color.Black
|
||||||
} else if (colorScheme.background == Color.Black) {
|
} else if (colorScheme.background == Color.Black) {
|
||||||
Color.Black // Black arrow on bright green in dark theme
|
Color.Black // Black arrow on bright green in dark theme
|
||||||
} else {
|
} else {
|
||||||
Color.White // White arrow on dark green in light theme
|
Color.White // White arrow on dark green in light theme
|
||||||
},
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user