Browse Source

android: ограничить карточку members половиной экрана, CONFIGURE_DEPENDS для GLOB

topo_upd
evgeny 2 months ago
parent
commit
5316ee958a
  1. 8
      tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/MemberListScreen.kt
  2. 4
      tools/chatgui-android/libutun_lite/utun_sources.cmake

8
tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/MemberListScreen.kt

@ -5,6 +5,8 @@ import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
@ -22,6 +24,7 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.utun.chat.data.Channel
@ -214,11 +217,12 @@ private fun MemberDetailCard(
Card(
modifier = Modifier
.fillMaxWidth()
.padding(8.dp),
.padding(8.dp)
.heightIn(max = LocalConfiguration.current.screenHeightDp.dp / 2),
shape = RoundedCornerShape(12.dp),
elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
) {
Column(modifier = Modifier.padding(12.dp)) {
Column(modifier = Modifier.padding(12.dp).verticalScroll(rememberScrollState())) {
Row(verticalAlignment = Alignment.CenterVertically) {
val dotColor = if (detail.online) Color(0xFF4CAF50) else Color(0xFF9E9E9E)
Box(

4
tools/chatgui-android/libutun_lite/utun_sources.cmake

@ -18,14 +18,14 @@
function(utun_setup_sources LIB_DIR SRC_DIR CONFIG_DIR TOOLS_DIR)
# ── lib/ sources ──
file(GLOB _lib_src "${LIB_DIR}/*.c")
file(GLOB _lib_src CONFIGURE_DEPENDS "${LIB_DIR}/*.c")
set(_lmdb_src
"${LIB_DIR}/liblmdb/mdb.c"
"${LIB_DIR}/liblmdb/midl.c"
)
# ── src/ sources (all except utun.c, lwip_orig, uip, BBR) ──
file(GLOB_RECURSE _src_src "${SRC_DIR}/*.c")
file(GLOB_RECURSE _src_src CONFIGURE_DEPENDS "${SRC_DIR}/*.c")
list(FILTER _src_src EXCLUDE REGEX "/lwip_orig/")
list(FILTER _src_src EXCLUDE REGEX "/uip/")
list(FILTER _src_src EXCLUDE REGEX "/transport_layer/BBR/")

Loading…
Cancel
Save