diff --git a/app/src/main/java/github/leavesc/compose_tetris/ui/TetrisButton.kt b/app/src/main/java/github/leavesc/compose_tetris/ui/TetrisButton.kt index cf78167bea487e30b390cac5c11f53a9aafd5899..3f496a4d877f4360803a810fdcaa4f59393175eb 100644 --- a/app/src/main/java/github/leavesc/compose_tetris/ui/TetrisButton.kt +++ b/app/src/main/java/github/leavesc/compose_tetris/ui/TetrisButton.kt @@ -75,45 +75,61 @@ fun TetrisButton( ) { val (leftBtn, rightBtn, fastDownBtn, rotateBtn, fallBtn) = createRefs() val innerMargin = 24.dp - PlayButton(icon = "◀", modifier = Modifier.constrainAs(leftBtn) { - start.linkTo(anchor = parent.start) - top.linkTo(anchor = parent.top) - end.linkTo(anchor = rightBtn.start, margin = innerMargin) - }) { - playListener.onTransformation(Left) - } - PlayButton(icon = "▶", modifier = Modifier.constrainAs(rightBtn) { - start.linkTo(anchor = leftBtn.end, margin = innerMargin) - top.linkTo(anchor = leftBtn.top) - bottom.linkTo(anchor = leftBtn.bottom) - }) { - playListener.onTransformation(Right) - } PlayButton( icon = "Rotate", fontSize = 18.sp, modifier = Modifier.constrainAs(rotateBtn) { - top.linkTo(anchor = rightBtn.top) - start.linkTo(anchor = rightBtn.end, margin = innerMargin) + /* + start: 左 + end: 右 + top: 上 + bottom: 下 + margin: 内边距 + */ + start.linkTo(anchor = leftBtn.start) + end.linkTo(anchor = rightBtn.end) + top.linkTo(anchor = parent.top) + bottom.linkTo(anchor = leftBtn.top) }) { playListener.onTransformation(Rotate) } - PlayButton(icon = "▼", modifier = Modifier.constrainAs(fastDownBtn) { - top.linkTo(anchor = leftBtn.bottom) - start.linkTo(anchor = leftBtn.start) - end.linkTo(anchor = rightBtn.end) - }) { - playListener.onTransformation(FastDown) - } PlayButton( - icon = "▼\n▼", + icon = "✔", modifier = Modifier.constrainAs(fallBtn) { - top.linkTo(anchor = fastDownBtn.top) - start.linkTo(anchor = rightBtn.end) - end.linkTo(anchor = rotateBtn.start) + start.linkTo(anchor = rotateBtn.end, margin = innerMargin) + top.linkTo(anchor = parent.top) }) { playListener.onTransformation(Fall) } + PlayButton( + icon = "◀", + modifier = Modifier.constrainAs(leftBtn) { + start.linkTo(anchor = parent.start) + end.linkTo(anchor = rightBtn.start, margin = innerMargin) + top.linkTo(anchor = rotateBtn.bottom) + }) { + playListener.onTransformation(Left) + } + PlayButton( + icon = "▶", + modifier = Modifier.constrainAs(rightBtn) { + start.linkTo(anchor = leftBtn.end, margin = innerMargin) + top.linkTo(anchor = leftBtn.top) + bottom.linkTo(anchor = leftBtn.bottom) + }) { + playListener.onTransformation(Right) + } + + PlayButton( + icon = "▼", + modifier = Modifier.constrainAs(fastDownBtn) { + start.linkTo(anchor = rightBtn.end, margin = innerMargin) + top.linkTo(anchor = leftBtn.top) + bottom.linkTo(anchor = leftBtn.bottom) + }) { + playListener.onTransformation(FastDown) + } + } } diff --git a/app/src/main/java/github/leavesc/compose_tetris/ui/theme/Color.kt b/app/src/main/java/github/leavesc/compose_tetris/ui/theme/Color.kt index 42da582d852982842b4c2f928edc21b93095a8f2..8b047c2a9f9ff750a779ae4f18653ec8cb53a395 100644 --- a/app/src/main/java/github/leavesc/compose_tetris/ui/theme/Color.kt +++ b/app/src/main/java/github/leavesc/compose_tetris/ui/theme/Color.kt @@ -9,8 +9,8 @@ val Teal200 = Color(0xFF03DAC5) val BodyBackground = Color(0xF2FFD600) val ScreenBackground = Color(0xff9ead86) -val PlayButtonColor = Color(0xFF388E3C) -val PlayButtonColor2 = Color(0xFF00796B) -val PlayButtonColor3 = Color(0xFF26A69A) +val PlayButtonColor = Color(0xF2FDDF3A) +val PlayButtonColor2 = Color(0xF2C5A708) +val PlayButtonColor3 = Color(0xF2947C01) val BrickAlpha = Color.Black.copy(alpha = 0.2f) val BrickFill = Color.Black.copy(alpha = 0.9f) \ No newline at end of file diff --git a/daemon/7.0/registry.bin b/daemon/7.0/registry.bin index 1fb06042815eb2a856bcab99af77d1c032115ad0..e2328cf2d2c0c05417611bd46af4d363578a7214 100644 Binary files a/daemon/7.0/registry.bin and b/daemon/7.0/registry.bin differ diff --git a/daemon/7.0/registry.bin.lock b/daemon/7.0/registry.bin.lock index 3f503ac2d5ba562368adc95b657ce354952eab73..9fb7fa06fba14b0d77daacc063c2f2a1b7e43d09 100644 Binary files a/daemon/7.0/registry.bin.lock and b/daemon/7.0/registry.bin.lock differ diff --git a/kotlin-profile/2021-07-31-16-29-13-118.profile b/kotlin-profile/2021-07-31-22-20-09-318.profile similarity index 41% rename from kotlin-profile/2021-07-31-16-29-13-118.profile rename to kotlin-profile/2021-07-31-22-20-09-318.profile index 9331ea119d4867e651c2bd7e88a6b292bdb9be65..972c79ed184b5c3224048d061ff10da01dc8daa8 100644 --- a/kotlin-profile/2021-07-31-16-29-13-118.profile +++ b/kotlin-profile/2021-07-31-22-20-09-318.profile @@ -1,39 +1,70 @@ -BUILD_FINISH_TIME=1627720180481 +BUILD_FINISH_TIME=1627741212965 CONFIGURATION_API_COUNT=1 CONFIGURATION_IMPLEMENTATION_COUNT=1 CPU_NUMBER_OF_CORES=12 -GRADLE_BUILD_DURATION=27562 -GRADLE_BUILD_NUMBER_IN_CURRENT_DAEMON=2 -GRADLE_DAEMON_HEAP_SIZE=2295932572 -GRADLE_EXECUTION_DURATION=27363 -GRADLE_NUMBER_OF_TASKS=274 -GRADLE_NUMBER_OF_UNCONFIGURED_TASKS=209 +GRADLE_BUILD_DURATION=3769 +GRADLE_BUILD_NUMBER_IN_CURRENT_DAEMON=13 +GRADLE_DAEMON_HEAP_SIZE=2348120482 +GRADLE_EXECUTION_DURATION=3647 +GRADLE_NUMBER_OF_TASKS=279 +GRADLE_NUMBER_OF_UNCONFIGURED_TASKS=218 NUMBER_OF_SUBPROJECTS=2 -STATISTICS_VISIT_ALL_PROJECTS_OVERHEAD=2 -BUILD_FAILED=true +STATISTICS_COLLECT_METRICS_OVERHEAD=1 +STATISTICS_VISIT_ALL_PROJECTS_OVERHEAD=0 +BUILD_FAILED=false +EXECUTED_FROM_IDEA=true +JVM_COMPILER_IR_MODE=true +KOTLIN_KTS_USED=false +KOTLIN_OFFICIAL_CODESTYLE=true +KOTLIN_PROGRESSIVE_MODE=false +GRADLE_VERSION=7.0.0 +JVM_DEFAULTS=disable +KOTLIN_COMPILER_VERSION=1.5.10 +KOTLIN_STDLIB_VERSION=1.5.10 +OS_TYPE=Windows 10 +PROJECT_PATH=D:\CyberAngel\gitee\android_tetris +USE_OLD_BACKEND=false +BUILD FINISHED +BUILD_FINISH_TIME=1627741564335 +CONFIGURATION_API_COUNT=1 +CONFIGURATION_IMPLEMENTATION_COUNT=1 +CPU_NUMBER_OF_CORES=12 +GRADLE_BUILD_DURATION=2359 +GRADLE_BUILD_NUMBER_IN_CURRENT_DAEMON=14 +GRADLE_DAEMON_HEAP_SIZE=2270641984 +GRADLE_EXECUTION_DURATION=2230 +GRADLE_NUMBER_OF_TASKS=284 +GRADLE_NUMBER_OF_UNCONFIGURED_TASKS=224 +NUMBER_OF_SUBPROJECTS=2 +STATISTICS_COLLECT_METRICS_OVERHEAD=1 +STATISTICS_VISIT_ALL_PROJECTS_OVERHEAD=1 +BUILD_FAILED=false EXECUTED_FROM_IDEA=true +JVM_COMPILER_IR_MODE=true KOTLIN_KTS_USED=false KOTLIN_OFFICIAL_CODESTYLE=true KOTLIN_PROGRESSIVE_MODE=false GRADLE_VERSION=7.0.0 +JVM_DEFAULTS=disable KOTLIN_COMPILER_VERSION=1.5.10 KOTLIN_STDLIB_VERSION=1.5.10 OS_TYPE=Windows 10 PROJECT_PATH=D:\CyberAngel\gitee\android_tetris +USE_OLD_BACKEND=false BUILD FINISHED -BUILD_FINISH_TIME=1627720250798 +BUILD_FINISH_TIME=1627741608845 CONFIGURATION_API_COUNT=1 CONFIGURATION_IMPLEMENTATION_COUNT=1 CPU_NUMBER_OF_CORES=12 -GRADLE_BUILD_DURATION=41973 -GRADLE_BUILD_NUMBER_IN_CURRENT_DAEMON=3 -GRADLE_DAEMON_HEAP_SIZE=2256067096 -GRADLE_EXECUTION_DURATION=41784 -GRADLE_NUMBER_OF_TASKS=283 -GRADLE_NUMBER_OF_UNCONFIGURED_TASKS=214 +GRADLE_BUILD_DURATION=724 +GRADLE_BUILD_NUMBER_IN_CURRENT_DAEMON=15 +GRADLE_DAEMON_HEAP_SIZE=2170539873 +GRADLE_EXECUTION_DURATION=587 +GRADLE_NUMBER_OF_TASKS=294 +GRADLE_NUMBER_OF_UNCONFIGURED_TASKS=239 NUMBER_OF_SUBPROJECTS=2 -STATISTICS_COLLECT_METRICS_OVERHEAD=13 -STATISTICS_VISIT_ALL_PROJECTS_OVERHEAD=2 +STATISTICS_COLLECT_METRICS_OVERHEAD=1 +STATISTICS_VISIT_ALL_PROJECTS_OVERHEAD=0 BUILD_FAILED=false EXECUTED_FROM_IDEA=true JVM_COMPILER_IR_MODE=true @@ -48,26 +79,30 @@ OS_TYPE=Windows 10 PROJECT_PATH=D:\CyberAngel\gitee\android_tetris USE_OLD_BACKEND=false BUILD FINISHED -BUILD_FINISH_TIME=1627720270366 +BUILD_FINISH_TIME=1627741670053 CONFIGURATION_API_COUNT=1 CONFIGURATION_IMPLEMENTATION_COUNT=1 CPU_NUMBER_OF_CORES=12 -GRADLE_BUILD_DURATION=576 -GRADLE_BUILD_NUMBER_IN_CURRENT_DAEMON=4 -GRADLE_DAEMON_HEAP_SIZE=2298806726 -GRADLE_EXECUTION_DURATION=365 -GRADLE_NUMBER_OF_TASKS=289 -GRADLE_NUMBER_OF_UNCONFIGURED_TASKS=211 +GRADLE_BUILD_DURATION=726 +GRADLE_BUILD_NUMBER_IN_CURRENT_DAEMON=16 +GRADLE_DAEMON_HEAP_SIZE=2213707325 +GRADLE_EXECUTION_DURATION=558 +GRADLE_NUMBER_OF_TASKS=291 +GRADLE_NUMBER_OF_UNCONFIGURED_TASKS=237 NUMBER_OF_SUBPROJECTS=2 +STATISTICS_COLLECT_METRICS_OVERHEAD=0 STATISTICS_VISIT_ALL_PROJECTS_OVERHEAD=1 BUILD_FAILED=false EXECUTED_FROM_IDEA=true +JVM_COMPILER_IR_MODE=true KOTLIN_KTS_USED=false KOTLIN_OFFICIAL_CODESTYLE=true KOTLIN_PROGRESSIVE_MODE=false GRADLE_VERSION=7.0.0 +JVM_DEFAULTS=disable KOTLIN_COMPILER_VERSION=1.5.10 KOTLIN_STDLIB_VERSION=1.5.10 OS_TYPE=Windows 10 PROJECT_PATH=D:\CyberAngel\gitee\android_tetris +USE_OLD_BACKEND=false BUILD FINISHED