admin/rider-pro-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面样式调整

Browse Source
This commit is contained in:
weber
2025-08-14 15:39:21 +08:00
parent cd3fc03524
commit d8c091b19b
13 changed files with 231 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/aiosman/ravenow/ui/index/Index.kt
View File

@@ -260,7 +260,7 @@ fun IndexScreen() {
Scaffold(
bottomBar = {
NavigationBar(
modifier = Modifier.height(72.dp + navigationBarHeight),
modifier = Modifier.height(58.dp + navigationBarHeight),
containerColor = AppColors.background
) {
item.forEachIndexed { idx, it ->
@@ -271,7 +271,7 @@ fun IndexScreen() {
)
NavigationBarItem(
modifier = Modifier.padding(top = 6.dp),
modifier = Modifier.padding(top = 2.dp),
selected = isSelected,
onClick = {
if (it.route === NavigationItem.Add.route) {
@@ -327,7 +327,7 @@ fun IndexScreen() {
}
// 文字标签，可控制间距
Spacer(modifier = Modifier.height(4.dp))
Spacer(modifier = Modifier.height(1.dp))
Text(
text = it.label(),

2
app/src/main/java/com/aiosman/ravenow/ui/index/NavigationItem.kt
View File

@@ -24,7 +24,7 @@ sealed class NavigationItem(
data object Ai : NavigationItem("Ai",
icon = { R.drawable.rider_pro_nav_ai },
selectedIcon = { R.mipmap.rider_pro_nav_ai_hl },
label = { stringResource(R.string.main_home) }
label = { stringResource(R.string.main_ai) }
)
data object Add : NavigationItem("Add",

2
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListViewModel.kt
View File

@@ -168,7 +168,7 @@ object GroupChatListViewModel : ViewModel() {
viewModelScope.launch {
try {
// 群聊直接使用群ID进行导航
navController.navigateToChat(conversation.groupId)
//navController.navigateToChat(conversation.groupId)
} catch (e: Exception) {
error = ""
e.printStackTrace()

7
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/Moment.kt
View File

@@ -42,7 +42,8 @@ import com.aiosman.ravenow.LocalAppTheme
import com.aiosman.ravenow.LocalNavController
import com.aiosman.ravenow.R
import com.aiosman.ravenow.ui.NavigationRoute
import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.ExploreMomentsList
import com.aiosman.ravenow.ui.index.tabs.moment.tabs.dynamic.Dynamic
import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.Explore
import com.aiosman.ravenow.ui.index.tabs.moment.tabs.hot.HotMomentsList
import com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline.TimelineMomentsList
import com.aiosman.ravenow.ui.index.tabs.search.SearchViewModel
@@ -227,10 +228,10 @@ fun MomentsList() {
) {
when (it) {
0 -> {
//ExploreMomentsList()
Dynamic()
}
1 -> {
ExploreMomentsList()
Explore()
}
2 -> {

31
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/dynamic/Dynamic.kt Normal file
View File

@@ -0,0 +1,31 @@
package com.aiosman.ravenow.ui.index.tabs.moment.tabs.dynamic
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import com.aiosman.ravenow.ui.composables.MomentCard
import kotlinx.coroutines.launch
/**
* 探索
*/
@OptIn(ExperimentalMaterialApi::class)
@Composable
fun Dynamic() {
val model = DynamicViewModel
}

12
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/dynamic/DynamicViewModel.kt Normal file
View File

@@ -0,0 +1,12 @@
package com.aiosman.ravenow.ui.index.tabs.moment.tabs.dynamic
import androidx.lifecycle.ViewModel
import com.aiosman.ravenow.entity.MomentLoaderExtraArgs
import com.aiosman.ravenow.ui.index.tabs.moment.BaseMomentModel
import org.greenrobot.eventbus.EventBus
object DynamicViewModel : ViewModel() {
}

4
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/Moment.kt → app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/Explore.kt
View File

@@ -25,8 +25,8 @@ import kotlinx.coroutines.launch
*/
@OptIn(ExperimentalMaterialApi::class)
@Composable
fun ExploreMomentsList() {
val model = MomentExploreViewModel
fun Explore() {
val model = ExploreViewModel
var moments = model.moments
val scope = rememberCoroutineScope()

2
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/MomentExploreViewModel.kt → app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/ExploreViewModel.kt
View File

@@ -5,7 +5,7 @@ import com.aiosman.ravenow.ui.index.tabs.moment.BaseMomentModel
import org.greenrobot.eventbus.EventBus
object MomentExploreViewModel : BaseMomentModel() {
object ExploreViewModel : BaseMomentModel() {
init {
EventBus.getDefault().register(this)