Skip to content

Commit 150698f

Browse files
Nagarjuna0033niyajali
authored andcommitted
refactor: Redesign payment screen (openMF#1773)
* refactor: Redesign payment screen * resolved detekt error * refactor : changed current theme instead of using NewUi * resolved spotless errors
1 parent c0845b7 commit 150698f

File tree

2 files changed

+5
-4
lines changed
  • build-logic/convention/src/main/kotlin/org/mifospay
  • feature/profile/src/main/kotlin/org/mifospay/feature/profile

2 files changed

+5
-4
lines changed

build-logic/convention/src/main/kotlin/org/mifospay/Detekt.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ import io.gitlab.arturbosch.detekt.extensions.DetektExtension
55
import org.gradle.api.Project
66
import org.gradle.kotlin.dsl.dependencies
77
import org.gradle.kotlin.dsl.named
8+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
89

910
internal fun Project.configureDetekt(extension: DetektExtension) = extension.apply {
1011
tasks.named<Detekt>("detekt") {
12+
jvmTarget = "17"
1113
reports {
1214
xml.required.set(true)
1315
html.required.set(true)

feature/profile/src/main/kotlin/org/mifospay/feature/profile/ProfileCard.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import androidx.compose.ui.Modifier
2626
import androidx.compose.ui.res.stringResource
2727
import androidx.compose.ui.text.font.FontWeight
2828
import androidx.compose.ui.unit.dp
29-
import org.mifospay.core.designsystem.theme.NewUi
3029

3130
@Composable
3231
fun ProfileDetailsCard(
@@ -45,7 +44,7 @@ fun ProfileDetailsCard(
4544
),
4645
shape = RoundedCornerShape(15.dp),
4746
colors = CardDefaults.cardColors(
48-
containerColor = NewUi.containerColor,
47+
containerColor = MaterialTheme.colorScheme.primaryContainer,
4948
),
5049
) {
5150
Column(
@@ -79,7 +78,7 @@ fun ProfileItem(
7978
) {
8079
Text(
8180
text = label,
82-
color = NewUi.primaryColor,
81+
color = MaterialTheme.colorScheme.primary,
8382
style = MaterialTheme.typography.labelLarge,
8483
)
8584
Spacer(modifier = Modifier.height(10.dp))
@@ -92,7 +91,7 @@ fun ProfileItem(
9291
Spacer(modifier = Modifier.height(4.dp))
9392
HorizontalDivider(
9493
thickness = 1.dp,
95-
color = NewUi.onSurface.copy(alpha = 0.05f),
94+
color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.05f),
9695
)
9796
}
9897
}

0 commit comments

Comments
 (0)