diff options
author | Allan Wang <me@allanwang.ca> | 2019-08-04 23:00:22 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2019-08-04 23:00:22 -0700 |
commit | 8142d99f3b757c856d1ec692ffd2dac5e8e4a8e0 (patch) | |
tree | 11fbadaf1e72ffd44f6136a13a646f1488e24410 /app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt | |
parent | ba4b15a7ff47ac48008247f4abd36b3025cab66c (diff) | |
parent | 2eacc8cb77b561eb1da11acb6ec8f620195fd24f (diff) | |
download | frost-8142d99f3b757c856d1ec692ffd2dac5e8e4a8e0.tar.gz frost-8142d99f3b757c856d1ec692ffd2dac5e8e4a8e0.tar.bz2 frost-8142d99f3b757c856d1ec692ffd2dac5e8e4a8e0.zip |
Merge branch 'dev' into theme
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt index 1e106765..94f8d6c1 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt @@ -45,6 +45,7 @@ import com.mikepenz.google_material_typeface_library.GoogleMaterial import com.pitchedapps.frost.R import com.pitchedapps.frost.intro.BaseIntroFragment import com.pitchedapps.frost.intro.IntroAccountFragment +import com.pitchedapps.frost.intro.IntroFragmentAnalytics import com.pitchedapps.frost.intro.IntroFragmentEnd import com.pitchedapps.frost.intro.IntroFragmentTheme import com.pitchedapps.frost.intro.IntroFragmentWelcome @@ -54,6 +55,7 @@ import com.pitchedapps.frost.utils.Prefs import com.pitchedapps.frost.utils.cookies import com.pitchedapps.frost.utils.launchNewTask import com.pitchedapps.frost.utils.loadAssets +import com.pitchedapps.frost.utils.setFrostTheme import com.pitchedapps.frost.widgets.NotificationWidget import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch @@ -80,6 +82,7 @@ class IntroActivity : KauBaseActivity(), ViewPager.PageTransformer, ViewPager.On IntroAccountFragment(), IntroTabTouchFragment(), IntroTabContextFragment(), + IntroFragmentAnalytics(), IntroFragmentEnd() ) @@ -111,6 +114,7 @@ class IntroActivity : KauBaseActivity(), ViewPager.PageTransformer, ViewPager.On indicator.setColour(Prefs.textColor) indicator.invalidate() fragments.forEach { it.themeFragment() } + setFrostTheme(true) } /** |