athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MoreDialog: Minor UI tweaks

Browse Source
This commit is contained in:
Rahul Patel
2024-07-30 03:25:21 +05:30
parent 6479781446
commit 286996c64e
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/com/aurora/store/view/ui/commons/MoreDialogFragment.kt
View File

@@ -6,6 +6,7 @@ import android.os.Bundle
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.annotation.IdRes import androidx.annotation.IdRes
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
@@ -54,6 +55,7 @@ import com.aurora.Constants.URL_TOS
import com.aurora.extensions.accentColor import com.aurora.extensions.accentColor
import com.aurora.extensions.browse import com.aurora.extensions.browse
import com.aurora.extensions.darkenColor import com.aurora.extensions.darkenColor
import com.aurora.extensions.getStyledAttributeColor
import com.aurora.extensions.lightenColor import com.aurora.extensions.lightenColor
import com.aurora.store.R import com.aurora.store.R
import com.aurora.store.data.providers.AuthProvider import com.aurora.store.data.providers.AuthProvider
@@ -68,10 +70,10 @@ class MoreDialogFragment : DialogFragment() {
@Inject @Inject
lateinit var authProvider: AuthProvider lateinit var authProvider: AuthProvider
var primaryColor: Color = Color.White private var primaryColor: Color = Color.White
var onPrimaryColor: Color = Color.Black private var onPrimaryColor: Color = Color.Black
var secondaryColor: Color = Color.White private var secondaryColor: Color = Color.White
var onSecondaryColor: Color = Color.Black private var onSecondaryColor: Color = Color.Black
private data class Option( private data class Option(
@StringRes val title: Int, @StringRes val title: Int,
@@ -108,7 +110,10 @@ class MoreDialogFragment : DialogFragment() {
.background(color = primaryColor) .background(color = primaryColor)
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
.padding(10.dp), .padding(10.dp),
verticalArrangement = Arrangement.spacedBy(5.dp, Alignment.CenterVertically) verticalArrangement = Arrangement.spacedBy(
5.dp,
Alignment.CenterVertically
)
) { ) {
AppBar( AppBar(
backgroundColor = primaryColor, backgroundColor = primaryColor,
@@ -175,11 +180,12 @@ class MoreDialogFragment : DialogFragment() {
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(5.dp, Alignment.CenterHorizontally) horizontalArrangement = Arrangement.spacedBy(2.dp, Alignment.CenterHorizontally)
) { ) {
TextButton(onClick = { requireContext().browse(Constants.URL_POLICY) }) { TextButton(onClick = { requireContext().browse(Constants.URL_POLICY) }) {
Text( Text(
text = stringResource(id = R.string.privacy_policy_title), text = stringResource(id = R.string.privacy_policy_title),
fontWeight = FontWeight.Light,
color = tintColor color = tintColor
) )
} }
@@ -187,6 +193,7 @@ class MoreDialogFragment : DialogFragment() {
TextButton(onClick = { requireContext().browse(URL_TOS) }) { TextButton(onClick = { requireContext().browse(URL_TOS) }) {
Text( Text(
text = stringResource(id = R.string.menu_terms), text = stringResource(id = R.string.menu_terms),
fontWeight = FontWeight.Light,
color = tintColor color = tintColor
) )
} }
@@ -200,7 +207,10 @@ class MoreDialogFragment : DialogFragment() {
.fillMaxWidth() .fillMaxWidth()
.clip( .clip(
RoundedCornerShape( RoundedCornerShape(
topStart = 20.dp, topEnd = 20.dp, bottomStart = 5.dp, bottomEnd = 5.dp topStart = 20.dp,
topEnd = 20.dp,
bottomStart = 5.dp,
bottomEnd = 5.dp
) )
) )
.background(color = backgroundColor) .background(color = backgroundColor)
@@ -223,7 +233,7 @@ class MoreDialogFragment : DialogFragment() {
contentDescription = stringResource(id = R.string.title_account_manager), contentDescription = stringResource(id = R.string.title_account_manager),
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
modifier = Modifier modifier = Modifier
.requiredSize(48.dp) .requiredSize(36.dp)
.clip(CircleShape) .clip(CircleShape)
) )
Column( Column(
@@ -231,14 +241,14 @@ class MoreDialogFragment : DialogFragment() {
horizontalAlignment = Alignment.Start horizontalAlignment = Alignment.Start
) { ) {
Text( Text(
text = if (authProvider.isAnonymous) "anonymous" else authProvider.authData!!.userProfile!!.name, text = if (authProvider.isAnonymous) "Anonymous" else authProvider.authData!!.userProfile!!.name,
fontWeight = FontWeight.SemiBold, fontWeight = FontWeight.Normal,
fontSize = 16.sp, fontSize = 16.sp,
color = onBackgroundColor color = onBackgroundColor
) )
Text( Text(
text = if (authProvider.isAnonymous) "anonymous@gmail.com" else authProvider.authData!!.userProfile!!.email, text = if (authProvider.isAnonymous) "anonymous@gmail.com" else authProvider.authData!!.userProfile!!.email,
fontWeight = FontWeight.Normal, fontWeight = FontWeight.Light,
fontSize = 14.sp, fontSize = 14.sp,
color = onBackgroundColor color = onBackgroundColor
) )
@@ -246,11 +256,17 @@ class MoreDialogFragment : DialogFragment() {
} }
OutlinedButton( OutlinedButton(
onClick = { findNavController().navigate(R.id.accountFragment) }, onClick = { findNavController().navigate(R.id.accountFragment) },
shape = RoundedCornerShape(12.dp) shape = RoundedCornerShape(12.dp),
border = BorderStroke(
1.dp,
Color(requireContext().getStyledAttributeColor(androidx.appcompat.R.attr.colorControlHighlight))
),
modifier = Modifier.fillMaxWidth()
) { ) {
Text( Text(
text = stringResource(id = R.string.manage_account), text = stringResource(id = R.string.manage_account),
color = onBackgroundColor color = onBackgroundColor,
fontWeight = FontWeight.Medium
) )
} }
} }