-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
268 additions
and
217 deletions.
There are no files selected for viewing
42 changes: 42 additions & 0 deletions
42
...illApp/src/main/java/org/hyperskill/app/android/challenge/ui/AnnouncementChallengeCard.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package org.hyperskill.app.android.challenge.ui | ||
|
||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import org.hyperskill.app.android.core.view.ui.widget.compose.HyperskillTheme | ||
|
||
@Composable | ||
fun AnnouncementChallengeCard( | ||
title: String, | ||
dateText: String, | ||
description: String, | ||
timeTitle: String, | ||
timeSubtitle: String, | ||
modifier: Modifier = Modifier | ||
) { | ||
ChallengeScaffold(modifier) { | ||
ChallengeHeader( | ||
title = title, | ||
dateText = dateText, | ||
imageRes = org.hyperskill.app.android.R.drawable.img_challenge_announcment, | ||
modifier = Modifier.fillMaxWidth() | ||
) | ||
ChallengeDescription(description) | ||
ChallengeTimeText(title = timeTitle, subtitle = timeSubtitle) | ||
} | ||
} | ||
|
||
@Preview() | ||
@Composable | ||
private fun AnnouncementChallengeCardPreview() { | ||
HyperskillTheme { | ||
AnnouncementChallengeCard( | ||
title = ChallengeCardPreviewValues.TITLE, | ||
dateText = ChallengeCardPreviewValues.DATE_TEXT, | ||
description = ChallengeCardPreviewValues.DESCRIPTION, | ||
timeTitle = ChallengeCardPreviewValues.TIME_TITLE, | ||
timeSubtitle = ChallengeCardPreviewValues.TIME_SUBTITLE | ||
) | ||
} | ||
} |
217 changes: 0 additions & 217 deletions
217
androidHyperskillApp/src/main/java/org/hyperskill/app/android/challenge/ui/ChallengeCard.kt
This file was deleted.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
...erskillApp/src/main/java/org/hyperskill/app/android/challenge/ui/ChallengeCardDefaults.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package org.hyperskill.app.android.challenge.ui | ||
|
||
import androidx.compose.foundation.layout.PaddingValues | ||
import androidx.compose.ui.unit.dp | ||
|
||
object ChallengeCardDefaults { | ||
val paddingValues: PaddingValues = PaddingValues(20.dp) | ||
} |
9 changes: 9 additions & 0 deletions
9
...llApp/src/main/java/org/hyperskill/app/android/challenge/ui/ChallengeCardPreviewValues.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package org.hyperskill.app.android.challenge.ui | ||
|
||
object ChallengeCardPreviewValues { | ||
const val TITLE = "Advent Streak Challenge" | ||
const val DATE_TEXT = "6 Oct - 12 Oct" | ||
const val DESCRIPTION = "Get ready to push your limits! Thrilling daily programming competition designed to test your coding skills and problem-solving abilities. What to Expect" | ||
const val TIME_TITLE = "Start in" | ||
const val TIME_SUBTITLE = "6 hrs 27 mins" | ||
} |
39 changes: 39 additions & 0 deletions
39
...HyperskillApp/src/main/java/org/hyperskill/app/android/challenge/ui/ChallengeDateLabel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package org.hyperskill.app.android.challenge.ui | ||
|
||
import androidx.compose.foundation.background | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.foundation.shape.RoundedCornerShape | ||
import androidx.compose.material.MaterialTheme | ||
import androidx.compose.material.Text | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.draw.clip | ||
import androidx.compose.ui.res.colorResource | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import androidx.compose.ui.unit.dp | ||
import org.hyperskill.app.R | ||
import org.hyperskill.app.android.core.view.ui.widget.compose.HyperskillTheme | ||
|
||
@Composable | ||
fun ChallengeDateLabel( | ||
text: String, | ||
modifier: Modifier = Modifier | ||
) { | ||
Text( | ||
text = text, | ||
modifier = modifier | ||
.clip(RoundedCornerShape(4.dp)) | ||
.background(colorResource(R.color.color_overlay_blue_alpha_12)) | ||
.padding(horizontal = 8.dp, vertical = 4.dp), | ||
style = MaterialTheme.typography.caption, | ||
color = colorResource(R.color.color_primary) | ||
) | ||
} | ||
|
||
@Preview | ||
@Composable | ||
private fun DateLabelPreview() { | ||
HyperskillTheme { | ||
ChallengeDateLabel("6 Oct - 12 Oct") | ||
} | ||
} |
33 changes: 33 additions & 0 deletions
33
...perskillApp/src/main/java/org/hyperskill/app/android/challenge/ui/ChallengeDescription.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package org.hyperskill.app.android.challenge.ui | ||
|
||
import androidx.compose.material.MaterialTheme | ||
import androidx.compose.material.Text | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.res.colorResource | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import org.hyperskill.app.R | ||
import org.hyperskill.app.android.core.view.ui.widget.compose.HyperskillTheme | ||
|
||
@Composable | ||
fun ChallengeDescription( | ||
description: String, | ||
modifier: Modifier = Modifier | ||
) { | ||
Text( | ||
text = description, | ||
modifier = modifier, | ||
style = MaterialTheme.typography.body1, | ||
color = colorResource(id = R.color.color_on_surface_alpha_60) | ||
) | ||
} | ||
|
||
@Preview | ||
@Composable | ||
fun ChallengeDescriptionPreview() { | ||
HyperskillTheme { | ||
ChallengeDescription( | ||
description = ChallengeCardPreviewValues.DESCRIPTION | ||
) | ||
} | ||
} |
Oops, something went wrong.