Skip to content

Commit

Permalink
Simplify depenencies and CI (#207)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kanialdo authored Mar 5, 2024
1 parent a024fa1 commit 2a502ec
Show file tree
Hide file tree
Showing 19 changed files with 800 additions and 87 deletions.
97 changes: 97 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
name: CI

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:

detekt:
name: Detekt
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- name: Change wrapper permissions
run: chmod +x ./gradlew
- name: Detekt
uses: gradle/gradle-build-action@v3
with:
arguments: detekt

assemble-lib:
name: Assemble Lib
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- name: Change wrapper permissions
run: chmod +x ./gradlew
- name: Assemble
uses: gradle/gradle-build-action@v3
with:
arguments: :lib:assemble

tests:
name: Test
needs: [ assemble-lib ]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- name: Change wrapper permissions
run: chmod +x ./gradlew
- name: Assemble
uses: gradle/gradle-build-action@v3
with:
arguments: allTests

assemble-demo:
name: Assemble Demo
needs: [ assemble-lib ]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- name: Change wrapper permissions
run: chmod +x ./gradlew
- name: Assemble Desktop
uses: gradle/gradle-build-action@v3
with:
arguments: :demo-desktop:assemble
- name: Assemble Android
uses: gradle/gradle-build-action@v3
with:
arguments: :demo-android:assemble
- name: Assemble Web
uses: gradle/gradle-build-action@v3
with:
arguments: :demo-web:assemble
31 changes: 0 additions & 31 deletions .github/workflows/verify-main.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/verify.yml

This file was deleted.

5 changes: 5 additions & 0 deletions demo-shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ kotlin {
dependencies {
api(projects.lib)
api(libs.kotlinx.datetime)
api(compose.animation)
api(compose.runtime)
api(compose.foundation)
api(compose.material)
api(compose.ui)
}
}
val commonTest by getting {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import androidx.compose.foundation.layout.*
import androidx.compose.material.*
import androidx.compose.material.MaterialTheme.typography
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.*
import androidx.compose.material.icons.filled.ArrowDropDown
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp
import pl.krystiankaniowski.composecharts.icons.*
import pl.krystiankaniowski.composecharts.views.*
import pl.krystiankaniowski.composecharts.views.circular.*
import pl.krystiankaniowski.composecharts.views.line.LineChartCustomDemo
Expand All @@ -27,7 +28,7 @@ sealed interface MenuEntry {

val menuItems = listOf<MenuEntry>(
MenuEntry.Section(
icon = Icons.Default.BarChart,
icon = Icons.ColumnChart,
title = "Column",
items = listOf(
MenuEntry.MenuItem(title = "Column grouped", screen = { ColumnGroupedChartDemo() }),
Expand All @@ -36,7 +37,7 @@ val menuItems = listOf<MenuEntry>(
),
),
MenuEntry.Section(
icon = Icons.Default.Sort,
icon = Icons.BarChart,
title = "Bar",
items = listOf(
MenuEntry.MenuItem(title = "Bar grouped", screen = { BarGroupedChartDemo() }),
Expand All @@ -45,23 +46,23 @@ val menuItems = listOf<MenuEntry>(
),
),
MenuEntry.Section(
icon = Icons.Default.ShowChart,
icon = Icons.LineChart,
title = "Line",
items = listOf(
MenuEntry.MenuItem(title = "Line", screen = { LineChartDemo() }),
MenuEntry.MenuItem(title = "Line custom", screen = { LineChartCustomDemo() }),
),
),
MenuEntry.Section(
icon = Icons.Default.BubbleChart,
icon = Icons.PointChart,
title = "Point",
items = listOf(
MenuEntry.MenuItem(title = "Point chart", screen = { PointChartDemo() }),
MenuEntry.MenuItem(title = "Point chart custom", screen = { PointChartCustomDemo() }),
),
),
MenuEntry.Section(
icon = Icons.Default.AreaChart,
icon = Icons.AreaChart,
title = "Area",
items = listOf(
MenuEntry.MenuItem(title = "Area overlapping", screen = { AreaOverlappingChartDemo() }),
Expand All @@ -70,7 +71,7 @@ val menuItems = listOf<MenuEntry>(
),
),
MenuEntry.Section(
icon = Icons.Default.PieChart,
icon = Icons.CircularChart,
title = "Circular",
items = listOf(
MenuEntry.MenuItem(title = "Pie", screen = { PieChartDemo() }),
Expand All @@ -81,7 +82,7 @@ val menuItems = listOf<MenuEntry>(
),
),
MenuEntry.Section(
icon = Icons.Default.Feed,
icon = Icons.Legend,
title = "Legend",
items = listOf(
MenuEntry.MenuItem(title = "Legend", screen = { LegendDemoView() }),
Expand Down Expand Up @@ -129,7 +130,7 @@ fun ColumnScope.Section(section: MenuEntry.Section, currentMenuItem: MenuEntry.M
)
Spacer(modifier = Modifier.width(16.dp))
Icon(
imageVector = if (isExpanded) Icons.Default.ArrowDropUp else Icons.Default.ArrowDropDown,
imageVector = if (isExpanded) Icons.ArrowDropUp else Icons.Default.ArrowDropDown,
contentDescription = null,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ package pl.krystiankaniowski.composecharts.components
import androidx.compose.material.Button
import androidx.compose.material.Icon
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.*
import androidx.compose.material.icons.filled.Add
import androidx.compose.runtime.Composable
import kotlinx.datetime.Clock
import pl.krystiankaniowski.composecharts.icons.AddDataSet
import pl.krystiankaniowski.composecharts.icons.Randomize
import pl.krystiankaniowski.composecharts.icons.Remove
import pl.krystiankaniowski.composecharts.icons.RemoveDataSet
import kotlin.random.Random

@Composable
Expand All @@ -14,7 +18,7 @@ fun OptionRandomize(onClick: (Random) -> Unit) {
Button(
onClick = { onClick(random) },
// content = { Text("Randomize") },
content = { Icon(imageVector = Icons.Default.Casino, contentDescription = "Randomize") },
content = { Icon(imageVector = Icons.Randomize, contentDescription = "Randomize") },
)
}

Expand All @@ -33,7 +37,7 @@ fun OptionRemoveData(onClick: () -> Unit) {
Button(
onClick = onClick,
// content = { Text("Remove data") },
content = { Icon(imageVector = Icons.Default.Remove, contentDescription = "Remove data") },
content = { Icon(imageVector = Icons.Remove, contentDescription = "Remove data") },
)
}

Expand All @@ -43,7 +47,7 @@ fun OptionAddDataSet(onClick: (Random) -> Unit) {
Button(
onClick = { onClick(random) },
// content = { Text("Add data set") },
content = { Icon(imageVector = Icons.Default.PlaylistAdd, contentDescription = "Add data set") },
content = { Icon(imageVector = Icons.AddDataSet, contentDescription = "Add data set") },
)
}

Expand All @@ -52,6 +56,6 @@ fun OptionRemoveDataSet(onClick: () -> Unit) {
Button(
onClick = onClick,
// content = { Text("Remove data set") },
content = { Icon(imageVector = Icons.Default.PlaylistRemove, contentDescription = "Remove data set") },
content = { Icon(imageVector = Icons.RemoveDataSet, contentDescription = "Remove data set") },
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright 2024 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package pl.krystiankaniowski.composecharts.icons

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.materialIcon
import androidx.compose.material.icons.materialPath
import androidx.compose.ui.graphics.vector.ImageVector

public val Icons.AddDataSet: ImageVector
get() {
if (_playlistAdd != null) {
return _playlistAdd!!
}
_playlistAdd = materialIcon(name = "AutoMirrored.Filled.PlaylistAdd", autoMirror = true) {
materialPath {
moveTo(14.0f, 10.0f)
horizontalLineTo(3.0f)
verticalLineToRelative(2.0f)
horizontalLineToRelative(11.0f)
verticalLineTo(10.0f)
close()
moveTo(14.0f, 6.0f)
horizontalLineTo(3.0f)
verticalLineToRelative(2.0f)
horizontalLineToRelative(11.0f)
verticalLineTo(6.0f)
close()
moveTo(18.0f, 14.0f)
verticalLineToRelative(-4.0f)
horizontalLineToRelative(-2.0f)
verticalLineToRelative(4.0f)
horizontalLineToRelative(-4.0f)
verticalLineToRelative(2.0f)
horizontalLineToRelative(4.0f)
verticalLineToRelative(4.0f)
horizontalLineToRelative(2.0f)
verticalLineToRelative(-4.0f)
horizontalLineToRelative(4.0f)
verticalLineToRelative(-2.0f)
horizontalLineTo(18.0f)
close()
moveTo(3.0f, 16.0f)
horizontalLineToRelative(7.0f)
verticalLineToRelative(-2.0f)
horizontalLineTo(3.0f)
verticalLineTo(16.0f)
close()
}
}
return _playlistAdd!!
}

private var _playlistAdd: ImageVector? = null
Loading

0 comments on commit 2a502ec

Please sign in to comment.