Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: [ANDROAPP-6281] changes because of updated design system library #3941

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+10 −9
Open

chore: [ANDROAPP-6281] changes because of updated design system library #3941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/src/main/java/org/dhis2/usescases/login/ui/LoginScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.constraintlayout.compose.ConstraintLayout
import org.dhis2.R
import org.hisp.dhis.mobile.ui.designsystem.resource.provideFontResource
import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2Theme
import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor

Expand Down Expand Up @@ -118,7 +119,7 @@ fun LoginTopBar(
style = TextStyle(
fontSize = 16.sp,
lineHeight = 24.sp,
fontFamily = provideFontResource("rubik_regular"),
fontFamily = FontFamily(Font(R.font.rubik_regular)),
fontWeight = FontWeight.Normal,
color = Color.Black,
letterSpacing = 0.5.sp,
Expand All @@ -140,7 +141,7 @@ fun LoginTopBar(
style = TextStyle(
fontSize = 12.sp,
lineHeight = 16.sp,
fontFamily = provideFontResource("rubik_regular"),
fontFamily = FontFamily(Font(R.font.rubik_regular)),
fontWeight = FontWeight.Normal,
color = SurfaceColor.ContainerHighest,
letterSpacing = 0.4.sp,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/SearchTEUi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import androidx.compose.material.IconButton
import androidx.compose.material.LocalTextStyle
import androidx.compose.material.OutlinedButton
import androidx.compose.material.Text
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
Expand Down Expand Up @@ -198,7 +198,7 @@ fun SearchButtonWithQuery(
.clickable(
onClick = onClick,
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(
indication = ripple(
true,
color = SurfaceColor.Primary,
),
Expand Down
6 changes: 3 additions & 3 deletions dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/IndicatorViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.ripple
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
Expand Down Expand Up @@ -40,7 +40,7 @@ class IndicatorViewHolder(
if (programIndicatorModel.programIndicator?.description() != null) {
Modifier.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(),
indication = ripple(),
onClick = { showDescription(programIndicatorModel.programIndicator) },
)
} else {
Expand All @@ -60,7 +60,7 @@ class IndicatorViewHolder(
if (programIndicatorModel.programIndicator?.description() != null) {
Modifier.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(),
indication = ripple(),
onClick = { showDescription(programIndicatorModel.programIndicator) },
)
} else {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ minSdk = "21"
vCode = "138"
vName = "3.1.1"
gradle = "8.7.2"
kotlin = '2.0.20'
kotlin = '2.0.21'
hilt = '2.47'
jacoco = '0.8.10'
designSystem = "0.4.1-SNAPSHOT"
Expand Down
Loading