aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2018-12-25 22:27:23 -0500
committerAllan Wang <me@allanwang.ca>2018-12-25 22:27:23 -0500
commitd1ed8498e56b4580f27af8142e3e401e2841872e (patch)
tree666d3892564bce7e4f0c04d0becb635562be899a
parent9fb5d8a3d21eea3501740d01a254c7ce51e2a9af (diff)
downloadfrost-d1ed8498e56b4580f27af8142e3e401e2841872e.tar.gz
frost-d1ed8498e56b4580f27af8142e3e401e2841872e.tar.bz2
frost-d1ed8498e56b4580f27af8142e3e401e2841872e.zip
Introduce android ktx
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt4
-rw-r--r--gradle.properties2
3 files changed, 6 insertions, 2 deletions
diff --git a/app/build.gradle b/app/build.gradle
index a869c7bf..c7d78537 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -184,6 +184,8 @@ dependencies {
// TODO temp
implementation "org.jetbrains.anko:anko-commons:0.10.8"
+ implementation "androidx.core:core-ktx:${KTX}"
+
// implementation "org.koin:koin-android:${KOIN}"
// testImplementation "org.koin:koin-test:${KOIN}"
// androidTestImplementation "org.koin:koin-test:${KOIN}"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
index a4f9e193..8536dd1a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/intro/IntroMainFragments.kt
@@ -25,6 +25,7 @@ import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.children
import androidx.fragment.app.Fragment
import ca.allanwang.kau.kotlin.LazyResettableRegistry
import ca.allanwang.kau.utils.Kotterknife
@@ -33,7 +34,6 @@ import ca.allanwang.kau.utils.setOnSingleTapListener
import com.pitchedapps.frost.R
import com.pitchedapps.frost.activities.IntroActivity
import com.pitchedapps.frost.utils.Prefs
-import org.jetbrains.anko.childrenSequence
/**
* Created by Allan Wang on 2017-07-28.
@@ -95,7 +95,7 @@ abstract class BaseIntroFragment(val layoutRes: Int) : Fragment() {
}
protected open fun themeFragmentImpl() {
- view?.childrenSequence()?.forEach { (it as? TextView)?.setTextColor(Prefs.textColor) }
+ (view as? ViewGroup)?.children?.forEach { (it as? TextView)?.setTextColor(Prefs.textColor) }
}
protected val viewArray: Array<Array<out View>> by lazyResettableRegistered { viewArray() }
diff --git a/gradle.properties b/gradle.properties
index eb374206..c78cd10a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -44,6 +44,8 @@ EXOMEDIA=4.3.0
KOIN=1.0.2
# https://github.com/mockk/mockk/releases
MOCKK=1.8.13.kotlin13
+# https://mvnrepository.com/artifact/androidx.core/core-ktx?repo=google
+KTX=1.0.1
# https://github.com/FasterXML/jackson-core/releases
JACKSON=2.9.8