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

修复密码修改页面、Favorite页面

Browse Source
This commit is contained in:
Kevinlinpr
2024-10-13 04:23:04 +08:00
parent dc0aa4d46c
commit f1e0b5d49b
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt
View File

@@ -103,7 +103,7 @@ fun ChangePasswordScreen() {
hint = "Enter your current password", hint = "Enter your current password",
error = oldPasswordError error = oldPasswordError
) )
Spacer(modifier = Modifier.height(24.dp)) Spacer(modifier = Modifier.height(4.dp))
TextInputField( TextInputField(
text = newPassword, text = newPassword,
onValueChange = { newPassword = it }, onValueChange = { newPassword = it },
@@ -112,7 +112,7 @@ fun ChangePasswordScreen() {
hint = "Enter your new password", hint = "Enter your new password",
error = passwordError error = passwordError
) )
Spacer(modifier = Modifier.height(24.dp)) Spacer(modifier = Modifier.height(4.dp))
TextInputField( TextInputField(
text = confirmPassword, text = confirmPassword,
onValueChange = { confirmPassword = it }, onValueChange = { confirmPassword = it },
@@ -121,7 +121,7 @@ fun ChangePasswordScreen() {
hint = "Enter your new password again", hint = "Enter your new password again",
error = confirmPasswordError error = confirmPasswordError
) )
Spacer(modifier = Modifier.height(80.dp)) Spacer(modifier = Modifier.height(50.dp))
ActionButton( ActionButton(
modifier = Modifier modifier = Modifier
.width(345.dp) .width(345.dp)

6
app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteListPage.kt
View File

@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.pullrefresh.PullRefreshIndicator import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh import androidx.compose.material.pullrefresh.pullRefresh
@@ -18,6 +19,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
@@ -78,7 +80,6 @@ fun FavouriteListPage() {
.fillMaxWidth() .fillMaxWidth()
.aspectRatio(1f) .aspectRatio(1f)
.padding(2.dp) .padding(2.dp)
.noRippleClickable { .noRippleClickable {
navController.navigateToPost( navController.navigateToPost(
id = momentItem.id, id = momentItem.id,
@@ -91,7 +92,8 @@ fun FavouriteListPage() {
imageUrl = momentItem.images[0].thumbnail, imageUrl = momentItem.images[0].thumbnail,
contentDescription = "", contentDescription = "",
modifier = Modifier modifier = Modifier
.fillMaxSize(), .fillMaxSize()
.clip(RoundedCornerShape(8.dp)),
context = context context = context
) )
if (momentItem.images.size > 1) { if (momentItem.images.size > 1) {

2
app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt
View File

@@ -177,7 +177,7 @@ fun ProfileV3(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.let { .let {
if (isSelf && state.toolbarState.progress == 0f) { if (isSelf) {
it.noRippleClickable { it.noRippleClickable {
Intent(Intent.ACTION_PICK).apply { Intent(Intent.ACTION_PICK).apply {
type = "image/*" type = "image/*"

4
app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt
View File

@@ -4,6 +4,7 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.asPaddingValues
@@ -141,7 +142,8 @@ fun DiscoverView() {
val navController = LocalNavController.current val navController = LocalNavController.current
LazyVerticalGrid( LazyVerticalGrid(
columns = GridCells.Fixed(3), columns = GridCells.Fixed(3),
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize().padding(bottom = 8.dp),
// contentPadding = PaddingValues(8.dp)
) { ) {
items(moments.itemCount) { idx -> items(moments.itemCount) { idx ->
val momentItem = moments[idx] ?: return@items val momentItem = moments[idx] ?: return@items