adjust pictures sizes

app/src/main/java/com/biganto/visual/roompark/data/repository/mapper/raw2entity.kt

@@ -50,7 +50,7 @@ fun fromRaw(raw:ArticleRaw) : ArticleEntity {
 fun fromRaw(raw:NewsArticleRaw,feedId:Int):ArticleEntity{
     val entity = ArticleEntity()
     entity.setId(raw.id)
-    entity.setPreview("https://room-park.ru${raw.preview}")
+    entity.setPreview(raw.preview)
     entity.setAnnounce(raw.announce)
     entity.setPublished(raw.published)
     entity.setTitle(raw.title)

app/src/main/java/com/biganto/visual/roompark/presentation/screen/article/ScreenController.kt

@@ -14,7 +14,6 @@ import com.biganto.visual.roompark.R
 import com.biganto.visual.roompark.base.RoomParkApplication
 import com.biganto.visual.roompark.base.RoomParkMainActivity
 import com.biganto.visual.roompark.conductor.BigantoBaseController
-import com.biganto.visual.roompark.util.view_utils.html.HtmlTagHandler
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.textview.MaterialTextView
 import com.squareup.picasso.Picasso
@@ -123,7 +122,7 @@ class ArticleScreenController  :
         val imageGetter = PicassoImageGetter(contentView)
         val parsedHtml = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
             Html.fromHtml(viewState.item.htmlBody,
-                HtmlCompat.FROM_HTML_MODE_LEGACY
+                HtmlCompat.FROM_HTML_MODE_COMPACT
                 ,
                 imageGetter
 //                Html.ImageGetter { url ->
@@ -135,7 +134,7 @@ class ArticleScreenController  :
 //                        .toDrawable(resources!!)
 ////                        .current
 //                }
-                , HtmlTagHandler())
+                , null)
         else Html.fromHtml(viewState.item.htmlBody
             ,
             imageGetter
@@ -148,7 +147,7 @@ class ArticleScreenController  :
 //                    .toDrawable(resources!!)
 ////                    .current
 //            }
-            , HtmlTagHandler())
+            , null)
 
         contentView.text = parsedHtml
 

app/src/main/java/com/biganto/visual/roompark/util/view_utils/html/PicassoImageGetter.kt

@@ -42,9 +42,12 @@ class PicassoImageGetter(private val target: MaterialTextView) : Html.ImageGette
             var width = drawable.intrinsicWidth
             var height = drawable.intrinsicHeight
             target.let {
-                val aspect = it.measuredWidthAndState.toFloat()/width.toFloat()
-                height = (height*min(aspect,1.0f)).toInt()
-                width = min(width,it.measuredWidthAndState)
+                val aspect = it.width.toFloat()/width.toFloat()
+
+                height = if (width>it.width) (height*min(aspect,1.0f)).toInt()
+                else (height.toFloat()*aspect).toInt()
+                width = if (width>it.width)  width
+                else it.width
                 drawable.setBounds(0, 0, width, height)
                 setBounds(0, 0, width, height)
 

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

@@ -29,7 +29,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_favorites" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/articleDate"
         style="@style/Feed.Notice"
         android:layout_width="0dp"