From 262761813ab5a54bc3396e603efe3822fc68f2d5 Mon Sep 17 00:00:00 2001 From: Eric85710 Date: Wed, 6 May 2026 10:15:14 +0800 Subject: [PATCH] auth to server-V55 --- .../login_v3/home/{ => Message/UI}/Message.kt | 19 +++++++++++++++---- .../ViewModel}/Message_ViewModel.kt | 2 +- .../login_v3/navigation/Main_Screen_tab.kt | 16 ++-------------- 3 files changed, 18 insertions(+), 19 deletions(-) rename app/src/main/java/com/example/login_v3/home/{ => Message/UI}/Message.kt (90%) rename app/src/main/java/com/example/login_v3/home/{ => Message/ViewModel}/Message_ViewModel.kt (95%) diff --git a/app/src/main/java/com/example/login_v3/home/Message.kt b/app/src/main/java/com/example/login_v3/home/Message/UI/Message.kt similarity index 90% rename from app/src/main/java/com/example/login_v3/home/Message.kt rename to app/src/main/java/com/example/login_v3/home/Message/UI/Message.kt index a7d69f9..b858d01 100644 --- a/app/src/main/java/com/example/login_v3/home/Message.kt +++ b/app/src/main/java/com/example/login_v3/home/Message/UI/Message.kt @@ -1,9 +1,8 @@ -package com.example.login_v3.home +package com.example.login_v3.home.Message.UI import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -17,10 +16,13 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults -import androidx.compose.material3.Divider import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text @@ -36,9 +38,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.compose.runtime.getValue -import androidx.compose.ui.draw.BlurredEdgeTreatment import androidx.compose.ui.draw.blur import androidx.compose.ui.draw.clip +import com.example.login_v3.home.Message.ViewModel.MessageViewModel @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -66,6 +68,15 @@ fun Tg_Message() { containerColor = Color.Transparent, // ⭐ 改這裡 titleContentColor = Color.Black ), + actions = { + // ⭐ 在這裡添加按鈕 + IconButton(onClick = { /* 點擊按鈕後要做的事 */ }) { + Icon( + imageVector = Icons.Default.Add, + contentDescription = "Add Message" + ) + } + }, modifier = Modifier .background( color = MaterialTheme.colorScheme.primary, // ⭐ 調低透明度 diff --git a/app/src/main/java/com/example/login_v3/home/Message_ViewModel.kt b/app/src/main/java/com/example/login_v3/home/Message/ViewModel/Message_ViewModel.kt similarity index 95% rename from app/src/main/java/com/example/login_v3/home/Message_ViewModel.kt rename to app/src/main/java/com/example/login_v3/home/Message/ViewModel/Message_ViewModel.kt index b035ca9..ece9a59 100644 --- a/app/src/main/java/com/example/login_v3/home/Message_ViewModel.kt +++ b/app/src/main/java/com/example/login_v3/home/Message/ViewModel/Message_ViewModel.kt @@ -1,5 +1,5 @@ // Message_ViewModel.kt -package com.example.login_v3.home +package com.example.login_v3.home.Message.ViewModel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope diff --git a/app/src/main/java/com/example/login_v3/navigation/Main_Screen_tab.kt b/app/src/main/java/com/example/login_v3/navigation/Main_Screen_tab.kt index 5cca33d..f99f54a 100644 --- a/app/src/main/java/com/example/login_v3/navigation/Main_Screen_tab.kt +++ b/app/src/main/java/com/example/login_v3/navigation/Main_Screen_tab.kt @@ -1,12 +1,7 @@ package com.example.login_v3.navigation -import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.core.animateFloatAsState -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut -import androidx.compose.animation.slideInVertically -import androidx.compose.animation.slideOutVertically import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope @@ -17,26 +12,19 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.shadow import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import androidx.navigation.NavHostController -import com.example.login_v3.home.MessageViewModel +import com.example.login_v3.home.Message.ViewModel.MessageViewModel import com.example.login_v3.home.Tg_MarketPlace -import com.example.login_v3.home.Tg_Message +import com.example.login_v3.home.Message.UI.Tg_Message import com.example.login_v3.home.Tg_Server import com.example.login_v3.home.setting.Tg_Setting import androidx.lifecycle.viewmodel.compose.viewModel