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

Update kiwi.orbit.compose to v0.21.0 #231

Merged
merged 2 commits into from
Oct 31, 2022
Merged

Update kiwi.orbit.compose to v0.21.0 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4e558
Update kiwi.orbit.compose to v0.21.0
renovate[bot] Oct 20, 2022
e7bad4c
Make App compatible with new version of kiwi
Nodrex Oct 31, 2022
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
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ versionName = "1.2.1"
composeCompiler = "1.2.0"

[libraries]
kiwi-icons = "kiwi.orbit.compose:icons:0.20.1"
kiwi-ui = "kiwi.orbit.compose:ui:0.20.1"
kiwi-illustrations = "kiwi.orbit.compose:illustrations:0.20.1"
kiwi-icons = "kiwi.orbit.compose:icons:0.21.0"
kiwi-ui = "kiwi.orbit.compose:ui:0.21.0"
kiwi-illustrations = "kiwi.orbit.compose:illustrations:0.21.0"

androidx-compose-navigation = "androidx.navigation:navigation-compose:2.5.2"
androidx-compose-navigation-hilt = "androidx.hilt:hilt-navigation-compose:1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions ...ia/src/main/java/com/earth/testomania/common/custom_ui_components/TestomaniaChoiceTile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import kiwi.orbit.compose.ui.OrbitTheme
import kiwi.orbit.compose.ui.controls.Card
import kiwi.orbit.compose.ui.controls.SurfaceCard
import kiwi.orbit.compose.ui.controls.Text
import kiwi.orbit.compose.ui.foundation.ProvideMergedTextStyle

Expand All @@ -45,7 +45,7 @@ fun TestomaniaChoiceTile(
false -> Color.Transparent
}
)
Card(
SurfaceCard (
enabled = enabled,
onClick = onSelect,
border = BorderStroke(2.dp, color),
Expand Down
6 changes: 3 additions & 3 deletions testomania/src/main/java/com/earth/testomania/home_screen/presentation/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import com.earth.testomania.ui.theme.DialogBkgDark
import com.earth.testomania.ui.theme.DialogBkgLight
import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
import kiwi.orbit.compose.ui.controls.Card
import kiwi.orbit.compose.ui.controls.SurfaceCard
import kiwi.orbit.compose.ui.controls.Icon
import kiwi.orbit.compose.ui.controls.Text
import kotlinx.coroutines.CoroutineScope
Expand Down Expand Up @@ -192,7 +192,7 @@ fun CardButton(
val dismissStr = stringResource(id = R.string.dismiss)
val viewModel: HomeScreenViewModel = hiltViewModel()

Card(modifier = Modifier.size(125.dp), shape = RoundedCornerShape(10.dp), onClick = {
SurfaceCard (modifier = Modifier.size(125.dp), shape = RoundedCornerShape(10.dp), onClick = {

dismissCurrentSnackbar(scaffoldState)

Expand All @@ -204,7 +204,7 @@ fun CardButton(
actionLabel = dismissStr,
)
}
return@Card
return@SurfaceCard
}
ABOUT_ROUT -> {
viewModel.onBottomSheetPageChange(BottomSheetScreen.About)
Expand Down
6 changes: 2 additions & 4 deletions testomania/src/main/java/com/earth/testomania/result_screen/presentation/ResultScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ import com.earth.testomania.result_screen.domain.model.IncorrectAnsweredQuestion
import com.earth.testomania.result_screen.domain.model.ResultData
import com.ramcosta.composedestinations.annotation.Destination
import kiwi.orbit.compose.ui.OrbitTheme
import kiwi.orbit.compose.ui.controls.Card
import kiwi.orbit.compose.ui.controls.SurfaceCard
import kiwi.orbit.compose.ui.controls.LinearProgressIndicator
import kiwi.orbit.compose.ui.controls.Text
import kotlin.math.roundToInt

@Preview(showSystemUi = true)
@Destination(
route = "home/result"
)
Expand Down Expand Up @@ -92,7 +91,7 @@ fun PrevIncorrect() {

@Composable
fun IncorrectAnsweredQuestion(item: IncorrectAnsweredQuestionModel) {
Card(
SurfaceCard (
modifier = Modifier
.padding(0.dp, 6.dp)
.fillMaxWidth(),
Expand Down Expand Up @@ -143,7 +142,6 @@ fun IncorrectAnsweredQuestion(item: IncorrectAnsweredQuestionModel) {
}
}

@Preview
@Composable
fun MainResultItem(
testIconRes: Int,
Expand Down
32 changes: 16 additions & 16 deletions .../src/main/java/com/earth/testomania/technical/presentation/CategorySelectorBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ fun CategorySelectorBottomSheet(
ChoiceTile(
modifier = Modifier
.fillMaxWidth()
//do not like to hardcode height, but no choice because of Kiwi's ChoiceTile
.height(58.dp) //TODO needs to be checked in case fo different font sizes
.wrapContentHeight()
.padding(
start = 10.dp,
end = 10.dp,
Expand All @@ -58,22 +57,23 @@ fun CategorySelectorBottomSheet(
largeHeading = false,
onSelect = {
callBack(it)
}) {
},
content = {
Row(
modifier = Modifier.fillMaxSize(),
horizontalArrangement = Arrangement.SpaceBetween,
) {

Row(
modifier = Modifier.fillMaxSize(),
horizontalArrangement = Arrangement.SpaceBetween,
) {
Text(
textAlign = TextAlign.Center,
text = it.name,
fontWeight = FontWeight.Bold,
fontSize = 16.sp
)

Text(
text = it.name,
fontWeight = FontWeight.Bold,
fontSize = 16.sp
)

RightPointingAngle()
}
}
RightPointingAngle()
}
})
}
}

Expand Down