Skip to content

Commit

Permalink
Fixed some small details
Browse files Browse the repository at this point in the history
  • Loading branch information
sxhardhaikons committed Dec 10, 2019
1 parent e6a83ec commit f7d5af1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test:rules:1.2.0'

implementation project (':smoothie')
debugImplementation project (':smoothie')
}
6 changes: 3 additions & 3 deletions app/src/main/java/com/sxhardha/smoothiedemo/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.sxhardha.smoothiedemo

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sxhardha.smoothie.Smoothie
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.coroutines.*
Expand All @@ -13,12 +13,12 @@ class MainActivity : AppCompatActivity() {
setContentView(R.layout.activity_main)

btnSmoothie.setOnClickListener {
Smoothie.startProcess()
GlobalScope.launch(Dispatchers.IO) {
Smoothie.startProcess()
delay(5000)
withContext(Dispatchers.Main) {
Smoothie.endProcess()
tvSmoothie.text = "HELLO SMOOTHIE!"
Smoothie.endProcess()
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion smoothie/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
Expand Down

0 comments on commit f7d5af1

Please sign in to comment.