add all the things
This commit is contained in:
commit
63e269c4d9
14
.gitignore
vendored
Normal file
14
.gitignore
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
*.iml
|
||||||
|
.gradle
|
||||||
|
/local.properties
|
||||||
|
/.idea/caches
|
||||||
|
/.idea/libraries
|
||||||
|
/.idea/modules.xml
|
||||||
|
/.idea/workspace.xml
|
||||||
|
/.idea/navEditor.xml
|
||||||
|
/.idea/assetWizardSettings.xml
|
||||||
|
.DS_Store
|
||||||
|
/build
|
||||||
|
/captures
|
||||||
|
.externalNativeBuild
|
||||||
|
.cxx
|
||||||
138
.idea/codeStyles/Project.xml
Normal file
138
.idea/codeStyles/Project.xml
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<code_scheme name="Project" version="173">
|
||||||
|
<JetCodeStyleSettings>
|
||||||
|
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
|
||||||
|
<value>
|
||||||
|
<package name="java.util" alias="false" withSubpackages="false" />
|
||||||
|
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
|
||||||
|
<package name="io.ktor" alias="false" withSubpackages="true" />
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
|
<option name="PACKAGES_IMPORT_LAYOUT">
|
||||||
|
<value>
|
||||||
|
<package name="" alias="false" withSubpackages="true" />
|
||||||
|
<package name="java" alias="false" withSubpackages="true" />
|
||||||
|
<package name="javax" alias="false" withSubpackages="true" />
|
||||||
|
<package name="kotlin" alias="false" withSubpackages="true" />
|
||||||
|
<package name="" alias="true" withSubpackages="true" />
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||||
|
</JetCodeStyleSettings>
|
||||||
|
<codeStyleSettings language="XML">
|
||||||
|
<indentOptions>
|
||||||
|
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||||
|
</indentOptions>
|
||||||
|
<arrangement>
|
||||||
|
<rules>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>xmlns:android</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>xmlns:.*</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>BY_NAME</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*:id</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*:name</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>name</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>style</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>BY_NAME</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<rule>
|
||||||
|
<match>
|
||||||
|
<AND>
|
||||||
|
<NAME>.*</NAME>
|
||||||
|
<XML_ATTRIBUTE />
|
||||||
|
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||||
|
</AND>
|
||||||
|
</match>
|
||||||
|
<order>BY_NAME</order>
|
||||||
|
</rule>
|
||||||
|
</section>
|
||||||
|
</rules>
|
||||||
|
</arrangement>
|
||||||
|
</codeStyleSettings>
|
||||||
|
<codeStyleSettings language="kotlin">
|
||||||
|
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||||
|
</codeStyleSettings>
|
||||||
|
</code_scheme>
|
||||||
|
</component>
|
||||||
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</state>
|
||||||
|
</component>
|
||||||
22
.idea/gradle.xml
Normal file
22
.idea/gradle.xml
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||||
|
<component name="GradleSettings">
|
||||||
|
<option name="linkedExternalProjectsSettings">
|
||||||
|
<GradleProjectSettings>
|
||||||
|
<option name="testRunner" value="PLATFORM" />
|
||||||
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
|
<option name="gradleHome" value="$USER_HOME$/.sdkman/candidates/gradle/current" />
|
||||||
|
<option name="gradleJvm" value="1.8" />
|
||||||
|
<option name="modules">
|
||||||
|
<set>
|
||||||
|
<option value="$PROJECT_DIR$" />
|
||||||
|
<option value="$PROJECT_DIR$/app" />
|
||||||
|
</set>
|
||||||
|
</option>
|
||||||
|
<option name="resolveModulePerSourceSet" value="false" />
|
||||||
|
</GradleProjectSettings>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
25
.idea/jarRepositories.xml
Normal file
25
.idea/jarRepositories.xml
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="RemoteRepositoriesConfiguration">
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="central" />
|
||||||
|
<option name="name" value="Maven Central repository" />
|
||||||
|
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||||
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="jboss.community" />
|
||||||
|
<option name="name" value="JBoss Community repository" />
|
||||||
|
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||||
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="BintrayJCenter" />
|
||||||
|
<option name="name" value="BintrayJCenter" />
|
||||||
|
<option name="url" value="https://jcenter.bintray.com/" />
|
||||||
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="Google" />
|
||||||
|
<option name="name" value="Google" />
|
||||||
|
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
|
||||||
|
</remote-repository>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
9
.idea/misc.xml
Normal file
9
.idea/misc.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectType">
|
||||||
|
<option name="id" value="Android" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
12
.idea/runConfigurations.xml
Normal file
12
.idea/runConfigurations.xml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="RunConfigurationProducerService">
|
||||||
|
<option name="ignoredProducers">
|
||||||
|
<set>
|
||||||
|
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
|
||||||
|
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
|
||||||
|
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
|
||||||
|
</set>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
1
app/.gitignore
vendored
Normal file
1
app/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
37
app/build.gradle
Normal file
37
app/build.gradle
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
apply plugin: 'com.android.application'
|
||||||
|
apply plugin: 'kotlin-android'
|
||||||
|
apply plugin: 'kotlin-android-extensions'
|
||||||
|
|
||||||
|
android {
|
||||||
|
compileSdkVersion 30
|
||||||
|
buildToolsVersion "30.0.2"
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
applicationId "com.wyattjmiller.dottyrevised"
|
||||||
|
minSdkVersion 24
|
||||||
|
targetSdkVersion 30
|
||||||
|
versionCode 1
|
||||||
|
versionName "1.0"
|
||||||
|
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation fileTree(dir: "libs", include: ["*.jar"])
|
||||||
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
implementation 'androidx.core:core-ktx:1.3.2'
|
||||||
|
implementation 'androidx.appcompat:appcompat:1.2.0'
|
||||||
|
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||||
|
testImplementation 'junit:junit:4.12'
|
||||||
|
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
|
||||||
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||||
|
|
||||||
|
}
|
||||||
21
app/proguard-rules.pro
vendored
Normal file
21
app/proguard-rules.pro
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# You can control the set of applied configuration files using the
|
||||||
|
# proguardFiles setting in build.gradle.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
|
|
||||||
|
# Uncomment this to preserve the line number information for
|
||||||
|
# debugging stack traces.
|
||||||
|
#-keepattributes SourceFile,LineNumberTable
|
||||||
|
|
||||||
|
# If you keep the line number information, uncomment this to
|
||||||
|
# hide the original source file name.
|
||||||
|
#-renamesourcefileattribute SourceFile
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
package com.wyattjmiller.dottyrevised
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||||
|
|
||||||
|
import org.junit.Test
|
||||||
|
import org.junit.runner.RunWith
|
||||||
|
|
||||||
|
import org.junit.Assert.*
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* See [testing documentation](http://d.android.com/tools/testing).
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4::class)
|
||||||
|
class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
fun useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
|
||||||
|
assertEquals("com.wyattjmiller.dottyrevised", appContext.packageName)
|
||||||
|
}
|
||||||
|
}
|
||||||
24
app/src/main/AndroidManifest.xml
Normal file
24
app/src/main/AndroidManifest.xml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.wyattjmiller.dottyrevised"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
tools:ignore="LockedOrientationActivity">
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/AppTheme">
|
||||||
|
<activity android:name=".MainActivity"
|
||||||
|
android:screenOrientation="portrait">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
</application>
|
||||||
|
|
||||||
|
</manifest>
|
||||||
32
app/src/main/java/com/wyattjmiller/dottyrevised/Dot.kt
Normal file
32
app/src/main/java/com/wyattjmiller/dottyrevised/Dot.kt
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
package com.wyattjmiller.dottyrevised
|
||||||
|
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
class Dot(row: Int, col: Int) {
|
||||||
|
var color = 0
|
||||||
|
var row: Int
|
||||||
|
var col: Int
|
||||||
|
var centerX = 0f
|
||||||
|
var centerY = 0f
|
||||||
|
var radius: Float
|
||||||
|
var selected: Boolean
|
||||||
|
private val randomGen: Random = Random()
|
||||||
|
|
||||||
|
fun setRandomColor() {
|
||||||
|
color = randomGen.nextInt(DotsGame.NUM_COLORS)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun isAdjacent(dot: Dot): Boolean {
|
||||||
|
val colDiff = Math.abs(col - dot.col)
|
||||||
|
val rowDiff = Math.abs(row - dot.row)
|
||||||
|
return colDiff + rowDiff == 1
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
setRandomColor()
|
||||||
|
selected = false
|
||||||
|
radius = 1f
|
||||||
|
this.row = row
|
||||||
|
this.col = col
|
||||||
|
}
|
||||||
|
}
|
||||||
170
app/src/main/java/com/wyattjmiller/dottyrevised/DotsGame.kt
Normal file
170
app/src/main/java/com/wyattjmiller/dottyrevised/DotsGame.kt
Normal file
@ -0,0 +1,170 @@
|
|||||||
|
package com.wyattjmiller.dottyrevised
|
||||||
|
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
class DotsGame private constructor() {
|
||||||
|
enum class AddDotStatus {
|
||||||
|
Added, Rejected, Removed
|
||||||
|
}
|
||||||
|
|
||||||
|
var movesLeft = 0
|
||||||
|
private set
|
||||||
|
var score = 0
|
||||||
|
private set
|
||||||
|
private val mDots: Array<Array<Dot?>>
|
||||||
|
|
||||||
|
// Return list of selected dots
|
||||||
|
val selectedDots: ArrayList<Dot?>
|
||||||
|
|
||||||
|
fun getDot(row: Int, col: Int): Dot? {
|
||||||
|
return if (row >= GRID_SIZE || row < 0 || col >= GRID_SIZE || col < 0) {
|
||||||
|
null
|
||||||
|
} else {
|
||||||
|
mDots[row][col]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return the last selected dot
|
||||||
|
val lastSelectedDot: Dot?
|
||||||
|
get() = if (selectedDots.size > 0) {
|
||||||
|
selectedDots[selectedDots.size - 1]
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return the lowest selected dot in each column
|
||||||
|
val lowestSelectedDots: ArrayList<Dot?>
|
||||||
|
get() {
|
||||||
|
val dots = ArrayList<Dot?>()
|
||||||
|
for (col in 0 until GRID_SIZE) {
|
||||||
|
for (row in GRID_SIZE - 1 downTo 0) {
|
||||||
|
if (mDots[row][col]!!.selected) {
|
||||||
|
dots.add(mDots[row][col])
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dots
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear the list of selected dots
|
||||||
|
fun clearSelectedDots() {
|
||||||
|
|
||||||
|
// Reset board so none selected
|
||||||
|
for (dot in selectedDots) {
|
||||||
|
dot!!.selected = false
|
||||||
|
}
|
||||||
|
selectedDots.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attempt to add the dot to the list of selected dots
|
||||||
|
fun addSelectedDot(dot: Dot): AddDotStatus {
|
||||||
|
var status = AddDotStatus.Rejected
|
||||||
|
|
||||||
|
// Check if first dot selected
|
||||||
|
if (selectedDots.size == 0) {
|
||||||
|
selectedDots.add(dot)
|
||||||
|
dot.selected = true
|
||||||
|
status = AddDotStatus.Added
|
||||||
|
} else {
|
||||||
|
if (!dot.selected) {
|
||||||
|
// Make sure new is same color and adjacent to last selected dot
|
||||||
|
val lastDot = lastSelectedDot
|
||||||
|
if (lastDot!!.color == dot.color && lastDot.isAdjacent(dot)) {
|
||||||
|
selectedDots.add(dot)
|
||||||
|
dot.selected = true
|
||||||
|
status = AddDotStatus.Added
|
||||||
|
}
|
||||||
|
} else if (selectedDots.size > 1) {
|
||||||
|
// Dot is already selected, so remove last dot if backtracking
|
||||||
|
val secondLast = selectedDots[selectedDots.size - 2]
|
||||||
|
if (secondLast == dot) {
|
||||||
|
val removedDot = selectedDots.removeAt(
|
||||||
|
selectedDots.size - 1
|
||||||
|
)
|
||||||
|
removedDot!!.selected = false
|
||||||
|
status = AddDotStatus.Removed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return status
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort by rows asc
|
||||||
|
private fun sortSelectedDots() {
|
||||||
|
Collections.sort(selectedDots, object : Comparator<Dot?> {
|
||||||
|
override fun compare(dot1: Dot?, dot2: Dot?): Int {
|
||||||
|
return dot1!!.row - dot2!!.row
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call after completing a dot path to relocate the dots and update the score and moves
|
||||||
|
fun finishMove() {
|
||||||
|
if (selectedDots.size > 1) {
|
||||||
|
// Sort by row so dots are processed top-down
|
||||||
|
sortSelectedDots()
|
||||||
|
|
||||||
|
// Move all dots above each selected dot down by changing color
|
||||||
|
for (dot in selectedDots) {
|
||||||
|
for (row in dot!!.row downTo 1) {
|
||||||
|
val dotCurrent = mDots[row][dot.col]
|
||||||
|
val dotAbove = mDots[row - 1][dot.col]
|
||||||
|
dotCurrent!!.color = dotAbove!!.color
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add new dot at top
|
||||||
|
val topDot = mDots[0][dot.col]
|
||||||
|
topDot!!.setRandomColor()
|
||||||
|
}
|
||||||
|
score += selectedDots.size
|
||||||
|
movesLeft--
|
||||||
|
clearSelectedDots()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start a new game
|
||||||
|
fun newGame() {
|
||||||
|
score = 0
|
||||||
|
movesLeft = INIT_MOVES
|
||||||
|
for (row in 0 until GRID_SIZE) {
|
||||||
|
for (col in 0 until GRID_SIZE) {
|
||||||
|
mDots[row][col]!!.setRandomColor()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine if the game is over
|
||||||
|
val isGameOver: Boolean
|
||||||
|
get() = movesLeft == 0
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
var NUM_COLORS = 5
|
||||||
|
var GRID_SIZE = 6
|
||||||
|
var INIT_MOVES = 10
|
||||||
|
private var mDotsGame: DotsGame? = null
|
||||||
|
val instance: DotsGame?
|
||||||
|
get() {
|
||||||
|
if (mDotsGame == null) {
|
||||||
|
mDotsGame = DotsGame()
|
||||||
|
}
|
||||||
|
return mDotsGame
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
|
||||||
|
// Create dots for the 2d array
|
||||||
|
mDots = Array(GRID_SIZE) {
|
||||||
|
arrayOfNulls(
|
||||||
|
GRID_SIZE
|
||||||
|
)
|
||||||
|
}
|
||||||
|
for (row in 0 until GRID_SIZE) {
|
||||||
|
for (col in 0 until GRID_SIZE) {
|
||||||
|
mDots[row][col] = Dot(row, col)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
selectedDots = ArrayList<Dot?>()
|
||||||
|
}
|
||||||
|
}
|
||||||
188
app/src/main/java/com/wyattjmiller/dottyrevised/DotsGrid.kt
Normal file
188
app/src/main/java/com/wyattjmiller/dottyrevised/DotsGrid.kt
Normal file
@ -0,0 +1,188 @@
|
|||||||
|
package com.wyattjmiller.dottyrevised
|
||||||
|
|
||||||
|
import android.animation.Animator
|
||||||
|
import android.animation.AnimatorListenerAdapter
|
||||||
|
import android.animation.AnimatorSet
|
||||||
|
import android.animation.ValueAnimator
|
||||||
|
import android.content.Context
|
||||||
|
import android.graphics.Canvas
|
||||||
|
import android.graphics.Paint
|
||||||
|
import android.graphics.Path
|
||||||
|
import android.util.AttributeSet
|
||||||
|
import android.view.MotionEvent
|
||||||
|
import android.view.View
|
||||||
|
import android.view.animation.AccelerateInterpolator
|
||||||
|
import android.view.animation.BounceInterpolator
|
||||||
|
|
||||||
|
|
||||||
|
class DotsGrid(context: Context?, attrs: AttributeSet?) : View(context, attrs) {
|
||||||
|
private val mGame: DotsGame = DotsGame.instance!!
|
||||||
|
private val DOT_RADIUS = 40
|
||||||
|
private var mAnimatorSet: AnimatorSet = AnimatorSet()
|
||||||
|
|
||||||
|
enum class DotSelectionStatus {
|
||||||
|
First, Additional, Last
|
||||||
|
}
|
||||||
|
|
||||||
|
interface DotsGridListener {
|
||||||
|
fun onDotSelected(dot: Dot?, status: DotSelectionStatus?)
|
||||||
|
fun onAnimationFinished()
|
||||||
|
}
|
||||||
|
|
||||||
|
private var mGridListener: DotsGridListener? = null
|
||||||
|
private val mDotColors: IntArray = resources.getIntArray(R.array.dotColors)
|
||||||
|
private var mCellWidth = 0
|
||||||
|
private var mCellHeight = 0
|
||||||
|
private val mDotPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
|
||||||
|
private val mPathPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
|
||||||
|
|
||||||
|
override fun onSizeChanged(width: Int, height: Int, oldWidth: Int, oldHeight: Int) {
|
||||||
|
val boardWidth = width - paddingLeft - paddingRight
|
||||||
|
val boardHeight = height - paddingTop - paddingBottom
|
||||||
|
mCellWidth = boardWidth / DotsGame.GRID_SIZE
|
||||||
|
mCellHeight = boardHeight / DotsGame.GRID_SIZE
|
||||||
|
resetDots()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDraw(canvas: Canvas) {
|
||||||
|
super.onDraw(canvas)
|
||||||
|
|
||||||
|
// Draw dots
|
||||||
|
for (row in 0 until DotsGame.GRID_SIZE) {
|
||||||
|
for (col in 0 until DotsGame.GRID_SIZE) {
|
||||||
|
val dot = mGame.getDot(row, col)
|
||||||
|
mDotPaint.color = mDotColors[dot!!.color]
|
||||||
|
canvas.drawCircle(dot.centerX, dot.centerY, dot.radius, mDotPaint)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!mAnimatorSet.isRunning) {
|
||||||
|
// Draw connector
|
||||||
|
val selectedDots = mGame.selectedDots
|
||||||
|
if (selectedDots.isNotEmpty()) {
|
||||||
|
val path = Path()
|
||||||
|
var dot = selectedDots[0]
|
||||||
|
path.moveTo(dot!!.centerX, dot.centerY)
|
||||||
|
for (i in 1 until selectedDots.size) {
|
||||||
|
dot = selectedDots[i]
|
||||||
|
path.lineTo(dot!!.centerX, dot.centerY)
|
||||||
|
}
|
||||||
|
mPathPaint.color = mDotColors[dot!!.color]
|
||||||
|
canvas.drawPath(path, mPathPaint)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onTouchEvent(event: MotionEvent): Boolean {
|
||||||
|
|
||||||
|
// Only execute when a listener exists
|
||||||
|
if (mGridListener == null || mAnimatorSet.isRunning) return true
|
||||||
|
|
||||||
|
// Determine which dot is pressed
|
||||||
|
val x = event.x.toInt()
|
||||||
|
val y = event.y.toInt()
|
||||||
|
val col = x / mCellWidth
|
||||||
|
val row = y / mCellHeight
|
||||||
|
var selectedDot = mGame.getDot(row, col)
|
||||||
|
|
||||||
|
// Return previously selected dot if touch moves outside the grid
|
||||||
|
if (selectedDot == null) {
|
||||||
|
selectedDot = mGame.lastSelectedDot
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify activity that a dot is selected
|
||||||
|
if (event.action == MotionEvent.ACTION_DOWN) {
|
||||||
|
mGridListener!!.onDotSelected(selectedDot, DotSelectionStatus.First)
|
||||||
|
} else if (event.action == MotionEvent.ACTION_MOVE) {
|
||||||
|
mGridListener!!.onDotSelected(selectedDot, DotSelectionStatus.Additional)
|
||||||
|
} else if (event.action == MotionEvent.ACTION_UP) {
|
||||||
|
mGridListener!!.onDotSelected(selectedDot, DotSelectionStatus.Last)
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setGridListener(gridListener: DotsGridListener?) {
|
||||||
|
mGridListener = gridListener
|
||||||
|
}
|
||||||
|
|
||||||
|
fun animateDots() {
|
||||||
|
// For storing many animations
|
||||||
|
val animations: ArrayList<Animator> = ArrayList()
|
||||||
|
|
||||||
|
val lowestDots = mGame.lowestSelectedDots
|
||||||
|
for (dot in lowestDots) {
|
||||||
|
var rowsToMove = 1
|
||||||
|
for (row in dot!!.row - 1 downTo 0) {
|
||||||
|
val dotToMove = mGame.getDot(row, dot.col)
|
||||||
|
if (dotToMove!!.selected) {
|
||||||
|
rowsToMove++
|
||||||
|
} else {
|
||||||
|
val targetY = dotToMove!!.centerY +
|
||||||
|
rowsToMove * mCellHeight
|
||||||
|
animations.add(
|
||||||
|
getFallingAnimator(
|
||||||
|
dotToMove!!,
|
||||||
|
targetY
|
||||||
|
)!!
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Get an animation to make selected dots disappear
|
||||||
|
animations.add(getDisappearingAnimator())
|
||||||
|
|
||||||
|
// Play animations (just one right now) together, then reset radius to full size
|
||||||
|
mAnimatorSet = AnimatorSet()
|
||||||
|
mAnimatorSet.playTogether(animations)
|
||||||
|
mAnimatorSet.addListener(object : AnimatorListenerAdapter() {
|
||||||
|
override fun onAnimationEnd(animation: Animator) {
|
||||||
|
resetDots()
|
||||||
|
mGridListener!!.onAnimationFinished()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
mAnimatorSet.start()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getDisappearingAnimator(): ValueAnimator {
|
||||||
|
val animator = ValueAnimator.ofFloat(1f, 0f)
|
||||||
|
animator?.duration = 100
|
||||||
|
animator?.interpolator = AccelerateInterpolator()
|
||||||
|
animator?.addUpdateListener { animation ->
|
||||||
|
for (dot in mGame.selectedDots) {
|
||||||
|
dot!!.radius = DOT_RADIUS * animation.animatedValue as Float
|
||||||
|
}
|
||||||
|
invalidate()
|
||||||
|
}
|
||||||
|
return animator
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getFallingAnimator(dot: Dot, destinationY: Float): ValueAnimator? {
|
||||||
|
val animator = ValueAnimator.ofFloat(dot.centerY, destinationY)
|
||||||
|
animator?.duration = 300
|
||||||
|
animator?.interpolator = BounceInterpolator()
|
||||||
|
animator?.addUpdateListener { animation ->
|
||||||
|
dot.centerY = animation.animatedValue as Float
|
||||||
|
invalidate()
|
||||||
|
}
|
||||||
|
return animator
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun resetDots() {
|
||||||
|
for (row in 0 until DotsGame.GRID_SIZE) {
|
||||||
|
for (col in 0 until DotsGame.GRID_SIZE) {
|
||||||
|
val dot = mGame.getDot(row, col)
|
||||||
|
dot!!.radius = DOT_RADIUS.toFloat()
|
||||||
|
dot.centerX = (col * mCellWidth + mCellWidth / 2).toFloat()
|
||||||
|
dot.centerY = (row * mCellHeight + mCellHeight / 2).toFloat()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
mPathPaint.strokeWidth = 10f
|
||||||
|
mPathPaint.style = Paint.Style.STROKE
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,91 @@
|
|||||||
|
package com.wyattjmiller.dottyrevised
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.View
|
||||||
|
import android.widget.TextView
|
||||||
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
|
import com.wyattjmiller.dottyrevised.DotsGrid.DotSelectionStatus
|
||||||
|
import com.wyattjmiller.dottyrevised.DotsGrid.DotsGridListener
|
||||||
|
|
||||||
|
|
||||||
|
class MainActivity : AppCompatActivity() {
|
||||||
|
private var mGame: DotsGame? = null
|
||||||
|
private var mDotsGrid: DotsGrid? = null
|
||||||
|
private var mMovesRemaining: TextView? = null
|
||||||
|
private var mScore: TextView? = null
|
||||||
|
private var mSoundEffects: SoundEffects? = null
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
setContentView(R.layout.activity_main)
|
||||||
|
mMovesRemaining = findViewById(R.id.movesRemaining)
|
||||||
|
mScore = findViewById(R.id.score)
|
||||||
|
mDotsGrid = findViewById(R.id.gameGrid)
|
||||||
|
mDotsGrid?.setGridListener(mGridListener)
|
||||||
|
mGame = DotsGame.instance
|
||||||
|
mSoundEffects = SoundEffects.getInstance(applicationContext)!!
|
||||||
|
newGame()
|
||||||
|
}
|
||||||
|
|
||||||
|
private val mGridListener: DotsGridListener = object : DotsGridListener {
|
||||||
|
override fun onDotSelected(dot: Dot?, status: DotSelectionStatus?) {
|
||||||
|
|
||||||
|
// Ignore selections when game is over
|
||||||
|
if (mGame!!.isGameOver) return
|
||||||
|
|
||||||
|
// Add to list of selected dots
|
||||||
|
mGame!!.addSelectedDot(dot!!)
|
||||||
|
|
||||||
|
if (status == DotSelectionStatus.First) {
|
||||||
|
mSoundEffects!!.resetTones()
|
||||||
|
}
|
||||||
|
|
||||||
|
val addStatus = mGame!!.addSelectedDot(dot)
|
||||||
|
|
||||||
|
if (addStatus == DotsGame.AddDotStatus.Added) {
|
||||||
|
mSoundEffects!!.playTone(true)
|
||||||
|
} else if (addStatus == DotsGame.AddDotStatus.Removed) {
|
||||||
|
mSoundEffects!!.playTone(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
// If done selecting dots then replace selected dots and display new moves and score
|
||||||
|
if (status === DotSelectionStatus.Last) {
|
||||||
|
if (mGame!!.selectedDots.size > 1) {
|
||||||
|
mDotsGrid?.animateDots()
|
||||||
|
|
||||||
|
// These methods must be called AFTER the animation completes
|
||||||
|
//mGame!!.finishMove()
|
||||||
|
//updateMovesAndScore()
|
||||||
|
} else {
|
||||||
|
mGame!!.clearSelectedDots()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Display changes to the game
|
||||||
|
mDotsGrid!!.invalidate()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onAnimationFinished() {
|
||||||
|
mGame!!.finishMove()
|
||||||
|
mDotsGrid!!.invalidate()
|
||||||
|
updateMovesAndScore()
|
||||||
|
|
||||||
|
if (mGame!!.isGameOver) mSoundEffects!!.playGameOver()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun newGameClick(view: View?) {
|
||||||
|
newGame()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun newGame() {
|
||||||
|
mGame!!.newGame()
|
||||||
|
mDotsGrid!!.invalidate()
|
||||||
|
updateMovesAndScore()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun updateMovesAndScore() {
|
||||||
|
mMovesRemaining!!.text = String.format(mGame!!.movesLeft.toString())
|
||||||
|
mScore!!.text = String.format(mGame!!.score.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,70 @@
|
|||||||
|
package com.wyattjmiller.dottyrevised
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.media.AudioAttributes
|
||||||
|
import android.media.AudioManager
|
||||||
|
import android.media.SoundPool
|
||||||
|
import android.os.Build
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
|
||||||
|
class SoundEffects private constructor(private val mContext: Context) {
|
||||||
|
private var mSoundPool: SoundPool? = null
|
||||||
|
private val mSelectSoundIds: ArrayList<Int>
|
||||||
|
private var mSoundIndex = 0
|
||||||
|
private val mEndGameSoundId: Int
|
||||||
|
|
||||||
|
fun resetTones() {
|
||||||
|
mSoundIndex = -1
|
||||||
|
}
|
||||||
|
|
||||||
|
fun playTone(advance: Boolean) {
|
||||||
|
if (advance) {
|
||||||
|
mSoundIndex++
|
||||||
|
} else {
|
||||||
|
mSoundIndex--
|
||||||
|
}
|
||||||
|
if (mSoundIndex < 0) {
|
||||||
|
mSoundIndex = 0
|
||||||
|
} else if (mSoundIndex >= mSelectSoundIds.size) {
|
||||||
|
mSoundIndex = 0
|
||||||
|
}
|
||||||
|
mSoundPool!!.play(mSelectSoundIds[mSoundIndex], 1f, 1f, 1, 0, 1f)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun playGameOver() {
|
||||||
|
mSoundPool!!.play(mEndGameSoundId, 0.5f, 0.5f, 1, 0, 1f)
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private var mSoundEffects: SoundEffects? = null
|
||||||
|
fun getInstance(context: Context): SoundEffects? {
|
||||||
|
if (mSoundEffects == null) {
|
||||||
|
mSoundEffects = SoundEffects(context)
|
||||||
|
}
|
||||||
|
return mSoundEffects
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
mSoundPool = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||||
|
val attributes = AudioAttributes.Builder()
|
||||||
|
.setUsage(AudioAttributes.USAGE_GAME)
|
||||||
|
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
|
||||||
|
.build()
|
||||||
|
SoundPool.Builder()
|
||||||
|
.setAudioAttributes(attributes)
|
||||||
|
.build()
|
||||||
|
} else {
|
||||||
|
SoundPool(1, AudioManager.STREAM_MUSIC, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
mSelectSoundIds = ArrayList()
|
||||||
|
mSelectSoundIds.add(mSoundPool!!.load(mContext, R.raw.note_e, 1))
|
||||||
|
mSelectSoundIds.add(mSoundPool!!.load(mContext, R.raw.note_f, 1))
|
||||||
|
mSelectSoundIds.add(mSoundPool!!.load(mContext, R.raw.note_f_sharp, 1))
|
||||||
|
mSelectSoundIds.add(mSoundPool!!.load(mContext, R.raw.note_g, 1))
|
||||||
|
mEndGameSoundId = mSoundPool!!.load(mContext, R.raw.game_over, 1)
|
||||||
|
resetTones()
|
||||||
|
}
|
||||||
|
}
|
||||||
30
app/src/main/res/drawable-v24/ic_launcher_foreground.xml
Normal file
30
app/src/main/res/drawable-v24/ic_launcher_foreground.xml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:aapt="http://schemas.android.com/aapt"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
|
||||||
|
<aapt:attr name="android:fillColor">
|
||||||
|
<gradient
|
||||||
|
android:endX="85.84757"
|
||||||
|
android:endY="92.4963"
|
||||||
|
android:startX="42.9492"
|
||||||
|
android:startY="49.59793"
|
||||||
|
android:type="linear">
|
||||||
|
<item
|
||||||
|
android:color="#44000000"
|
||||||
|
android:offset="0.0" />
|
||||||
|
<item
|
||||||
|
android:color="#00000000"
|
||||||
|
android:offset="1.0" />
|
||||||
|
</gradient>
|
||||||
|
</aapt:attr>
|
||||||
|
</path>
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFF"
|
||||||
|
android:fillType="nonZero"
|
||||||
|
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
|
||||||
|
android:strokeWidth="1"
|
||||||
|
android:strokeColor="#00000000" />
|
||||||
|
</vector>
|
||||||
170
app/src/main/res/drawable/ic_launcher_background.xml
Normal file
170
app/src/main/res/drawable/ic_launcher_background.xml
Normal file
@ -0,0 +1,170 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<path
|
||||||
|
android:fillColor="#3DDC84"
|
||||||
|
android:pathData="M0,0h108v108h-108z" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M9,0L9,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,0L19,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M29,0L29,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M39,0L39,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M49,0L49,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M59,0L59,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M69,0L69,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M79,0L79,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M89,0L89,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M99,0L99,108"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,9L108,9"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,19L108,19"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,29L108,29"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,39L108,39"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,49L108,49"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,59L108,59"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,69L108,69"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,79L108,79"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,89L108,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M0,99L108,99"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,29L89,29"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,39L89,39"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,49L89,49"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,59L89,59"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,69L89,69"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M19,79L89,79"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M29,19L29,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M39,19L39,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M49,19L49,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M59,19L59,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M69,19L69,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
<path
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:pathData="M79,19L79,89"
|
||||||
|
android:strokeWidth="0.8"
|
||||||
|
android:strokeColor="#33FFFFFF" />
|
||||||
|
</vector>
|
||||||
73
app/src/main/res/layout/activity_main.xml
Normal file
73
app/src/main/res/layout/activity_main.xml
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".MainActivity">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/moveLabel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/moves"
|
||||||
|
style="@style/primaryLabel"
|
||||||
|
android:layout_marginLeft="20dp"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/movesRemaining"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
tools:text="10"
|
||||||
|
style="@style/number"
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
app:layout_constraintLeft_toRightOf="@+id/moveLabel"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/moveLabel"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/moveLabel"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/scoreLabel"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/score"
|
||||||
|
style="@style/primaryLabel"
|
||||||
|
android:layout_marginRight="10dp"
|
||||||
|
app:layout_constraintRight_toLeftOf="@+id/score"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/score"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
tools:text="100"
|
||||||
|
style="@style/number"
|
||||||
|
android:layout_marginRight="20dp"
|
||||||
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/scoreLabel"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/scoreLabel"/>
|
||||||
|
|
||||||
|
<com.wyattjmiller.dottyrevised.DotsGrid
|
||||||
|
android:id="@+id/gameGrid"
|
||||||
|
android:layout_width="300dp"
|
||||||
|
android:layout_height="300dp"
|
||||||
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/newGameButton"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/new_game"
|
||||||
|
android:textColor="@color/colorPrimaryDark"
|
||||||
|
android:layout_marginBottom="50dp"
|
||||||
|
android:onClick="newGameClick"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
app:layout_constraintRight_toRightOf="parent" />
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Normal file
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@drawable/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
</adaptive-icon>
|
||||||
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Normal file
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@drawable/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
</adaptive-icon>
|
||||||
BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.2 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.3 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.7 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
BIN
app/src/main/res/raw/game_over.mp3
Normal file
BIN
app/src/main/res/raw/game_over.mp3
Normal file
Binary file not shown.
BIN
app/src/main/res/raw/note_e.mp3
Normal file
BIN
app/src/main/res/raw/note_e.mp3
Normal file
Binary file not shown.
BIN
app/src/main/res/raw/note_f.mp3
Normal file
BIN
app/src/main/res/raw/note_f.mp3
Normal file
Binary file not shown.
BIN
app/src/main/res/raw/note_f_sharp.mp3
Normal file
BIN
app/src/main/res/raw/note_f_sharp.mp3
Normal file
Binary file not shown.
BIN
app/src/main/res/raw/note_g.mp3
Normal file
BIN
app/src/main/res/raw/note_g.mp3
Normal file
Binary file not shown.
14
app/src/main/res/values/colors.xml
Normal file
14
app/src/main/res/values/colors.xml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="colorPrimary">#6200EE</color>
|
||||||
|
<color name="colorPrimaryDark">#3700B3</color>
|
||||||
|
<color name="colorAccent">#BB86FC</color>
|
||||||
|
|
||||||
|
<array name="dotColors">
|
||||||
|
<item>#F44336</item>
|
||||||
|
<item>#2196F3</item>
|
||||||
|
<item>#4CAF50</item>
|
||||||
|
<item>#FFEB3B</item>
|
||||||
|
<item>#673AB7</item>
|
||||||
|
</array>
|
||||||
|
</resources>
|
||||||
7
app/src/main/res/values/strings.xml
Normal file
7
app/src/main/res/values/strings.xml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="app_name">Dotty</string>
|
||||||
|
<string name="new_game">New Game</string>
|
||||||
|
<string name="score">Score</string>
|
||||||
|
<string name="moves">Moves</string>
|
||||||
|
</resources>
|
||||||
|
|
||||||
20
app/src/main/res/values/styles.xml
Normal file
20
app/src/main/res/values/styles.xml
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
<resources>
|
||||||
|
|
||||||
|
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||||
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="primaryLabel">
|
||||||
|
<item name="android:textSize">20sp</item>
|
||||||
|
<item name="android:textColor">@color/colorAccent</item>
|
||||||
|
<item name="android:layout_marginTop">20dp</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<style name="number">
|
||||||
|
<item name="android:textSize">30sp</item>
|
||||||
|
<item name="android:textColor">@color/colorPrimaryDark</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
package com.wyattjmiller.dottyrevised
|
||||||
|
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
import org.junit.Assert.*
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* See [testing documentation](http://d.android.com/tools/testing).
|
||||||
|
*/
|
||||||
|
class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
fun addition_isCorrect() {
|
||||||
|
assertEquals(4, 2 + 2)
|
||||||
|
}
|
||||||
|
}
|
||||||
26
build.gradle
Normal file
26
build.gradle
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
buildscript {
|
||||||
|
ext.kotlin_version = "1.4.10"
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
jcenter()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath "com.android.tools.build:gradle:4.0.1"
|
||||||
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
// in the individual module build.gradle files
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
allprojects {
|
||||||
|
repositories {
|
||||||
|
google()
|
||||||
|
jcenter()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task clean(type: Delete) {
|
||||||
|
delete rootProject.buildDir
|
||||||
|
}
|
||||||
21
gradle.properties
Normal file
21
gradle.properties
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# Project-wide Gradle settings.
|
||||||
|
# IDE (e.g. Android Studio) users:
|
||||||
|
# Gradle settings configured through the IDE *will override*
|
||||||
|
# any settings specified in this file.
|
||||||
|
# For more details on how to configure your build environment visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||||
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
|
org.gradle.jvmargs=-Xmx2048m
|
||||||
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
|
# org.gradle.parallel=true
|
||||||
|
# AndroidX package structure to make it clearer which packages are bundled with the
|
||||||
|
# Android operating system, and which are packaged with your app"s APK
|
||||||
|
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||||
|
android.useAndroidX=true
|
||||||
|
# Automatically convert third-party libraries to use AndroidX
|
||||||
|
android.enableJetifier=true
|
||||||
|
# Kotlin code style for this project: "official" or "obsolete":
|
||||||
|
kotlin.code.style=official
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
6
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
6
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#Fri Nov 20 15:45:25 EST 2020
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
|
||||||
172
gradlew
vendored
Normal file
172
gradlew
vendored
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
##
|
||||||
|
## Gradle start up script for UN*X
|
||||||
|
##
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
|
while [ -h "$PRG" ] ; do
|
||||||
|
ls=`ls -ld "$PRG"`
|
||||||
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
|
PRG="$link"
|
||||||
|
else
|
||||||
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >/dev/null
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=`basename "$0"`
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS=""
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD="maximum"
|
||||||
|
|
||||||
|
warn () {
|
||||||
|
echo "$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
die () {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
nonstop=false
|
||||||
|
case "`uname`" in
|
||||||
|
CYGWIN* )
|
||||||
|
cygwin=true
|
||||||
|
;;
|
||||||
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
NONSTOP* )
|
||||||
|
nonstop=true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
|
else
|
||||||
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD="java"
|
||||||
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||||
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
ulimit -n $MAX_FD
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
|
if $darwin; then
|
||||||
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Cygwin, switch paths to Windows format before running java
|
||||||
|
if $cygwin ; then
|
||||||
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||||
|
SEP=""
|
||||||
|
for dir in $ROOTDIRSRAW ; do
|
||||||
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
|
SEP="|"
|
||||||
|
done
|
||||||
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||||
|
# Add a user-defined pattern to the cygpath arguments
|
||||||
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||||
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||||
|
fi
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
i=0
|
||||||
|
for arg in "$@" ; do
|
||||||
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||||
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||||
|
|
||||||
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||||
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||||
|
else
|
||||||
|
eval `echo args$i`="\"$arg\""
|
||||||
|
fi
|
||||||
|
i=$((i+1))
|
||||||
|
done
|
||||||
|
case $i in
|
||||||
|
(0) set -- ;;
|
||||||
|
(1) set -- "$args0" ;;
|
||||||
|
(2) set -- "$args0" "$args1" ;;
|
||||||
|
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
|
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
|
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
|
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
|
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
|
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
|
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Escape application args
|
||||||
|
save () {
|
||||||
|
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||||
|
echo " "
|
||||||
|
}
|
||||||
|
APP_ARGS=$(save "$@")
|
||||||
|
|
||||||
|
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||||
|
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||||
|
|
||||||
|
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||||
|
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
||||||
84
gradlew.bat
vendored
Normal file
84
gradlew.bat
vendored
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
@if "%DEBUG%" == "" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS=
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windows variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
||||||
2
settings.gradle
Normal file
2
settings.gradle
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
include ':app'
|
||||||
|
rootProject.name = "DottyRevised"
|
||||||
Loading…
Reference in New Issue
Block a user