Merge pull request #12 from farukguler/feature/image-slider

Add indicator visibility choice.
Trendyol · Dec 13, 2019 · c275c0f · c275c0f
2 parents 34bd97b + 686ebb5
commit c275c0f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/libraries/imageslider/src/main/java/com/trendyol/uicomponents/imageslider/ImageSliderView.kt b/libraries/imageslider/src/main/java/com/trendyol/uicomponents/imageslider/ImageSliderView.kt
@@ -1,9 +1,7 @@
 package com.trendyol.uicomponents.imageslider
 
-import android.annotation.TargetApi
 import android.app.Activity
 import android.content.Context
-import android.os.Build
 import android.util.AttributeSet
 import android.widget.FrameLayout
 import androidx.appcompat.app.AppCompatActivity
@@ -46,8 +44,12 @@ class ImageSliderView : FrameLayout, ImagesPagerAdapter.SliderAdapterItemClickLi
     }
 
     fun setViewState(imageSliderViewState: ImageSliderViewState?) {
-        if (imageSliderViewState == null) return
-        setImages(imageSliderViewState)
+        imageSliderViewState?.let {
+            binding.viewState = it
+            binding.executePendingBindings()
+
+            setImages(imageSliderViewState)
+        }
     }
 
     private fun setImages(imageSliderViewState: ImageSliderViewState?) {
@@ -63,6 +65,8 @@ class ImageSliderView : FrameLayout, ImagesPagerAdapter.SliderAdapterItemClickLi
         }
     }
 
+
+
     override fun onImageItemClicked(imageUrlList: List<String>, position: Int) {
         imageSliderViewListener?.onImageSliderItemClicked(imageUrlList, position)
     }

diff --git a/...s/imageslider/src/main/java/com/trendyol/uicomponents/imageslider/ImageSliderViewState.kt b/...s/imageslider/src/main/java/com/trendyol/uicomponents/imageslider/ImageSliderViewState.kt
@@ -1,14 +1,29 @@
 package com.trendyol.uicomponents.imageslider
 
+import android.view.View
+
 data class ImageSliderViewState(
     val imageList: List<String>,
     var isImageDynamic: Boolean? = null,
-    var imageHeight: Int? = null
+    var imageHeight: Int? = null,
+    var isIndicatorAlwaysVisible: Boolean = false
 ) {
 
     fun isSingleImage() = imageList.size == 1
 
     fun isSingleImageVisible() = isSingleImage()
 
-    private fun isMultiImage() = imageList.size.greaterThan(1)
+    fun isMultiImage() = imageList.size.greaterThan(1)
+
+    fun getIndicatorVisibility(): Int {
+        return if (isIndicatorAlwaysVisible) {
+            View.VISIBLE
+        } else {
+            if (isMultiImage()) {
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+        }
+    }
 }
diff --git a/libraries/imageslider/src/main/res/layout/view_image_slider.xml b/libraries/imageslider/src/main/res/layout/view_image_slider.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <data>
+
+        <variable
+            name="viewState"
+            type="com.trendyol.uicomponents.imageslider.ImageSliderViewState" />
+
+    </data>
+
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -21,6 +29,7 @@
             android:paddingTop="@dimen/indicator_padding_vertical"
             android:paddingRight="@dimen/indicator_padding_horizontal"
             android:paddingBottom="@dimen/indicator_padding_vertical"
+            android:visibility="@{viewState.indicatorVisibility}"
             app:ci_animator="@animator/animator_alpha"
             app:ci_animator_reverse="@animator/animator_alpha"
             app:ci_drawable="@drawable/shape_indicator_selected"