diff options
| author | Allan Wang <me@allanwang.ca> | 2019-09-28 23:53:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-28 23:53:40 -0700 |
| commit | 73e16427879908e8b46b7c9fe1e87b0df838fa78 (patch) | |
| tree | c3ae5a6890b0797110f397b99812362312c07ff6 /app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt | |
| parent | 58309cfd62ed26f3cf5d2b1cb933f50078937a3a (diff) | |
| parent | f5ae18fc0d824dbdce5523128f9ded86bdfa6d08 (diff) | |
| download | frost-73e16427879908e8b46b7c9fe1e87b0df838fa78.tar.gz frost-73e16427879908e8b46b7c9fe1e87b0df838fa78.tar.bz2 frost-73e16427879908e8b46b7c9fe1e87b0df838fa78.zip | |
Merge branch 'dev' into desktop-url-convert
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, 2 insertions, 2 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 eeda94d4..77a58cf2 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/IntroActivity.kt @@ -41,7 +41,7 @@ import ca.allanwang.kau.utils.postDelayed import ca.allanwang.kau.utils.scaleXY import ca.allanwang.kau.utils.setIcon import ca.allanwang.kau.utils.statusBarColor -import com.mikepenz.google_material_typeface_library.GoogleMaterial +import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial import com.pitchedapps.frost.R import com.pitchedapps.frost.intro.BaseIntroFragment import com.pitchedapps.frost.intro.IntroAccountFragment @@ -123,7 +123,7 @@ class IntroActivity : KauBaseActivity(), ViewPager.PageTransformer, ViewPager.On * All fragments are locked in position */ override fun transformPage(page: View, position: Float) { - //only apply to adjacent pages + // only apply to adjacent pages if ((position < 0 && position > -1) || (position > 0 && position < 1)) { val pageWidth = page.width val translateValue = position * -pageWidth |