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

Jump to bottom

Use compose.components.resources for typography #459

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Use compose.components.resources for typography #459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35460de
Update composeMultiplatform to 1.6.0-dev1383 and remove materialIcons…
serbelga Jan 22, 2024
008a3c7
Add new format_color_reset.xml and downgrade composeMultiplatform to …
serbelga Jan 22, 2024
c16a609
Run spotlessApply
serbelga Jan 22, 2024
b4bdfa4
Use compose.components.resources for typography
serbelga Jan 22, 2024
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
Prev Previous commit
Next Next commit
Add new format_color_reset.xml and downgrade composeMultiplatform to … 
…1.6.0-dev1362
  • Loading branch information
@serbelga
serbelga committed Jan 22, 2024
commit 008a3c715d6645f9274d093e3c4851c0bdd9397e
5 changes: 2 additions & 3 deletions ...i/src/commonMain/kotlin/dev/sergiobelda/todometer/app/common/ui/components/TagSelector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.rounded.FormatColorReset
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
Expand All @@ -44,9 +43,9 @@ import dev.sergiobelda.todometer.app.common.designsystem.theme.TodometerTheme
import dev.sergiobelda.todometer.app.common.ui.mapper.composeColorOf
import dev.sergiobelda.todometer.common.designsystem.resources.images.Images
import dev.sergiobelda.todometer.common.designsystem.resources.images.icons.Check
import dev.sergiobelda.todometer.common.designsystem.resources.images.icons.FormatColorReset
import dev.sergiobelda.todometer.common.domain.model.Tag
import dev.sergiobelda.todometer.common.resources.TodometerResources
import androidx.compose.material.icons.Icons as MaterialIcons

@Composable
fun TagSelector(selectedTag: Tag, onSelected: (Tag) -> Unit) {
Expand Down Expand Up @@ -116,7 +115,7 @@ private fun TagItem(
}
if (tag == Tag.UNSPECIFIED && !selected) {
Icon(
MaterialIcons.Rounded.FormatColorReset,
Images.Icons.FormatColorReset,
null,
tint = MaterialTheme.colorScheme.onBackground
)
Expand Down
10 changes: 10 additions & 0 deletions common/designsystem-resources/xml-images/icons/format_color_reset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M770,656L708,596Q714,579 717,561.5Q720,544 720,524Q720,477 702.5,435Q685,393 650,360L480,192L392,278L336,222L480,80L706,302Q750,344 775,401.5Q800,459 800,524Q800,560 792,593Q784,626 770,656ZM792,904L668,780Q627,809 580,824.5Q533,840 480,840Q347,840 253.5,747.5Q160,655 160,524Q160,473 176,426Q192,379 224,336L56,168L112,112L848,848L792,904ZM480,760Q516,760 548.5,750Q581,740 610,722L280,394Q259,426 249.5,458Q240,490 240,524Q240,622 310,691Q380,760 480,760ZM443,556L443,556Q443,556 443,556Q443,556 443,556Q443,556 443,556Q443,556 443,556Q443,556 443,556Q443,556 443,556ZM553,440L553,440L553,440L553,440Q553,440 553,440Q553,440 553,440Q553,440 553,440Q553,440 553,440Z"/>
</vector>
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 @@ -11,7 +11,7 @@ androidWearTargetSdk = "33"
animationGraphicsAndroid = "1.5.4"
appcompat = "1.6.1"
composeCompiler = "1.5.7"
composeMultiplatform = "1.6.0-dev1383"
composeMultiplatform = "1.6.0-dev1362"
composeVectorize = "0.1.0"
dataStore = "1.1.0-beta01"
dependencyGraphGenerator = "0.8.0"
Expand Down
Loading