From 5316ee958ab977d43b44baade5320de9b0a5d59d Mon Sep 17 00:00:00 2001 From: evgeny Date: Sun, 16 Aug 2026 23:50:14 +0300 Subject: [PATCH] =?UTF-8?q?android:=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=87=D0=B8=D1=82=D1=8C=20=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87?= =?UTF-8?q?=D0=BA=D1=83=20members=20=D0=BF=D0=BE=D0=BB=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0,=20CO?= =?UTF-8?q?NFIGURE=5FDEPENDS=20=D0=B4=D0=BB=D1=8F=20GLOB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/utun/chat/ui/screens/MemberListScreen.kt | 8 ++++++-- tools/chatgui-android/libutun_lite/utun_sources.cmake | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/MemberListScreen.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/MemberListScreen.kt index 897e3902..965997df 100644 --- a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/MemberListScreen.kt +++ b/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( diff --git a/tools/chatgui-android/libutun_lite/utun_sources.cmake b/tools/chatgui-android/libutun_lite/utun_sources.cmake index 0c20a1ac..649ceddb 100644 --- a/tools/chatgui-android/libutun_lite/utun_sources.cmake +++ b/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/")