Skip to content

Commit 8195b69

Browse files
committed
Merge remote-tracking branch 'origin/main' into docs/release-preparation
2 parents ccc206d + 383a44f commit 8195b69

File tree

10 files changed

+99
-9
lines changed

10 files changed

+99
-9
lines changed

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525
run: ./gradlew detekt
2626

2727
- name: Run Tests
28-
run: ./gradlew test
28+
run: ./gradlew testDebug

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
/.idea/workspace.xml
99
/.idea/navEditor.xml
1010
/.idea/assetWizardSettings.xml
11+
<<<<<<< HEAD
1112
/.idea/misc.xml
1213
/.idea/deploymentTargetDropDown.xml
1314
/.idea/deploymentTargetSelector.xml
15+
=======
16+
/.idea/*
17+
>>>>>>> origin/main
1418
.DS_Store
1519
/build
1620
/captures
@@ -19,10 +23,9 @@
1923
local.properties
2024
/build-logic/convention/build/
2125

22-
2326
# Documentation not to be modified by hand (pulled from root project)
2427
docs/index.md
2528
docs/changelog.md
2629
docs/contributing.md
2730
docs/license.md
28-
docs/api/*
31+
docs/api/*

.idea/deploymentTargetSelector.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/src/main/java/io/monstarlab/mosaic/features/SliderDemo.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ fun MosaicSliderDemo() {
100100
modifier = modifier,
101101
enabled = enabled,
102102
colors = colors,
103+
103104
range = 0f..1000f,
104105
disabledRange = 50f..300f,
105106
valueDistribution = if (linearDistribution) {

docs/assets/favicon.ico

1.28 KB
Binary file not shown.

docs/assets/logo.png

12 KB
Loading

docs/stylesheets/extra.css

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
:root {
22

3+
<<<<<<< HEAD
34
/* Primary color shades - NavBar */
45
--md-primary-fg-color: black;
56
--md-primary-bg-color: white;
@@ -46,4 +47,47 @@
4647
--md-code-hl-comment-color: #6A8759;
4748
--md-code-hl-generic-color: #A9B7C5;
4849
--md-code-hl-variable-color: #A9B7C5;
50+
=======
51+
/* Primary color shades - NavBar */
52+
--md-primary-fg-color: yellow;
53+
--md-primary-bg-color: black;
54+
55+
/* Accent color shades - Hover effects */
56+
--md-accent-fg-color: yellow;
57+
--md-accent-fg-color--transparent: white;
58+
--md-accent-bg-color: white;
59+
}
60+
61+
:root > * {
62+
/* background color */
63+
--md-default-bg-color: #343434;
64+
65+
/* default text color */
66+
--md-typeset-color: white;
67+
68+
69+
--md-footer-fg-color: yellow;
70+
--md-footer-bg-color: black;
71+
72+
/* color for markdown code blocks */
73+
--md-code-fg-color: yellow;
74+
--md-code-bg-color: #2B2B2B;
75+
76+
/* color for markdown headers */
77+
--md-default-fg-color--light: white;
78+
79+
/* color for code highlighting, works kinda like Dracula Theme */
80+
--md-code-hl-number-color: #A9B7C5;
81+
--md-code-hl-special-color: #A9B7C5;
82+
--md-code-hl-function-color: #A9B7C5;
83+
--md-code-hl-constant-color: #A9B7C5;
84+
--md-code-hl-keyword-color: #CB7832;
85+
--md-code-hl-string-color: #6A8759;
86+
--md-code-hl-name-color: #A9B7C5;
87+
--md-code-hl-operator-color: #A9B7C5;
88+
--md-code-hl-punctuation-color: #A9B7C5;
89+
--md-code-hl-comment-color: #6A8759;
90+
--md-code-hl-generic-color: #A9B7C5;
91+
--md-code-hl-variable-color: #A9B7C5;
92+
>>>>>>> origin/main
4993
}

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
2-
agp = "8.2.0"
2+
agp = "8.3.2"
33
kotlin = "1.9.0"
44
coreKtx = "1.12.0"
55
junit = "4.13.2"
66
junitVersion = "1.1.5"
77
espresso = "3.5.1"
88
lifecyle = "2.7.0"
9-
activityCompose = "1.8.2"
109
composeCompiler = "1.5.1"
11-
composeBom = "2024.02.00"
10+
activityCompose = "1.9.0"
11+
composeBom = "2024.04.01"
1212
spotless="6.25.0"
1313
detekt="1.23.5"
1414
gradle-maven-publsih ="0.28.0"

mkdocs.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ extra_css:
77
theme:
88
logo: assets/logo.svg
99
favicon: assets/favicon.png
10+
repo_url: https://github.com/monstar-lab-oss/android-mosaic
11+
12+
13+
extra_css:
14+
- stylesheets/extra.css
15+
theme:
16+
logo: assets/logo.png
17+
favicon: assets/favicon.ico
18+
19+
features:
20+
- navigation.instant
21+
- navigation.instant.prefetch
22+
- navigation.path
23+
- navigation.sections
24+
- navigation.sections.expand
25+
>>>>>>> origin/main
1026
name: material
1127
font:
1228
text: 'Arimo'
@@ -15,6 +31,7 @@ theme:
1531

1632
palette:
1733
primary: custom
34+
<<<<<<< HEAD
1835
nav:
1936
- 'Home': index.md
2037
- 'Slider':
@@ -23,13 +40,25 @@ nav:
2340
- 'Changelog': changelog.md
2441

2542

43+
=======
44+
accent: custom
45+
46+
nav:
47+
- 'API': api/
48+
- 'Changelog': changelog.md
49+
50+
>>>>>>> origin/main
2651
markdown_extensions:
2752
- pymdownx.highlight:
2853
anchor_linenums: true
2954
line_spans: __span
3055
pygments_lang_class: true
3156
- pymdownx.inlinehilite
3257
- pymdownx.snippets
58+
<<<<<<< HEAD
3359
- pymdownx.superfences
3460
- admonition
3561

62+
=======
63+
- pymdownx.superfences
64+
>>>>>>> origin/main

slider/src/test/java/io/monstarlab/mosaic/slider/CheckPointsValueDistributionTest.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package io.monstarlab.mosaic.slider
22

3+
<<<<<<< HEAD
34
import io.monstarlab.mosaic.slider.distribution.CheckPointsValuesDistribution
5+
=======
6+
>>>>>>> origin/main
47
import org.junit.After
58
import org.junit.Assert.assertEquals
69
import org.junit.Assert.assertThrows
@@ -9,12 +12,20 @@ import org.junit.Test
912

1013
class CheckPointsValueDistributionTest {
1114

15+
<<<<<<< HEAD
1216
private lateinit var checkPointsValueDistribution: CheckPointsValuesDistribution
17+
=======
18+
private lateinit var checkPointsValueDistribution: CheckPointsValueDistribution
19+
>>>>>>> origin/main
1320
private val accuracy = 0.0001f
1421

1522
@Before
1623
fun setUp() {
24+
<<<<<<< HEAD
1725
checkPointsValueDistribution = CheckPointsValuesDistribution(
26+
=======
27+
checkPointsValueDistribution = CheckPointsValueDistribution(
28+
>>>>>>> origin/main
1829
listOf(
1930
0f to 0f,
2031
25f to 25f,
@@ -30,8 +41,13 @@ class CheckPointsValueDistributionTest {
3041

3142
@Test
3243
fun `test create from pairs with decreasing value`() {
44+
<<<<<<< HEAD
3345
assertThrows(CheckPointsValuesDistribution.DecreasingValueException::class.java) {
3446
CheckPointsValuesDistribution(
47+
=======
48+
assertThrows(CheckPointsValueDistribution.DecreasingValueException::class.java) {
49+
CheckPointsValueDistribution(
50+
>>>>>>> origin/main
3551
listOf(
3652
0f to 0f,
3753
5f to 10f,

0 commit comments

Comments
 (0)