From 70f5a23575b6509f4a449460ae057d0dedf81f89 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 22 Oct 2018 13:57:23 +0200 Subject: [PATCH] moving MediaSideScroll to the Views folder, no real change --- .../com/simplemobiletools/gallery/fragments/VideoFragment.kt | 1 + .../gallery/{helpers => views}/MediaSideScroll.kt | 4 +++- app/src/main/res/layout/pager_photo_item.xml | 2 +- app/src/main/res/layout/pager_video_item.xml | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) rename app/src/main/kotlin/com/simplemobiletools/gallery/{helpers => views}/MediaSideScroll.kt (97%) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt index af176e24a..1edde49d9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt @@ -32,6 +32,7 @@ import com.simplemobiletools.gallery.activities.VideoActivity import com.simplemobiletools.gallery.extensions.* import com.simplemobiletools.gallery.helpers.* import com.simplemobiletools.gallery.models.Medium +import com.simplemobiletools.gallery.views.MediaSideScroll import kotlinx.android.synthetic.main.bottom_video_time_holder.view.* import kotlinx.android.synthetic.main.pager_video_item.view.* import java.io.File diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaSideScroll.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/views/MediaSideScroll.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaSideScroll.kt rename to app/src/main/kotlin/com/simplemobiletools/gallery/views/MediaSideScroll.kt index 5c012cade..bfb394eeb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaSideScroll.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/views/MediaSideScroll.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.gallery.helpers +package com.simplemobiletools.gallery.views import android.app.Activity import android.content.Context @@ -13,6 +13,8 @@ import android.widget.TextView import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.activities.ViewPagerActivity import com.simplemobiletools.gallery.extensions.audioManager +import com.simplemobiletools.gallery.helpers.CLICK_MAX_DURATION +import com.simplemobiletools.gallery.helpers.DRAG_THRESHOLD // allow horizontal swipes through the layout, else it can cause glitches at zoomed in images class MediaSideScroll(context: Context, attrs: AttributeSet) : RelativeLayout(context, attrs) { diff --git a/app/src/main/res/layout/pager_photo_item.xml b/app/src/main/res/layout/pager_photo_item.xml index 9be779d15..4bb227f80 100644 --- a/app/src/main/res/layout/pager_photo_item.xml +++ b/app/src/main/res/layout/pager_photo_item.xml @@ -47,7 +47,7 @@ android:visibility="gone" tools:text="My image\nAnother line"/> - - -