app/build.gradle

@@ -102,7 +102,6 @@ dependencies {
     implementation "androidx.browser:browser:$android_version"
     implementation "androidx.cardview:cardview:$android_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
-    implementation 'org.jsoup:jsoup:1.13.1'
 
     //multidex
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -138,9 +137,6 @@ dependencies {
     // Pager
     implementation 'me.relex:circleindicator:2.0.0@aar'
 
-    //PhotoView
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
-
     implementation 'androidx.core:core-ktx:1.1.0-beta01'
 
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"

app/src/main/AndroidManifest.xml

@@ -62,9 +62,6 @@
         <activity
             android:name=".ReaderActivity">
         </activity>
-        <activity
-            android:name=".ImageActivity">
-        </activity>
 
         <meta-data
             android:name="apps.amine.bou.readerforselfoss.utils.glide.SelfSignedGlideModule"

app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt

@@ -1,52 +0,0 @@
-package apps.amine.bou.readerforselfoss
-
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
-import apps.amine.bou.readerforselfoss.fragments.ImageFragment
-import kotlinx.android.synthetic.main.activity_reader.*
-
-class ImageActivity : AppCompatActivity() {
-    private lateinit var allImages : ArrayList<String>
-    private var position : Int = 0
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setContentView(R.layout.activity_image)
-
-        setSupportActionBar(toolBar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-
-        allImages = intent.getStringArrayListExtra("allImages")
-        position = intent.getIntExtra("position", 0)
-
-        pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
-        pager.currentItem = position
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private inner class ScreenSlidePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
-
-        override fun getCount(): Int {
-            return allImages.size
-        }
-
-        override fun getItem(position: Int): ImageFragment {
-            return ImageFragment.newInstance(allImages[position])
-        }
-    }
-}

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt

@@ -5,14 +5,9 @@ import android.net.Uri
 import android.os.Parcel
 import android.os.Parcelable
 import android.text.Html
-import android.webkit.URLUtil
-import org.jsoup.Jsoup
 
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.RequestOptions
 import com.google.gson.annotations.SerializedName
 
 private fun constructUrl(config: Config?, path: String, file: String?): String {
@@ -133,36 +128,6 @@ data class Item(
         return constructUrl(config, "thumbnails", thumbnail)
     }
 
-    fun getImages() : ArrayList<String> {
-        var allImages = ArrayList<String>()
-
-        for ( image in Jsoup.parse(content).getElementsByTag("img")) {
-            allImages.add(image.attr("src"))
-        }
-        return allImages
-    }
-
-    fun preloadImages(context: Context) : Boolean {
-        val imageUrls = this.getImages()
-
-        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-
-
-        try {
-            for (url in imageUrls) {
-                if ( URLUtil.isValidUrl(url)) {
-                    val image = Glide.with(context).asBitmap()
-                            .apply(glideOptions)
-                            .load(url).submit().get()
-                }
-            }
-        } catch (e : Error) {
-            return false
-        }
-
-        return true
-    }
-
     fun getTitleDecoded(): String {
         return Html.fromHtml(title).toString()
     }

app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt

@@ -104,7 +104,6 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                                     notificationManager.notify(2, newItemsNotification.build())
                                 }
                             }
-                            apiItems.map {it.preloadImages(context)}
                         }
                         Timer("", false).schedule(4000) {
                             notificationManager.cancel(1)

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
-import android.graphics.Bitmap
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
@@ -13,16 +12,15 @@ import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
 import android.view.*
-import android.webkit.*
 import androidx.browser.customtabs.CustomTabsIntent
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import androidx.fragment.app.Fragment
 import androidx.core.content.ContextCompat
 import androidx.core.widget.NestedScrollView
+import android.webkit.WebSettings
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.res.ResourcesCompat
 import androidx.room.Room
-import apps.amine.bou.readerforselfoss.ImageActivity
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
@@ -38,15 +36,15 @@ import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
-import apps.amine.bou.readerforselfoss.utils.glide.getBitmapInputStream
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
 import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
 import apps.amine.bou.readerforselfoss.utils.succeeded
+import android.webkit.WebView
+import android.webkit.WebViewClient
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 import com.github.rubensousa.floatingtoolbar.FloatingToolbar
 import kotlinx.android.synthetic.main.fragment_article.view.*
@@ -55,8 +53,6 @@ import retrofit2.Callback
 import retrofit2.Response
 import java.net.MalformedURLException
 import java.net.URL
-import java.util.concurrent.ExecutionException
-import kotlin.collections.ArrayList
 import kotlin.concurrent.thread
 
 class ArticleFragment : Fragment() {
@@ -69,7 +65,6 @@ class ArticleFragment : Fragment() {
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
-    private lateinit var allImages : ArrayList<String>
     private lateinit var editor: SharedPreferences.Editor
     private lateinit var fab: FloatingActionButton
     private lateinit var appColors: AppColors
@@ -121,7 +116,6 @@ class ArticleFragment : Fragment() {
             contentTitle = allItems[pageNumber.toInt()].getTitleDecoded()
             contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
             contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
-            allImages = allItems[pageNumber.toInt()].getImages()
 
             prefs = PreferenceManager.getDefaultSharedPreferences(activity)
             editor = prefs.edit()
@@ -423,30 +417,6 @@ class ArticleFragment : Fragment() {
                 }
                 return true
             }
-
-            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
-                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                if (url.toLowerCase().contains(".jpg") || url.toLowerCase().contains(".jpeg")) {
-                    try {
-                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
-                    }catch ( e : ExecutionException) {}
-                }
-                else if (url.toLowerCase().contains(".png")) {
-                    try {
-                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
-                    }catch ( e : ExecutionException) {}
-                }
-                else if (url.toLowerCase().contains(".webp")) {
-                    try {
-                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
-                    }catch ( e : ExecutionException) {}
-                }
-
-                return super.shouldInterceptRequest(view, url)
-            }
         }
 
         val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
@@ -575,13 +545,12 @@ class ArticleFragment : Fragment() {
     fun performClick(): Boolean {
         if (rootView!!.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
                 rootView!!.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+            //TODO: Transfer all images in the webpage to the Image fragment
+            var allImages = ArrayList<String>()
+            allImages.add(rootView!!.webcontent.hitTestResult.extra.toString())
+            val position : Int = 0
 
-            val position : Int = allImages.indexOf(rootView!!.webcontent.hitTestResult.extra)
+            fragmentManager!!.beginTransaction().replace(R.id.reader_activity_view, ImageFragment.newInstance(position, allImages)).addToBackStack(null).commit()
-
-            val intent = Intent(activity, ImageActivity::class.java)
-            intent.putExtra("allImages", allImages)
-            intent.putExtra("position", position)
-            startActivity(intent)
             return false
         }
         return false

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ImageFragment.kt

@@ -2,46 +2,61 @@ package apps.amine.bou.readerforselfoss.fragments
 
 import android.os.Bundle
 import android.view.*
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import apps.amine.bou.readerforselfoss.R
-import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.fragment_article.view.webcontent
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.RequestOptions
-import kotlinx.android.synthetic.main.fragment_image.view.*
 
 class ImageFragment : Fragment() {
 
-    private lateinit var imageUrl : String
+    private lateinit var position: Number
-    private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+    private lateinit var allImages: ArrayList<String>
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+
+        position = arguments!!.getInt("position")
+        allImages = arguments!!.getStringArrayList("allImages")
 
-        imageUrl = arguments!!.getString("imageUrl")
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        (activity as AppCompatActivity).supportActionBar?.setDisplayShowTitleEnabled(false)
         val view : View = inflater.inflate(R.layout.fragment_image, container, false)
 
-        view.photoView.visibility = View.VISIBLE
+        view.webcontent.visibility = View.VISIBLE
-        Glide.with(activity)
+        view.webcontent.settings.setLoadWithOverviewMode(true)
-                .asBitmap()
+        view.webcontent.settings.setUseWideViewPort(true)
-                .apply(glideOptions)
+        view.webcontent.settings.setSupportZoom(true)
-                .load(imageUrl)
+        view.webcontent.settings.setBuiltInZoomControls(true)
-                .into(view.photoView)
+        view.webcontent.settings.setDisplayZoomControls(false)
+        view.webcontent.loadUrl(allImages[0])
 
         return view
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+                menu.clear()
+    }
+
+    override fun onDestroy() {
+        (activity as AppCompatActivity).supportActionBar?.setDisplayShowTitleEnabled(true)
+        super.onDestroy()
+    }
+
     companion object {
-        private const val ARG_IMAGE = "imageUrl"
+        private const val ARG_POSITION = "position"
+        private const val ARG_IMAGES = "allImages"
 
         fun newInstance(
-                imageUrl : String
+                position: Int,
+                allImages: ArrayList<String>
         ): ImageFragment {
             val fragment = ImageFragment()
             val args = Bundle()
-            args.putString(ARG_IMAGE, imageUrl)
+            args.putInt(ARG_POSITION, position)
+            args.putStringArrayList(ARG_IMAGES, allImages)
             fragment.arguments = args
             return fragment
         }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt

@@ -14,9 +14,6 @@ import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.load.model.LazyHeaders
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.BitmapImageViewTarget
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
-import java.io.InputStream
 
 fun Context.bitmapCenterCrop(config: Config, url: String, iv: ImageView) =
     Glide.with(this)
@@ -59,11 +56,4 @@ fun RequestManager.loadMaybeBasicAuth(config: Config, url: String): RequestBuild
     }
     val glideUrl = GlideUrl(url, builder.build())
     return this.load(glideUrl)
-}
-
-fun getBitmapInputStream(bitmap:Bitmap,compressFormat: Bitmap.CompressFormat): InputStream {
-    val byteArrayOutputStream = ByteArrayOutputStream()
-    bitmap.compress(compressFormat, 80, byteArrayOutputStream)
-    val bitmapData: ByteArray = byteArrayOutputStream.toByteArray()
-    return ByteArrayInputStream(bitmapData)
 }

app/src/main/res/layout/activity_image.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolBar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:popupTheme="?attr/toolbarPopupTheme"
-            app:theme="@style/ToolBarStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_image.xml

@@ -4,13 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.github.chrisbanes.photoview.PhotoView
+    <WebView
-        android:id="@+id/photoView"
+        android:id="@+id/webcontent"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="match_parent" >
-        android:layout_centerVertical="true"
+    </WebView>
-        android:layout_centerHorizontal="true"
-        android:background="@android:color/black"
-        app:srcCompat="@android:drawable/screen_background_dark" />
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>