diff --git a/build.gradle.kts b/build.gradle.kts index 1d1bf3d..a3f39d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,6 @@ buildscript { repositories { mavenLocal() - maven { url = uri("https://dl.bintray.com/korlibs/korlibs") } maven { url = uri("https://plugins.gradle.org/m2/") } mavenCentral() google() diff --git a/integrations/android/.gitignore b/integrations/android/.gitignore new file mode 100644 index 0000000..f533313 --- /dev/null +++ b/integrations/android/.gitignore @@ -0,0 +1,10 @@ +*.iml +/.gradle +/.idea +/local.properties +/build +/captures +.DS_Store +.externalNativeBuild +.cxx +local.properties diff --git a/integrations/android/app/.gitignore b/integrations/android/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/integrations/android/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/integrations/android/app/build.gradle b/integrations/android/app/build.gradle new file mode 100644 index 0000000..60f023e --- /dev/null +++ b/integrations/android/app/build.gradle @@ -0,0 +1,61 @@ +plugins { + id 'com.android.application' + id 'kotlin-android' +} + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.2" + + defaultConfig { + applicationId "org.korge.korgeviewexample" + minSdkVersion 21 + 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' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + viewBinding true + } + sourceSets { + main { + //assets.srcDirs += [file("src/main/assets")] + } + } +} + +dependencies { + + //implementation (name:'KorgeMPExample-debug', ext:'aar') + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + + // korge + api "com.soywiz.korlibs.korge2:korge-android:$korge_version" + api "com.soywiz.korlibs.korgw:korgw-android:$korge_version" + api "com.soywiz.korlibs.korvi:korvi-android:$korge_version" + api "com.soywiz.korlibs.korim:korim-android:$korge_version" + api "com.soywiz.korlibs.korau:korau-android:$korge_version" + api "com.soywiz.korlibs.kds:kds-android:$korge_version" + api "com.soywiz.korlibs.korma:korma-android:$korge_version" + +} diff --git a/integrations/android/app/proguard-rules.pro b/integrations/android/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/integrations/android/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 \ No newline at end of file diff --git a/integrations/android/app/src/main/AndroidManifest.xml b/integrations/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8a872b3 --- /dev/null +++ b/integrations/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + diff --git a/integrations/android/app/src/main/assets/korge.png b/integrations/android/app/src/main/assets/korge.png new file mode 100644 index 0000000..0526e1d Binary files /dev/null and b/integrations/android/app/src/main/assets/korge.png differ diff --git a/integrations/android/app/src/main/java/org/korge/korgeviewexample/CustomModule.kt b/integrations/android/app/src/main/java/org/korge/korgeviewexample/CustomModule.kt new file mode 100644 index 0000000..1a206e4 --- /dev/null +++ b/integrations/android/app/src/main/java/org/korge/korgeviewexample/CustomModule.kt @@ -0,0 +1,28 @@ +package org.korge.korgeviewexample + +import com.soywiz.korge.scene.Module +import com.soywiz.korge.scene.Scene +import com.soywiz.korinject.AsyncInjector +import com.soywiz.korma.geom.SizeInt +import kotlin.reflect.KClass + +@Suppress("unused") +class CustomModule(private val width: Int = DEFAULT_WIDTH, private val height: Int = DEFAULT_HEIGHT, val callback: () -> Unit) : Module() { + + companion object { + const val DEFAULT_WIDTH = 1920 + const val DEFAULT_HEIGHT = 1080 + } + + override val size: SizeInt + get() = SizeInt.invoke(width, height) + + override val windowSize: SizeInt + get() = SizeInt.invoke(width, height) + + override val mainScene: KClass = CustomScene::class + + override suspend fun AsyncInjector.configure() { + mapPrototype { CustomScene(width, height, callback) } + } +} diff --git a/integrations/android/app/src/main/java/org/korge/korgeviewexample/CustomScene.kt b/integrations/android/app/src/main/java/org/korge/korgeviewexample/CustomScene.kt new file mode 100644 index 0000000..6c16e95 --- /dev/null +++ b/integrations/android/app/src/main/java/org/korge/korgeviewexample/CustomScene.kt @@ -0,0 +1,45 @@ +package org.korge.korgeviewexample + +import com.soywiz.klock.seconds +import com.soywiz.korge.animate.animate +import com.soywiz.korge.input.onClick +import com.soywiz.korge.resources.resourceBitmap +import com.soywiz.korge.scene.Scene +import com.soywiz.korge.view.* +import com.soywiz.korim.color.Colors +import com.soywiz.korio.async.launchImmediately +import com.soywiz.korio.resources.ResourcesContainer +import com.soywiz.korma.geom.Angle +import com.soywiz.korma.interpolation.Easing + +class CustomScene(private val widthParam: Int, private val heightParam: Int, val callback: () -> Unit) : Scene() { + + val ResourcesContainer.korge_png by resourceBitmap("korge.png") + + override suspend fun Container.sceneInit() { + + solidRect(widthParam, heightParam, Colors.GREEN) { + position(0, 0) + } + + image(korge_png) { + + anchor(.5, .5) + position(widthParam / 2, heightParam / 2) + onClick { + callback() + } + + launchImmediately { + animate(completeOnCancel = true) { + parallel { + sequence(looped = true) { + rotateTo(Angle.Companion.fromDegrees(45), 1.5.seconds, Easing.EASE_IN_OUT_QUAD) + rotateTo(Angle.Companion.fromDegrees(-45), 1.5.seconds, Easing.EASE_IN_OUT_QUAD) + } + } + } + } + } + } +} diff --git a/integrations/android/app/src/main/java/org/korge/korgeviewexample/MainActivity.kt b/integrations/android/app/src/main/java/org/korge/korgeviewexample/MainActivity.kt new file mode 100644 index 0000000..0188051 --- /dev/null +++ b/integrations/android/app/src/main/java/org/korge/korgeviewexample/MainActivity.kt @@ -0,0 +1,57 @@ +package org.korge.korgeviewexample + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import org.korge.korgeviewexample.databinding.ActivityMainBinding +import com.soywiz.korge.android.KorgeAndroidView + +class MainActivity : AppCompatActivity() { + + private lateinit var korgeAndroidView: KorgeAndroidView + private lateinit var binding: ActivityMainBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding = ActivityMainBinding.inflate(layoutInflater) + val view = binding.root + setContentView(view) + + korgeAndroidView = KorgeAndroidView(this) + binding.toolContainer.addView(korgeAndroidView) + + binding.loadViewButton.setOnClickListener { + binding.loadViewButton.isEnabled = false + binding.unloadViewButton.isEnabled = true + loadToolModule() + } + + binding.unloadViewButton.setOnClickListener { + binding.loadViewButton.isEnabled = true + binding.unloadViewButton.isEnabled = false + unloadToolModule() + } + } + + override fun onResume() { + super.onResume() + binding.loadViewButton.isEnabled = true + binding.unloadViewButton.isEnabled = false + + } + + override fun onPause() { + super.onPause() + unloadToolModule() + } + + private fun loadToolModule() { + korgeAndroidView.loadModule(CustomModule(width = 1920, height = 1080, callback = { + println("Callback from android app") + })) + } + + private fun unloadToolModule() { + korgeAndroidView.unloadModule() + } +} diff --git a/integrations/android/app/src/main/res/layout/activity_main.xml b/integrations/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..800ca41 --- /dev/null +++ b/integrations/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,38 @@ + + + +