Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import org.junit.Test
class CalendarTest {

@get:Rule
val composeTestRule = createComposeRule(disableTransitions = true)
val composeTestRule = createComposeRule()

var dateSelected = ""
private val onDayClicked: (CalendarDay, CalendarMonth) -> Unit = { day, month ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import org.junit.Test
class HomeTest {

@get:Rule
val composeTestRule = createComposeRule(disableTransitions = true)
val composeTestRule = createComposeRule()

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import androidx.annotation.DrawableRes
import androidx.compose.foundation.AmbientContentColor
import androidx.compose.foundation.BaseTextField
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Icon
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.runtime.Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.material.Button
import androidx.compose.material.ButtonConstants
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -163,8 +164,10 @@ private fun ZoomControls(
private fun ZoomButton(text: String, onClick: () -> Unit) {
Button(
modifier = Modifier.padding(8.dp),
backgroundColor = MaterialTheme.colors.onPrimary,
contentColor = MaterialTheme.colors.primary,
colors = ButtonConstants.defaultButtonColors(
backgroundColor = MaterialTheme.colors.onPrimary,
contentColor = MaterialTheme.colors.primary
),
onClick = onClick
) {
Text(text = text, style = MaterialTheme.typography.h5)
Expand Down
2 changes: 1 addition & 1 deletion Crane/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '5.1.1'
id 'com.diffplug.spotless' version '5.7.0'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha14"
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
const val googleMaps = "com.google.android.libraries.maps:maps:3.1.0-beta"

object Accompanist {
private const val version = "0.3.1"
private const val version = "0.3.2.compose-6922857-SNAPSHOT"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
}

Expand All @@ -39,8 +39,8 @@ object Libs {

object AndroidX {
object Compose {
const val snapshot = ""
const val version = "1.0.0-alpha05"
const val snapshot = "6922857"
const val version = "1.0.0-SNAPSHOT"

const val runtime = "androidx.compose.runtime:runtime:$version"
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
Expand Down Expand Up @@ -71,5 +71,5 @@ object Libs {
object Urls {
const val mavenCentralSnapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
const val composeSnapshotRepo = "https://androidx-dev-prod.appspot.com/snapshots/builds/" +
"${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
"${Libs.AndroidX.Compose.snapshot}/artifacts/repository/"
}
6 changes: 3 additions & 3 deletions Crane/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jun 15 11:35:59 CEST 2020
#Fri Oct 23 09:30:32 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME