diff options
| author | Allan Wang <me@allanwang.ca> | 2019-09-28 23:46:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-28 23:46:52 -0700 |
| commit | 08a0bbe6e921f411e04a13c4fdc1282cf9fb4221 (patch) | |
| tree | 58dec3f2e3cd977fe99a18aef93d78d09fc4c892 /app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | |
| parent | eb5e83cdadc348eea8d76d6778f18850444783d1 (diff) | |
| parent | b82fadbff34ced9193f7b95e0d46dda5c33e9e08 (diff) | |
| download | frost-08a0bbe6e921f411e04a13c4fdc1282cf9fb4221.tar.gz frost-08a0bbe6e921f411e04a13c4fdc1282cf9fb4221.tar.bz2 frost-08a0bbe6e921f411e04a13c4fdc1282cf9fb4221.zip | |
Merge pull request #1555 from AllanWang/system-flag-color
Update system flag color
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt index 09620a54..5da6d970 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -48,7 +48,7 @@ import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.mikepenz.google_material_typeface_library.GoogleMaterial +import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial import com.mikepenz.iconics.typeface.IIcon import com.pitchedapps.frost.R import com.pitchedapps.frost.databinding.ActivityImageBinding @@ -258,7 +258,7 @@ class ImageActivity : KauBaseActivity() { ) { super.onViewPositionChanged(changedView, left, top, dx, dy) with(binding) { - //make sure that we are using the proper axis + // make sure that we are using the proper axis scrollPercent = abs(top.toFloat() / imageContainer.height) scrollToTop = top < 0 val multiplier = max(1f - scrollPercent, 0f) |