diff --git a/playground/kotlin-implementation/.gitignore b/playground/kotlin-implementation/.gitignore new file mode 100644 index 00000000..603b1407 --- /dev/null +++ b/playground/kotlin-implementation/.gitignore @@ -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 diff --git a/playground/kotlin-implementation/.idea/codeStyles/Project.xml b/playground/kotlin-implementation/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..88ea3aa1 --- /dev/null +++ b/playground/kotlin-implementation/.idea/codeStyles/Project.xml @@ -0,0 +1,122 @@ + + + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/.idea/codeStyles/codeStyleConfig.xml b/playground/kotlin-implementation/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/playground/kotlin-implementation/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/.idea/gradle.xml b/playground/kotlin-implementation/.idea/gradle.xml new file mode 100644 index 00000000..5cd135a0 --- /dev/null +++ b/playground/kotlin-implementation/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/.idea/misc.xml b/playground/kotlin-implementation/.idea/misc.xml new file mode 100644 index 00000000..37a75096 --- /dev/null +++ b/playground/kotlin-implementation/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/.idea/runConfigurations.xml b/playground/kotlin-implementation/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/playground/kotlin-implementation/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/README.md b/playground/kotlin-implementation/README.md new file mode 100644 index 00000000..df9bc06b --- /dev/null +++ b/playground/kotlin-implementation/README.md @@ -0,0 +1,23 @@ +

+ +

+ Doom Fire Algorithm +

+

+
+ +

+ +

+
+ +▶️ [Click here for the Video tutorial](https://www.youtube.com/watch?v=HCjDjsHPOco) + +📄 This project was inspired by [this article](http://fabiensanglard.net/doom_fire_psx/). + +## Author + + + + +

Bia Chacon
💻
diff --git a/playground/kotlin-implementation/app/.gitignore b/playground/kotlin-implementation/app/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/playground/kotlin-implementation/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/playground/kotlin-implementation/app/build.gradle b/playground/kotlin-implementation/app/build.gradle new file mode 100644 index 00000000..2d71a660 --- /dev/null +++ b/playground/kotlin-implementation/app/build.gradle @@ -0,0 +1,37 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + + defaultConfig { + applicationId "com.biachacon.doomfire" + minSdkVersion 16 + targetSdkVersion 29 + 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-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/playground/kotlin-implementation/app/proguard-rules.pro b/playground/kotlin-implementation/app/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/playground/kotlin-implementation/app/proguard-rules.pro @@ -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 diff --git a/playground/kotlin-implementation/app/src/androidTest/java/com/biachacon/doomfire/ExampleInstrumentedTest.kt b/playground/kotlin-implementation/app/src/androidTest/java/com/biachacon/doomfire/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..30fd7f72 --- /dev/null +++ b/playground/kotlin-implementation/app/src/androidTest/java/com/biachacon/doomfire/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.biachacon.doomfire + +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.biachacon.doomfire", appContext.packageName) + } +} diff --git a/playground/kotlin-implementation/app/src/main/AndroidManifest.xml b/playground/kotlin-implementation/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..54be42b1 --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/java/com/biachacon/doomfire/Fire.kt b/playground/kotlin-implementation/app/src/main/java/com/biachacon/doomfire/Fire.kt new file mode 100644 index 00000000..ec61e84c --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/java/com/biachacon/doomfire/Fire.kt @@ -0,0 +1,175 @@ +package com.biachacon.doomfire + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.util.AttributeSet +import android.view.View +import java.util.* +import kotlin.math.absoluteValue + +class Fire(context: Context, attributeSet: AttributeSet) : View(context, attributeSet) { + + private val resolution = 480 + private var widthMode: Int = 0 + private var widthSize: Int = 0 + private var heightMode: Int = 0 + private var heightSize: Int = 0 + private var widthPixel: Int = 0 + private var heightPixel: Int = 0 + private var pixelSize: Int = 0 + private var windDirection: Int = 0 + private lateinit var fireArray: IntArray + private val fireColors = arrayOf( + Paint().apply { color = Color.rgb(7, 7, 7) }, + Paint().apply { color = Color.rgb(31, 7, 7) }, + Paint().apply { color = Color.rgb(47, 15, 7) }, + Paint().apply { color = Color.rgb(71, 15, 7) }, + Paint().apply { color = Color.rgb(87, 23, 7) }, + Paint().apply { color = Color.rgb(103, 31, 7) }, + Paint().apply { color = Color.rgb(119, 31, 7) }, + Paint().apply { color = Color.rgb(143, 39, 7) }, + Paint().apply { color = Color.rgb(159, 47, 7) }, + Paint().apply { color = Color.rgb(175, 63, 7) }, + Paint().apply { color = Color.rgb(191, 71, 7) }, + Paint().apply { color = Color.rgb(199, 71, 7) }, + Paint().apply { color = Color.rgb(223, 79, 7) }, + Paint().apply { color = Color.rgb(223, 87, 7) }, + Paint().apply { color = Color.rgb(223, 87, 7) }, + Paint().apply { color = Color.rgb(215, 95, 7) }, + Paint().apply { color = Color.rgb(215, 95, 7) }, + Paint().apply { color = Color.rgb(215, 95, 7) }, + Paint().apply { color = Color.rgb(215, 103, 15) }, + Paint().apply { color = Color.rgb(207, 111, 15) }, + Paint().apply { color = Color.rgb(207, 119, 15) }, + Paint().apply { color = Color.rgb(207, 127, 15) }, + Paint().apply { color = Color.rgb(207, 135, 23) }, + Paint().apply { color = Color.rgb(199, 135, 23) }, + Paint().apply { color = Color.rgb(199, 143, 23) }, + Paint().apply { color = Color.rgb(199, 151, 31) }, + Paint().apply { color = Color.rgb(191, 159, 31) }, + Paint().apply { color = Color.rgb(191, 159, 31) }, + Paint().apply { color = Color.rgb(191, 167, 39) }, + Paint().apply { color = Color.rgb(191, 167, 39) }, + Paint().apply { color = Color.rgb(191, 175, 47) }, + Paint().apply { color = Color.rgb(183, 175, 47) }, + Paint().apply { color = Color.rgb(183, 183, 47) }, + Paint().apply { color = Color.rgb(183, 183, 55) }, + Paint().apply { color = Color.rgb(207, 207, 111) }, + Paint().apply { color = Color.rgb(223, 223, 159) }, + Paint().apply { color = Color.rgb(239, 239, 199) }, + Paint().apply { color = Color.rgb(255, 255, 255) } + ) + + init { + with(context.obtainStyledAttributes(attributeSet, R.styleable.DoomFlamesWidget)) { + windDirection = getInt(R.styleable.DoomFlamesWidget_wind, 0) + } + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec) + widthMode = MeasureSpec.getMode(widthMeasureSpec) + widthSize = MeasureSpec.getSize(widthMeasureSpec) + heightMode = MeasureSpec.getMode(heightMeasureSpec) + heightSize = MeasureSpec.getSize(heightMeasureSpec) + initializeFireArray() + createFireSource() + } + + private fun getWidthCalculated(): Int { + return when (widthMode) { + MeasureSpec.EXACTLY -> widthSize + MeasureSpec.AT_MOST -> Math.min(resolution, widthSize) + else -> resolution + } + } + + private fun getHeightCalculated(): Int { + return when (heightMode) { + MeasureSpec.EXACTLY -> heightSize + MeasureSpec.AT_MOST -> Math.min(resolution, heightPixel) + else -> resolution + } + } + + private fun initializeFireArray() { + val heightIsBigger = getWidthCalculated() < getHeightCalculated() + val biggestSize = if (heightIsBigger) getWidthCalculated().toDouble() else getHeightCalculated().toDouble() + pixelSize = Math.ceil( biggestSize / 50).toInt() + widthPixel = if (heightIsBigger) 50 else Math.ceil(getWidthCalculated().toDouble()/pixelSize).toInt() + heightPixel = if (!heightIsBigger) 50 else Math.ceil(getHeightCalculated().toDouble()/pixelSize).toInt() + val arraySize = widthPixel * heightPixel + fireArray = IntArray(arraySize.absoluteValue) + fireArray.forEachIndexed { index, _ -> fireArray[index] = 0 } + } + + fun setFireIntensity(int: Int){ + createFireSource(int) + invalidate() + } + + private fun createFireSource(firePower: Int = 36) { + val overFlowFireIndex = widthPixel * heightPixel + + for (column in 0 until widthPixel) { + val pixelIndex = (overFlowFireIndex - widthPixel) + column + fireArray[pixelIndex] = firePower + } + } + + private fun calculateFirePropagation() { + for (column in 0 until widthPixel) { + for (row in 0 until heightPixel) { + updateFireIntensityPerPixel(column + (widthPixel * row)) + } + } + } + + private fun updateFireIntensityPerPixel(currentPixelIndex: Int) { + val bellowPixelIndex = currentPixelIndex + widthPixel + if (bellowPixelIndex >= widthPixel * heightPixel) return + + val heightIsBigger = getWidthCalculated() < getHeightCalculated() + val decay = Math.floor(Random().nextDouble() * if (heightIsBigger)2 else 3).toInt() + val bellowPixelFireIntensity = fireArray[bellowPixelIndex] + val newFireIntensity = if (bellowPixelFireIntensity - decay >= 0) bellowPixelFireIntensity - decay else 0 + val pos = when(windDirection){ + 1 -> if (currentPixelIndex - decay >= 0) currentPixelIndex - decay else currentPixelIndex + 2 -> if (currentPixelIndex + decay >= 0) currentPixelIndex + decay else currentPixelIndex + else -> currentPixelIndex + } + fireArray[pos] = newFireIntensity + } + + private fun renderFire(canvas: Canvas) { + for (row in 0 until heightPixel) { + for (column in 0 until widthPixel) { + canvas.drawRect( + (column * pixelSize).toFloat(), + (row * pixelSize).toFloat(), + ((column + 1) * pixelSize).toFloat(), + ((row + 1) * pixelSize).toFloat(), + fireColors[fireArray[column + (widthPixel * row)]] + ) + } + } + } + + override fun onDraw(canvas: Canvas?) { + super.onDraw(canvas) + calculateFirePropagation() + canvas?.let { renderFire(it) } + postInvalidateDelayed(13) + } + + enum class WindDirection(val value:Int){ + RIGHT(2), LEFT(1), NONE(0) + } + + fun setWind(direction: WindDirection){ + windDirection = direction.value + } + +} \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/java/com/biachacon/doomfire/MainActivity.kt b/playground/kotlin-implementation/app/src/main/java/com/biachacon/doomfire/MainActivity.kt new file mode 100644 index 00000000..d5e3c189 --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/java/com/biachacon/doomfire/MainActivity.kt @@ -0,0 +1,56 @@ +package com.biachacon.doomfire + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import kotlinx.android.synthetic.main.activity_main.* + +class MainActivity : AppCompatActivity() { + + var f = 9; + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + setOnClickListeners() + } + + private fun setOnClickListeners() { + + maxBt.setOnClickListener { + f = 9 + fire.setFireIntensity(f*4) + } + + minBt.setOnClickListener { + f = 1 + fire.setFireIntensity(f*4) + } + + downBt.setOnClickListener { + if (f>1) { + f-- + } + + fire.setFireIntensity(f*4) + } + + upBt.setOnClickListener { + if (f<9) { + f++ + } + fire.setFireIntensity(f*4) + } + + noneBt.setOnClickListener { + fire.setWind(Fire.WindDirection.NONE) + } + + leftBt.setOnClickListener { + fire.setWind(Fire.WindDirection.LEFT) + } + + rightBt.setOnClickListener { + fire.setWind(Fire.WindDirection.RIGHT) + } + } +} \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/res/drawable-v24/bt_background.xml b/playground/kotlin-implementation/app/src/main/res/drawable-v24/bt_background.xml new file mode 100644 index 00000000..1e119f3c --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/drawable-v24/bt_background.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/res/drawable-v24/down.png b/playground/kotlin-implementation/app/src/main/res/drawable-v24/down.png new file mode 100644 index 00000000..0b6b5904 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/drawable-v24/down.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/playground/kotlin-implementation/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/res/drawable-v24/left.png b/playground/kotlin-implementation/app/src/main/res/drawable-v24/left.png new file mode 100644 index 00000000..fe167e45 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/drawable-v24/left.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/drawable-v24/minus.png b/playground/kotlin-implementation/app/src/main/res/drawable-v24/minus.png new file mode 100644 index 00000000..d4882c4a Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/drawable-v24/minus.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/drawable-v24/plus.png b/playground/kotlin-implementation/app/src/main/res/drawable-v24/plus.png new file mode 100644 index 00000000..34d5865f Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/drawable-v24/plus.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/drawable-v24/rigth.png b/playground/kotlin-implementation/app/src/main/res/drawable-v24/rigth.png new file mode 100644 index 00000000..384b4873 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/drawable-v24/rigth.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/drawable-v24/up.png b/playground/kotlin-implementation/app/src/main/res/drawable-v24/up.png new file mode 100644 index 00000000..d6bcae31 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/drawable-v24/up.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/drawable/circle.png b/playground/kotlin-implementation/app/src/main/res/drawable/circle.png new file mode 100644 index 00000000..87dd648e Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/drawable/circle.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/drawable/ic_launcher_background.xml b/playground/kotlin-implementation/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/playground/kotlin-implementation/app/src/main/res/layout/activity_main.xml b/playground/kotlin-implementation/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..7c781f7e --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/playground/kotlin-implementation/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..eca70cfe --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/playground/kotlin-implementation/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..eca70cfe --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-hdpi/ic_launcher.png b/playground/kotlin-implementation/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..a571e600 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/playground/kotlin-implementation/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..61da551c Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-mdpi/ic_launcher.png b/playground/kotlin-implementation/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..c41dd285 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/playground/kotlin-implementation/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..db5080a7 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/playground/kotlin-implementation/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..6dba46da Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/playground/kotlin-implementation/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..da31a871 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/playground/kotlin-implementation/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..15ac6817 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/playground/kotlin-implementation/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..b216f2d3 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/playground/kotlin-implementation/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..f25a4197 Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/playground/kotlin-implementation/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..e96783cc Binary files /dev/null and b/playground/kotlin-implementation/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/playground/kotlin-implementation/app/src/main/res/values/attrs.xml b/playground/kotlin-implementation/app/src/main/res/values/attrs.xml new file mode 100644 index 00000000..d1c968de --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/values/attrs.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/playground/kotlin-implementation/app/src/main/res/values/colors.xml b/playground/kotlin-implementation/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..69295f87 --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #6200ee + #3700b3 + #D81B60 + #000 + #000 + #ffff + + diff --git a/playground/kotlin-implementation/app/src/main/res/values/strings.xml b/playground/kotlin-implementation/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..d65979f1 --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Doom Fire + diff --git a/playground/kotlin-implementation/app/src/main/res/values/styles.xml b/playground/kotlin-implementation/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..bc6a7214 --- /dev/null +++ b/playground/kotlin-implementation/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/playground/kotlin-implementation/app/src/test/java/com/biachacon/doomfire/ExampleUnitTest.kt b/playground/kotlin-implementation/app/src/test/java/com/biachacon/doomfire/ExampleUnitTest.kt new file mode 100644 index 00000000..d0ddeb27 --- /dev/null +++ b/playground/kotlin-implementation/app/src/test/java/com/biachacon/doomfire/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.biachacon.doomfire + +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) + } +} diff --git a/playground/kotlin-implementation/build.gradle b/playground/kotlin-implementation/build.gradle new file mode 100644 index 00000000..a967444a --- /dev/null +++ b/playground/kotlin-implementation/build.gradle @@ -0,0 +1,29 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.70' + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.6.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 +} diff --git a/playground/kotlin-implementation/gradle.properties b/playground/kotlin-implementation/gradle.properties new file mode 100644 index 00000000..23339e0d --- /dev/null +++ b/playground/kotlin-implementation/gradle.properties @@ -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=-Xmx1536m +# 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 diff --git a/playground/kotlin-implementation/gradle/wrapper/gradle-wrapper.jar b/playground/kotlin-implementation/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..f6b961fd Binary files /dev/null and b/playground/kotlin-implementation/gradle/wrapper/gradle-wrapper.jar differ diff --git a/playground/kotlin-implementation/gradle/wrapper/gradle-wrapper.properties b/playground/kotlin-implementation/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..468f0545 --- /dev/null +++ b/playground/kotlin-implementation/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Mar 29 15:54:51 BRT 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/playground/kotlin-implementation/gradlew b/playground/kotlin-implementation/gradlew new file mode 100755 index 00000000..cccdd3d5 --- /dev/null +++ b/playground/kotlin-implementation/gradlew @@ -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" "$@" diff --git a/playground/kotlin-implementation/gradlew.bat b/playground/kotlin-implementation/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/playground/kotlin-implementation/gradlew.bat @@ -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 diff --git a/playground/kotlin-implementation/settings.gradle b/playground/kotlin-implementation/settings.gradle new file mode 100644 index 00000000..01ee8ce3 --- /dev/null +++ b/playground/kotlin-implementation/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name='DoomFire' +include ':app'