Merge pull request #29 from Omega-R/develop

Develop

Author: anton-knyazev

.idea/caches/build_file_checksums.ser

@@ -23,6 +23,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${kotlinCorutines_version}"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kotlinCorutines_version}"
+
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
 
     api project(':omegatypes')

.idea/gradle.xml

@@ -1,21 +1,35 @@
 package omega_r.com.omegatypesexample
 
+
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
-import com.omega_r.libs.omegatypes.*
+import com.omega_r.libs.omegatypes.Color
+import com.omega_r.libs.omegatypes.Text
+import com.omega_r.libs.omegatypes.TextStyle
+import com.omega_r.libs.omegatypes.file.File
+import com.omega_r.libs.omegatypes.file.from
+import com.omega_r.libs.omegatypes.image.*
+import com.omega_r.libs.omegatypes.join
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.ByteArrayOutputStream
 import kotlin.concurrent.thread
 
+
 class MainActivity : BaseActivity() {
 
     private val exampleTextView by bind<TextView>(R.id.textview)
     private val imageView by bind<ImageView>(R.id.imageview)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         setContentView(R.layout.activity_main)
         val text = Text.from("test ") +
                 Text.from(
@@ -31,18 +45,47 @@ class MainActivity : BaseActivity() {
 
         val list = listOf(Text.from("1", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))), Text.from("2", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))), Text.from("3"))
 
-        title = list.join(",",  postfix = ".").getCharSequence(this)
+        title = list.join(",", postfix = ".").getCharSequence(this)
+
+
+        val image = Image.from("https://dejagerart.com/wp-content/uploads/2018/09/Test-Logo-Circle-black-transparent.png")
+
+
+//        val image = intent.getSerializableExtra("test") as? Image ?: run {
+//
+//            val image = Image.from("https://dejagerart.com/wp-content/uploads/2018/09/Test-Logo-Circle-black-transparent.png")
+//
+//            ImageProcessors.current.launch {
+//                val stream = image.getStream(this@MainActivity, Bitmap.CompressFormat.PNG)
+//                val bitmap = BitmapFactory.decodeStream(stream)
+//
+//                val bitmapImage = Image.from(BitmapDrawable([email protected], bitmap))
+//
+//                withContext(Dispatchers.Main) {
+//                    imageView.setImage(bitmapImage)
+//
+//
+////                    intent.putExtra("test", bitmapImage)
+////                    finish()
+////                    startActivity(intent)
+////                imageView.setImageBitmap(bitmap)
+//                }
+//            }
+//            image
+//        }
+
+        imageView.setImage(image)
 
-        val image = Image.from("https://avatars1.githubusercontent.com/u/28600571")
 
-        thread {
-            val stream = image.getStream(this, Bitmap.CompressFormat.PNG)
-            val bitmap = BitmapFactory.decodeStream(stream)
-            runOnUiThread {
-                imageView.setImageBitmap(bitmap)
-            }
 
-        }
+//        thread {
+//            val stream = image.getStream(this, Bitmap.CompressFormat.PNG)
+//            val bitmap = BitmapFactory.decodeStream(stream)
+//            runOnUiThread {
+//                imageView.setImageBitmap(bitmap)
+//            }
+//
+//        }
 
     }
 

.idea/misc.xml

@@ -24,4 +24,9 @@
         android:background="@color/colorAccent"
         tools:src="@mipmap/ic_launcher"/>
 
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Test"/>
+
 </RelativeLayout>

app/build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlin_version = '1.3.41'
-    ext.kotlin_version = '1.3.30'
+    ext.kotlinCorutines_version = '1.2.1'
     ext.supportVersion = '28.0.0'
     ext.compileSdkVersion = 28
     ext.targetSdkVersion = 28

app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt

@@ -32,7 +32,7 @@ dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation ("com.github.bumptech.glide:glide:4.9.0") {
+    api ("com.github.bumptech.glide:glide:4.9.0") {
         exclude group: "com.android.support"
     }