Merge pull request #2 from nos-digital/bugfix/scrolling-boundries

Bugfix/scrolling boundries

Author: vuongp

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example/build.gradle

@@ -12,7 +12,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -25,9 +25,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.viewpager2:viewpager2:1.0.0'
 
     implementation project(path: ':library')
 }

example/src/main/java/nl/nos/imagin/example/SwipableViewPager.kt

@@ -1,6 +1,10 @@
 package nl.nos.imagin.example.data
 
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
 data class Picture(
     val name: String,
     val fileName: String
-)
+) : Parcelable

example/src/main/java/nl/nos/imagin/example/data/Picture.kt

@@ -0,0 +1,18 @@
+package nl.nos.imagin.example.gallery
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+
+class FragmentPagerAdapter(fa: FragmentActivity,
+                           private val fragmentList: List<Fragment>
+) : FragmentStateAdapter(fa) {
+
+    override fun getItemCount(): Int {
+        return fragmentList.size
+    }
+
+    override fun createFragment(position: Int): Fragment {
+        return fragmentList[position]
+    }
+}

example/src/main/java/nl/nos/imagin/example/gallery/FragmentPagerAdapter.kt

@@ -3,21 +3,19 @@ package nl.nos.imagin.example.gallery
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.SharedElementCallback
-import android.support.v7.app.AppCompatActivity
+import androidx.core.app.SharedElementCallback
+import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageView
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.widget.ViewPager2
 import kotlinx.android.synthetic.main.activity_gallery.*
-import nl.nos.imagin.example.R
 import nl.nos.imagin.example.data.Repository
+import nl.nos.imagin.example.R
 
-class GalleryActivity : AppCompatActivity(), GalleryPagerAdapter.OnSwipedToCloseListener {
-
+class GalleryActivity : AppCompatActivity() {
     private val repository = Repository()
-    private val adapter = GalleryPagerAdapter().apply {
-        onSwipedToCloseListener = this@GalleryActivity
-    }
     private val position by lazy { intent.getIntExtra(EXTRA_POSITION, -1) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -28,14 +26,7 @@ class GalleryActivity : AppCompatActivity(), GalleryPagerAdapter.OnSwipedToClose
         window.sharedElementEnterTransition.interpolator = DecelerateInterpolator(3f)
         supportPostponeEnterTransition()
 
-        adapter.pictures.addAll(repository.getPictures())
-
-        view_pager.adapter = adapter
-        view_pager.setCurrentItem(position, false)
-
-        view_pager.post {
-            supportStartPostponedEnterTransition()
-        }
+        setupViewPager()
 
         // Map the shared element transition for when the page has changed.
         setEnterSharedElementCallback(object : SharedElementCallback() {
@@ -58,8 +49,23 @@ class GalleryActivity : AppCompatActivity(), GalleryPagerAdapter.OnSwipedToClose
         })
     }
 
-    override fun onSwipeToClose() {
-        finishAfterTransition()
+    private fun setupViewPager() {
+        val fragments = mutableListOf<Fragment>()
+
+        repository.getPictures().forEach {
+            fragments.add(GalleryImageFragment.newInstance(it))
+        }
+
+        view_pager?.apply {
+            adapter = FragmentPagerAdapter(
+                this@GalleryActivity,
+                fragments
+            )
+            orientation = ViewPager2.ORIENTATION_HORIZONTAL
+            setCurrentItem(position, false)
+
+            post { supportStartPostponedEnterTransition() }
+        }
     }
 
     companion object {

example/src/main/java/nl/nos/imagin/example/gallery/GalleryActivity.kt

@@ -0,0 +1,105 @@
+package nl.nos.imagin.example.gallery
+
+import android.content.Context
+import android.graphics.Rect
+import android.os.Bundle
+import android.util.DisplayMetrics
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import kotlinx.android.synthetic.main.gallery_item.*
+import nl.nos.imagin.Imagin
+import nl.nos.imagin.SingleTapHandler
+import nl.nos.imagin.example.AssetLoader
+import nl.nos.imagin.example.R
+import nl.nos.imagin.example.data.Picture
+
+class GalleryImageFragment : Fragment(), SingleTapHandler.OnSingleTapListener {
+    private var tapListener: SingleTapHandler.OnSingleTapListener? = null
+    private val assetLoader = AssetLoader()
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        if (context is SingleTapHandler.OnSingleTapListener) {
+            tapListener = context
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View = inflater.inflate(R.layout.gallery_item, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val data = arguments?.getParcelable(IMAGE_DATA) as? Picture ?: return
+
+        loadImage(data)
+    }
+
+    private fun loadImage(picture: Picture) {
+        image_view.setImageDrawable(
+            assetLoader.createDrawableFromAsset(
+                image_view.resources,
+                picture.fileName
+            )
+        )
+
+        enableImageZoomControls(picture)
+    }
+
+    private fun enableImageZoomControls(picture: Picture) {
+        view?.let {
+            Imagin.with(it, image_view)
+                .enableDoubleTapToZoom()
+                .enablePinchToZoom()
+                .enableSingleTap(object : SingleTapHandler.OnSingleTapListener {
+                    override fun onSingleTap() {
+                        Toast.makeText(image_view.context, picture.name, Toast.LENGTH_SHORT).show()
+                    }
+                })
+                .enableScroll(
+                    allowScrollOutOfBoundsHorizontally = false,
+                    allowScrollOutOfBoundsVertically = true,
+                    scrollDistanceToCloseInPx = getScreenHeight(image_view.context) / 5
+                ) {
+                    activity?.finishAfterTransition()
+                }
+
+            image_view.transitionName = picture.name
+            image_view.tag = picture.name
+        }
+    }
+
+    private fun getScreenHeight(context: Context): Int {
+        val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+        val display = windowManager.defaultDisplay
+        val displayMetrics = DisplayMetrics()
+
+        display.getMetrics(displayMetrics)
+        return Rect(0, 0, displayMetrics.widthPixels, displayMetrics.heightPixels).height()
+    }
+
+    override fun onSingleTap() {
+        tapListener?.onSingleTap()
+    }
+
+    companion object {
+        const val IMAGE_DATA= "IMAGE_DATA"
+
+        fun newInstance(image: Picture?): Fragment {
+            val args = Bundle()
+            args.putParcelable(IMAGE_DATA, image)
+            val imageFragment =
+                GalleryImageFragment()
+            imageFragment.arguments = args
+            return imageFragment
+        }
+    }
+}

example/src/main/java/nl/nos/imagin/example/gallery/GalleryImageFragment.kt

@@ -1,17 +1,18 @@
 package nl.nos.imagin.example.overview
 
 import android.os.Bundle
-import android.support.v4.app.ActivityOptionsCompat
-import android.support.v4.app.SharedElementCallback
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.GridLayoutManager
+import androidx.core.app.ActivityOptionsCompat
+import androidx.core.app.SharedElementCallback
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.GridLayoutManager
 import android.view.View
 import kotlinx.android.synthetic.main.activity_overview.*
 import nl.nos.imagin.example.data.Picture
 import nl.nos.imagin.example.data.Repository
 import nl.nos.imagin.example.gallery.GalleryActivity
 
-class OverviewActivity : AppCompatActivity(), OverviewAdapter.OnPictureClickedListener {
+class OverviewActivity : AppCompatActivity(),
+    OverviewAdapter.OnPictureClickedListener {
 
     private val repository = Repository()
     private val adapter = OverviewAdapter().apply {